revert r672639 which lacked a necessary major bump, add a major MMN bump

to account for the short-lived API addition/removal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@678947 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 2b2d0f70a8d59e044a4615927b6b3ae3900fd3ba..640f4aa32c411fb346205c2aa995ae51ca141574 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,10 +9,6 @@ Changes with Apache 2.3.0
      of possibly multiple headers with the same name and deleting the
      remaining ones. PR 45333.  [Ruediger Pluem]
 
-  *) mod_auth_digest: Detect during startup when AuthDigestProvider
-     is configured to use an incompatible provider via AuthnProviderAlias.
-     PR 45196 [Eric Covener] 
-
   *) mod_rewrite: Preserve the query string with [proxy,noescape]. PR 45247
      [Tom Donovan]
 

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index da1a3cc3aabcd3ef80f59e91dc8cb0498a108e8b..b85bc8954ab9382fc733ccd8c9193f3b6a8c5304 100644 (file)
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -162,14 +162,15 @@
  *                         interpolate_env in proxy_dir_conf.
  *                         Rationale: see r661069.
  * 20080528.1 (2.3.0-dev)  add has_realm_hash() to authn_provider struct
+ * 20080722.0 (2.3.0-dev)  remove has_realm_hash() from authn_provider struct
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
 
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
-#define MODULE_MAGIC_NUMBER_MAJOR 20080528
+#define MODULE_MAGIC_NUMBER_MAJOR 20080722
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 1                     /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 0                     /* 0...n */
 
 /**
  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a

diff --git a/include/mod_auth.h b/include/mod_auth.h
index 16cc50306e3cf877c7bda4faea0b0448cb137593..7852e9e55452df2ff28d2860ad09a48c5d8eb804 100644 (file)
--- a/include/mod_auth.h
+++ b/include/mod_auth.h
@@ -94,10 +94,6 @@ typedef struct {
      */
     authn_status (*get_realm_hash)(request_rec *r, const char *user,
                                    const char *realm, char **rethash);
-
-    /* OK if provider can satisfy get_realm_hash(), APR_ENOTIMPL otherwise. */
-    apr_status_t (*has_realm_hash)(cmd_parms *cmd, const char *provider_name);
-
 } authn_provider;
 
 /* A linked-list of authn providers. */

diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c
index f9e3e68d2952eb5db08b6c40d1e3f5e667f205d9..6dfbea615f2e3442b3159026a217e9462be88940 100644 (file)
--- a/modules/aaa/mod_auth_digest.c
+++ b/modules/aaa/mod_auth_digest.c
@@ -463,9 +463,7 @@ static const char *add_authn_provider(cmd_parms *cmd, void *config,
                             newp->provider_name);
     }
 
