You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2005/11/16 17:35:53 UTC

svn commit: r345054 - in /httpd/httpd/trunk: CHANGES modules/aaa/mod_auth_basic.c modules/aaa/mod_auth_digest.c

Author: jerenkrantz
Date: Wed Nov 16 08:35:49 2005
New Revision: 345054

URL: http://svn.apache.org/viewcvs?rev=345054&view=rev
Log:
Remove support for 'On' and 'Off' for AuthBasicProvider and AuthDigestProvider
as it doesn't actually work as advertised.

Reviewed by: Joshua Slive (concept)

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/aaa/mod_auth_basic.c
    httpd/httpd/trunk/modules/aaa/mod_auth_digest.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?rev=345054&r1=345053&r2=345054&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Wed Nov 16 08:35:49 2005
@@ -36,6 +36,9 @@
 
 Changes with Apache 2.1.10
 
+  *) Remove support for 'On' and 'Off' for AuthBasicProvider and
+     AuthDigestProvider.  [Joshua Slive, Justin Erenkrantz]
+
   *) Add in new UseCanonicalPhysicalPort directive, which controls
      whether or not Apache will ever use the actual physical port
      when constructing the canonical port number. [Jim Jagielski]

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=345054&r1=345053&r2=345054&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth_basic.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth_basic.c Wed Nov 16 08:35:49 2005
@@ -54,22 +54,9 @@
 {
     auth_basic_config_rec *conf = (auth_basic_config_rec*)config;
     authn_provider_list *newp;
-    const char *provider_name;
-
-    if (strcasecmp(arg, "on") == 0) {
-        provider_name = AUTHN_DEFAULT_PROVIDER;
-    }
-    else if (strcasecmp(arg, "off") == 0) {
-        /* Clear all configured providers and return. */
-        conf->providers = NULL;
-        return NULL;
-    }
-    else {
-        provider_name = apr_pstrdup(cmd->pool, arg);
-    }
 
     newp = apr_pcalloc(cmd->pool, sizeof(authn_provider_list));
-    newp->provider_name = provider_name;
+    newp->provider_name = apr_pstrdup(cmd->pool, arg);
 
     /* lookup and cache the actual provider now */
     newp->provider = ap_lookup_provider(AUTHN_PROVIDER_GROUP,
@@ -87,7 +74,7 @@
         /* if it doesn't provide the appropriate function, reject it */
         return apr_psprintf(cmd->pool,
                             "The '%s' Authn provider doesn't support "
-                            "Basic Authentication", provider_name);
+                            "Basic Authentication", newp->provider_name);
     }
 
     /* Add it to the list now. */

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=345054&r1=345053&r2=345054&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth_digest.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth_digest.c Wed Nov 16 08:35:49 2005
@@ -446,22 +446,9 @@
 {
     digest_config_rec *conf = (digest_config_rec*)config;
     authn_provider_list *newp;
-    const char *provider_name;
-
-    if (strcasecmp(arg, "on") == 0) {
-        provider_name = AUTHN_DEFAULT_PROVIDER;
-    }
-    else if (strcasecmp(arg, "off") == 0) {
-        /* Clear all configured providers and return. */
-        conf->providers = NULL;
-        return NULL;
-    }
-    else {
-        provider_name = apr_pstrdup(cmd->pool, arg);
-    }
 
     newp = apr_pcalloc(cmd->pool, sizeof(authn_provider_list));
-    newp->provider_name = provider_name;
+    newp->provider_name = apr_pstrdup(cmd->pool, arg);
 
     /* lookup and cache the actual provider now */
     newp->provider = ap_lookup_provider(AUTHN_PROVIDER_GROUP,
@@ -479,7 +466,7 @@
         /* if it doesn't provide the appropriate function, reject it */
         return apr_psprintf(cmd->pool,
                             "The '%s' Authn provider doesn't support "
-                            "Digest Authentication", provider_name);
+                            "Digest Authentication", newp->provider_name);
     }
 
     /* Add it to the list now. */