httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject svn commit: r178052 - /httpd/httpd/trunk/modules/aaa/mod_auth.h /httpd/httpd/trunk/modules/aaa/mod_auth_basic.c /httpd/httpd/trunk/modules/aaa/mod_auth_digest.c
Date Mon, 23 May 2005 23:07:51 GMT
Author: bnicholes
Date: Mon May 23 16:07:49 2005
New Revision: 178052

URL: http://svn.apache.org/viewcvs?rev=178052&view=rev
Log:
Add the auth provider name as a note in the request so that authn_provider_alias is able to
look up the original provider along with the per_dir configuration.

Modified:
    httpd/httpd/trunk/modules/aaa/mod_auth.h
    httpd/httpd/trunk/modules/aaa/mod_auth_basic.c
    httpd/httpd/trunk/modules/aaa/mod_auth_digest.c

Modified: httpd/httpd/trunk/modules/aaa/mod_auth.h
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/mod_auth.h?rev=178052&r1=178051&r2=178052&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth.h (original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth.h Mon May 23 16:07:49 2005
@@ -30,6 +30,7 @@
 #define AUTHN_DEFAULT_PROVIDER "file"
     
 #define AUTHZ_GROUP_NOTE "authz_group_note"
+#define AUTHN_PROVIDER_NAME_NOTE "authn_provider_name"
 
 typedef enum {
     AUTH_DENIED,

Modified: httpd/httpd/trunk/modules/aaa/mod_auth_basic.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/mod_auth_basic.c?rev=178052&r1=178051&r2=178052&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth_basic.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth_basic.c Mon May 23 16:07:49 2005
@@ -237,7 +237,11 @@
             provider = current_provider->provider;
         }
 
+        apr_table_setn(r->notes, AUTHN_PROVIDER_NAME_NOTE, current_provider->provider_name);
+
         auth_result = provider->check_password(r, sent_user, sent_pw);
+
+        apr_table_unset(r->notes, AUTHN_PROVIDER_NAME_NOTE);
 
         /* Something occured. Stop checking. */
         if (auth_result != AUTH_USER_NOT_FOUND) {

Modified: httpd/httpd/trunk/modules/aaa/mod_auth_digest.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/mod_auth_digest.c?rev=178052&r1=178051&r2=178052&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth_digest.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth_digest.c Mon May 23 16:07:49 2005
@@ -1358,9 +1358,13 @@
             provider = current_provider->provider;
         }
 
+        apr_table_setn(r->notes, AUTHN_PROVIDER_NAME_NOTE, current_provider->provider_name);
+
         /* We expect the password to be md5 hash of user:realm:password */
         auth_result = provider->get_realm_hash(r, user, conf->realm,
                                                &password);
+
+        apr_table_unset(r->notes, AUTHN_PROVIDER_NAME_NOTE);
 
         /* Something occured.  Stop checking. */
         if (auth_result != AUTH_USER_NOT_FOUND) {



Mime
View raw message