-    if (!newp->provider->get_realm_hash ||
-       (newp->provider->has_realm_hash && 
-        newp->provider->has_realm_hash(cmd, newp->provider_name) == APR_ENOTIMPL)) { 
+    if (!newp->provider->get_realm_hash) {
         /* if it doesn't provide the appropriate function, reject it */
         return apr_psprintf(cmd->pool,
                             "The '%s' Authn provider doesn't support "

diff --git a/modules/aaa/mod_authn_core.c b/modules/aaa/mod_authn_core.c
index 827f416e5b923836f8b64efab1afdaeda3cd861b..649f6c6f084f5c3506a071e1cda4a1dc4e65c76a 100644 (file)
--- a/modules/aaa/mod_authn_core.c
+++ b/modules/aaa/mod_authn_core.c
@@ -132,27 +132,6 @@ static authn_status authn_alias_check_password(request_rec *r, const char *user,
     return ret;
 }
 
-static apr_status_t authn_alias_has_realm_hash(cmd_parms *cmd, const char *provider_name) 
-{
-    /* No merge, just a query to be passed on to the provider */
-    authn_alias_srv_conf *authcfg =
-        (authn_alias_srv_conf *)ap_get_module_config(cmd->server->module_config,
-                                                     &authn_core_module);
-    apr_status_t ret = APR_ENOTIMPL;
-
-    provider_alias_rec *prvdraliasrec = apr_hash_get(authcfg->alias_rec,
-                                                     provider_name, 
-                                                     APR_HASH_KEY_STRING);
-    if (prvdraliasrec->provider->has_realm_hash) { 
-        ret = prvdraliasrec->provider->has_realm_hash(cmd, provider_name);
-    }
-    else if (prvdraliasrec->provider->get_realm_hash) { 
-        /* provider didn't register has_realm_hash, but does have get_realm_hash */
-        ret = OK;
-    }
-
-    return ret;
-}
 static authn_status authn_alias_get_realm_hash(request_rec *r, const char *user,
                                                const char *realm, char **rethash)
 {
@@ -200,7 +179,6 @@ static const authn_provider authn_alias_provider =
 {
     &authn_alias_check_password,
     &authn_alias_get_realm_hash,
-    &authn_alias_has_realm_hash,
 };
 
 static const char *authaliassection(cmd_parms *cmd, void *mconfig, const char *arg)

diff --git a/modules/aaa/mod_authn_dbm.c b/modules/aaa/mod_authn_dbm.c
index ff29481977f29e6ecafe685276e497f7bb5a061b..177c4fed54fea46361b6ca35cdcadcc670c2649e 100644 (file)
--- a/modules/aaa/mod_authn_dbm.c
+++ b/modules/aaa/mod_authn_dbm.c
@@ -147,11 +147,6 @@ static authn_status check_dbm_pw(request_rec *r, const char *user,
     return AUTH_GRANTED;
 }
 
-static apr_status_t has_dbm_realm_hash(cmd_parms *cmd, const char *provider_name)
-{
-    return OK;
-}
-
 static authn_status get_dbm_realm_hash(request_rec *r, const char *user,
                                        const char *realm, char **rethash)
 {
@@ -190,7 +185,6 @@ static const authn_provider authn_dbm_provider =
 {
     &check_dbm_pw,
     &get_dbm_realm_hash,
-    &has_dbm_realm_hash
 };
 
 static void register_hooks(apr_pool_t *p)

diff --git a/modules/aaa/mod_authn_file.c b/modules/aaa/mod_authn_file.c
index 1ac8464a6504a2d8bc86d7b6f44215382023ded5..76aa2e15eec28d74bde695244cdd549573ce7419 100644 (file)
--- a/modules/aaa/mod_authn_file.c
+++ b/modules/aaa/mod_authn_file.c
@@ -108,11 +108,6 @@ static authn_status check_password(request_rec *r, const char *user,
     return AUTH_GRANTED;
 }
 
-static apr_status_t has_realm_hash(cmd_parms *cmd, const char *provider_name)
-{
-    return OK;
-}
-
 static authn_status get_realm_hash(request_rec *r, const char *user,
                                    const char *realm, char **rethash)
 {
@@ -164,7 +159,6 @@ static const authn_provider authn_file_provider =
 {
     &check_password,
     &get_realm_hash,
-    &has_realm_hash,
 };
 
 static void register_hooks(apr_pool_t *p)

diff --git a/modules/aaa/mod_authnz_ldap.c b/modules/aaa/mod_authnz_ldap.c
index e280fc3e85b94b2bb02b0f96c61574c511c4fb21..d617f5bca654bafeb6c2780cbe04ac2c79a44ac2 100644 (file)
--- a/modules/aaa/mod_authnz_ldap.c
+++ b/modules/aaa/mod_authnz_ldap.c
@@ -1538,23 +1538,9 @@ static int authnz_ldap_post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *
     return OK;
 }
 
-static authn_status authn_ldap_get_realm_hash(request_rec *r, const char *user,
-                                              const char *realm, char **rethash)
-{
-    return AUTH_GENERAL_ERROR;
-
-}
-
-static apr_status_t authn_ldap_has_realm_hash(cmd_parms *cmd, const char *provider_name)
-{
-    return APR_ENOTIMPL;
-}
-
 static const authn_provider authn_ldap_provider =
 {
     &authn_ldap_check_password,
-    &authn_ldap_get_realm_hash,
-    &authn_ldap_has_realm_hash
 };
 
 static const authz_provider authz_ldapuser_provider =