httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ruediger Pluem <rpl...@apache.org>
Subject Re: svn commit: r956387 - in /httpd/httpd/trunk: CHANGES STATUS modules/aaa/mod_authz_core.c server/request.c
Date Mon, 21 Jun 2010 06:23:09 GMT


On 06/20/2010 09:15 PM, sf@apache.org wrote:
> Author: sf
> Date: Sun Jun 20 19:15:01 2010
> New Revision: 956387
> 
> URL: http://svn.apache.org/viewvc?rev=956387&view=rev
> Log:
> Fix authorization by user or IP/ENV/...
> Note ap_note_auth_failure() breakage in STATUS
> 
> Modified:
>     httpd/httpd/trunk/CHANGES
>     httpd/httpd/trunk/STATUS
>     httpd/httpd/trunk/modules/aaa/mod_authz_core.c
>     httpd/httpd/trunk/server/request.c
> 

> Modified: httpd/httpd/trunk/server/request.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/request.c?rev=956387&r1=956386&r2=956387&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/server/request.c (original)
> +++ httpd/httpd/trunk/server/request.c Sun Jun 20 19:15:01 2010
> @@ -201,6 +201,7 @@ AP_DECLARE(int) ap_process_request_inter
>          r->ap_auth_type = r->main->ap_auth_type;
>      }
>      else {
> +        char *failed_user = NULL;
>          switch (ap_satisfies(r)) {
>          case SATISFY_ALL:
>          case SATISFY_NOSPEC:
> @@ -209,10 +210,21 @@ AP_DECLARE(int) ap_process_request_inter
>              }
>  
>              if ((access_status = ap_run_check_user_id(r)) != OK) {
> -                return decl_die(access_status, "check user", r);
> +                if (access_status == HTTP_UNAUTHORIZED) {
> +                    failed_user = r->user;
> +                    r->user = NULL;

Question: Is this an API change? I mean can authn modules be expected to handle r->user
== NULL?

Regards

RĂ¼diger

Mime
View raw message