httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chr...@apache.org
Subject svn commit: r658046 - in /httpd/httpd/trunk: ./ modules/aaa/
Date Mon, 19 May 2008 23:53:05 GMT
Author: chrisd
Date: Mon May 19 16:53:05 2008
New Revision: 658046

URL: http://svn.apache.org/viewvc?rev=658046&view=rev
Log:
Convert common provider version strings ("0") to
AUTHN/Z_PROVIDER_VERSION macros defined in mod_auth.h.

Modified:
    httpd/httpd/trunk/CHANGES
    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
    httpd/httpd/trunk/modules/aaa/mod_auth_form.c
    httpd/httpd/trunk/modules/aaa/mod_authn_anon.c
    httpd/httpd/trunk/modules/aaa/mod_authn_core.c
    httpd/httpd/trunk/modules/aaa/mod_authn_dbd.c
    httpd/httpd/trunk/modules/aaa/mod_authn_dbm.c
    httpd/httpd/trunk/modules/aaa/mod_authn_file.c
    httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c
    httpd/httpd/trunk/modules/aaa/mod_authz_core.c
    httpd/httpd/trunk/modules/aaa/mod_authz_dbd.c
    httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c
    httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c
    httpd/httpd/trunk/modules/aaa/mod_authz_host.c
    httpd/httpd/trunk/modules/aaa/mod_authz_owner.c
    httpd/httpd/trunk/modules/aaa/mod_authz_user.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=658046&r1=658045&r2=658046&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon May 19 16:53:05 2008
@@ -2,6 +2,8 @@
 Changes with Apache 2.3.0
 [ When backported to 2.2.x, remove entry from this file ]
 
+  *) authn/z: Convert common provider version strings to macros.
+
   *) http_filters: Don't return 100-continue on redirects. PR 43711
      [Ruediger Pluem]
 

Modified: httpd/httpd/trunk/modules/aaa/mod_auth.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_auth.h?rev=658046&r1=658045&r2=658046&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth.h (original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth.h Mon May 19 16:53:05 2008
@@ -37,6 +37,8 @@
 
 #define AUTHN_PROVIDER_GROUP "authn"
 #define AUTHZ_PROVIDER_GROUP "authz"
+#define AUTHN_PROVIDER_VERSION "0"
+#define AUTHZ_PROVIDER_VERSION "0"
 #define AUTHN_DEFAULT_PROVIDER "file"
 
 #define AUTHZ_GROUP_NOTE "authz_group_note"

Modified: httpd/httpd/trunk/modules/aaa/mod_auth_basic.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_auth_basic.c?rev=658046&r1=658045&r2=658046&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth_basic.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth_basic.c Mon May 19 16:53:05 2008
@@ -60,7 +60,8 @@
 
     /* lookup and cache the actual provider now */
     newp->provider = ap_lookup_provider(AUTHN_PROVIDER_GROUP,
-                                        newp->provider_name, "0");
+                                        newp->provider_name,
+                                        AUTHN_PROVIDER_VERSION);
 
     if (newp->provider == NULL) {
         /* by the time they use it, the provider should be loaded and
@@ -211,7 +212,8 @@
          */
         if (!current_provider) {
             provider = ap_lookup_provider(AUTHN_PROVIDER_GROUP,
-                                          AUTHN_DEFAULT_PROVIDER, "0");
+                                          AUTHN_DEFAULT_PROVIDER,
+                                          AUTHN_PROVIDER_VERSION);
 
             if (!provider || !provider->check_password) {
                 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
@@ -286,7 +288,8 @@
 
 static apr_array_header_t *authn_ap_list_provider_names(apr_pool_t *ptemp)
 {
-    return ap_list_provider_names(ptemp, AUTHN_PROVIDER_GROUP, "0");
+    return ap_list_provider_names(ptemp, AUTHN_PROVIDER_GROUP,
+                                  AUTHN_PROVIDER_VERSION);
 }
 
 static void register_hooks(apr_pool_t *p)

Modified: httpd/httpd/trunk/modules/aaa/mod_auth_digest.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_auth_digest.c?rev=658046&r1=658045&r2=658046&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth_digest.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth_digest.c Mon May 19 16:53:05 2008
@@ -452,7 +452,8 @@
 
     /* lookup and cache the actual provider now */
     newp->provider = ap_lookup_provider(AUTHN_PROVIDER_GROUP,
-                                        newp->provider_name, "0");
+                                        newp->provider_name,
+                                        AUTHN_PROVIDER_VERSION);
 
     if (newp->provider == NULL) {
        /* by the time they use it, the provider should be loaded and
@@ -1332,7 +1333,8 @@
          */
         if (!current_provider) {
             provider = ap_lookup_provider(AUTHN_PROVIDER_GROUP,
-                                          AUTHN_DEFAULT_PROVIDER, "0");
+                                          AUTHN_DEFAULT_PROVIDER,
+                                          AUTHN_PROVIDER_VERSION);
 
             if (!provider || !provider->get_realm_hash) {
                 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
@@ -1963,7 +1965,8 @@
 
 static apr_array_header_t *authn_ap_list_provider_names(apr_pool_t *ptemp)
 {
-    return ap_list_provider_names(ptemp, AUTHN_PROVIDER_GROUP, "0");
+    return ap_list_provider_names(ptemp, AUTHN_PROVIDER_GROUP,
+                                  AUTHN_PROVIDER_VERSION);
 }
 
 static void register_hooks(apr_pool_t *p)

Modified: httpd/httpd/trunk/modules/aaa/mod_auth_form.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_auth_form.c?rev=658046&r1=658045&r2=658046&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth_form.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth_form.c Mon May 19 16:53:05 2008
@@ -157,7 +157,8 @@
 
     /* lookup and cache the actual provider now */
     newp->provider = ap_lookup_provider(AUTHN_PROVIDER_GROUP,
-                                        newp->provider_name, "0");
+                                        newp->provider_name,
+                                        AUTHN_PROVIDER_VERSION);
 
     if (newp->provider == NULL) {
         /*
@@ -717,7 +718,8 @@
          */
         if (!current_provider) {
             provider = ap_lookup_provider(AUTHN_PROVIDER_GROUP,
-                                          AUTHN_DEFAULT_PROVIDER, "0");
+                                          AUTHN_DEFAULT_PROVIDER,
+                                          AUTHN_PROVIDER_VERSION);
 
             if (!provider || !provider->check_password) {
                 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, LOG_PREFIX

Modified: httpd/httpd/trunk/modules/aaa/mod_authn_anon.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authn_anon.c?rev=658046&r1=658045&r2=658046&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authn_anon.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authn_anon.c Mon May 19 16:53:05 2008
@@ -198,7 +198,8 @@
 
 static void register_hooks(apr_pool_t *p)
 {
-    ap_register_auth_provider(p, AUTHN_PROVIDER_GROUP, "anon", "0",
+    ap_register_auth_provider(p, AUTHN_PROVIDER_GROUP, "anon",
+                              AUTHN_PROVIDER_VERSION,
                               &authn_anon_provider, AP_AUTH_INTERNAL_PER_CONF);
 }
 

Modified: httpd/httpd/trunk/modules/aaa/mod_authn_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authn_core.c?rev=658046&r1=658045&r2=658046&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authn_core.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authn_core.c Mon May 19 16:53:05 2008
@@ -227,7 +227,8 @@
     }
 
     /* Look up the alias provider to make sure that it hasn't already been registered. */
-    provider = ap_lookup_provider(AUTHN_PROVIDER_GROUP, provider_alias, "0");
+    provider = ap_lookup_provider(AUTHN_PROVIDER_GROUP, provider_alias,
+                                  AUTHN_PROVIDER_VERSION);
     if (provider) {
         return apr_pstrcat(cmd->pool, "The alias provider ", provider_alias,
                            " has already be registered previously as either a base provider
or an alias provider.", 
@@ -241,7 +242,8 @@
 
     if (!errmsg) {
         provider_alias_rec *prvdraliasrec = apr_pcalloc(cmd->pool, sizeof(provider_alias_rec));
-        provider = ap_lookup_provider(AUTHN_PROVIDER_GROUP, provider_name, "0");
+        provider = ap_lookup_provider(AUTHN_PROVIDER_GROUP, provider_name,
+                                      AUTHN_PROVIDER_VERSION);
 
         /* Save off the new directory config along with the original provider name
            and function pointer data */
@@ -253,7 +255,8 @@
 
         /* Register the fake provider so that we get called first */
         ap_register_auth_provider(cmd->pool, AUTHN_PROVIDER_GROUP,
-                                  provider_alias, "0", &authn_alias_provider,
+                                  provider_alias, AUTHN_PROVIDER_VERSION,
+                                  &authn_alias_provider,
                                   AP_AUTH_INTERNAL_PER_CONF);
     }
 
@@ -298,7 +301,8 @@
 
 static apr_array_header_t *authn_ap_list_provider_names(apr_pool_t *ptemp)
 {
-    return ap_list_provider_names(ptemp, AUTHN_PROVIDER_GROUP, "0");
+    return ap_list_provider_names(ptemp, AUTHN_PROVIDER_GROUP,
+                                  AUTHN_PROVIDER_VERSION);
 }
 
 static const command_rec authn_cmds[] =

Modified: httpd/httpd/trunk/modules/aaa/mod_authn_dbd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authn_dbd.c?rev=658046&r1=658045&r2=658046&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authn_dbd.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authn_dbd.c Mon May 19 16:53:05 2008
@@ -269,7 +269,8 @@
         &authn_dbd_realm
     };
 
-    ap_register_auth_provider(p, AUTHN_PROVIDER_GROUP, "dbd", "0",
+    ap_register_auth_provider(p, AUTHN_PROVIDER_GROUP, "dbd",
+                              AUTHN_PROVIDER_VERSION,
                               &authn_dbd_provider, AP_AUTH_INTERNAL_PER_CONF);
 }
 module AP_MODULE_DECLARE_DATA authn_dbd_module =

Modified: httpd/httpd/trunk/modules/aaa/mod_authn_dbm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authn_dbm.c?rev=658046&r1=658045&r2=658046&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authn_dbm.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authn_dbm.c Mon May 19 16:53:05 2008
@@ -189,7 +189,8 @@
 
 static void register_hooks(apr_pool_t *p)
 {
-    ap_register_auth_provider(p, AUTHN_PROVIDER_GROUP, "dbm", "0",
+    ap_register_auth_provider(p, AUTHN_PROVIDER_GROUP, "dbm",
+                              AUTHN_PROVIDER_VERSION,
                               &authn_dbm_provider, AP_AUTH_INTERNAL_PER_CONF);
 }
 

Modified: httpd/httpd/trunk/modules/aaa/mod_authn_file.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authn_file.c?rev=658046&r1=658045&r2=658046&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authn_file.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authn_file.c Mon May 19 16:53:05 2008
@@ -163,7 +163,8 @@
 
 static void register_hooks(apr_pool_t *p)
 {
-    ap_register_auth_provider(p, AUTHN_PROVIDER_GROUP, "file", "0",
+    ap_register_auth_provider(p, AUTHN_PROVIDER_GROUP, "file",
+                              AUTHN_PROVIDER_VERSION,
                               &authn_file_provider, AP_AUTH_INTERNAL_PER_CONF);
 }
 

Modified: httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c?rev=658046&r1=658045&r2=658046&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c Mon May 19 16:53:05 2008
@@ -1582,23 +1582,29 @@
 static void register_hooks(apr_pool_t *p)
 {
     /* Register authn provider */
-    ap_register_auth_provider(p, AUTHN_PROVIDER_GROUP, "ldap", "0",
+    ap_register_auth_provider(p, AUTHN_PROVIDER_GROUP, "ldap",
+                              AUTHN_PROVIDER_VERSION,
                               &authn_ldap_provider, AP_AUTH_INTERNAL_PER_CONF);
 
     /* Register authz providers */
-    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "ldap-user", "0",
+    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "ldap-user",
+                              AUTHZ_PROVIDER_VERSION,
                               &authz_ldapuser_provider,
                               AP_AUTH_INTERNAL_PER_CONF);
-    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "ldap-group", "0",
+    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "ldap-group",
+                              AUTHZ_PROVIDER_VERSION,
                               &authz_ldapgroup_provider,
                               AP_AUTH_INTERNAL_PER_CONF);
-    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "ldap-dn", "0",
+    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "ldap-dn",
+                              AUTHZ_PROVIDER_VERSION,
                               &authz_ldapdn_provider,
                               AP_AUTH_INTERNAL_PER_CONF);
-    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "ldap-attribute", "0",
+    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "ldap-attribute",
+                              AUTHZ_PROVIDER_VERSION,
                               &authz_ldapattribute_provider,
                               AP_AUTH_INTERNAL_PER_CONF);
-    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "ldap-filter", "0",
+    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "ldap-filter",
+                              AUTHZ_PROVIDER_VERSION,
                               &authz_ldapfilter_provider,
                               AP_AUTH_INTERNAL_PER_CONF);
 

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_core.c?rev=658046&r1=658045&r2=658046&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_core.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_core.c Mon May 19 16:53:05 2008
@@ -346,7 +346,8 @@
 
     /* lookup and cache the actual provider now */
     newp->provider = ap_lookup_provider(AUTHZ_PROVIDER_GROUP,
-                                        newp->provider_name, "0");
+                                        newp->provider_name,
+                                        AUTHZ_PROVIDER_VERSION);
     newp->req_state = conf->req_state;
     newp->req_state_level = conf->req_state_level;
     newp->is_reject = (cmd->info != NULL);
@@ -466,8 +467,9 @@
     if (!errmsg) {
         provider_alias_rec *prvdraliasrec = apr_pcalloc(cmd->pool, 
                                                         sizeof(provider_alias_rec));
-        const authz_provider *provider = ap_lookup_provider(AUTHZ_PROVIDER_GROUP,
-                                                            provider_name,"0");
+        const authz_provider *provider =
+            ap_lookup_provider(AUTHZ_PROVIDER_GROUP, provider_name,
+                               AUTHZ_PROVIDER_VERSION);
 
         /* Save off the new directory config along with the original provider name
          * and function pointer data 
@@ -483,7 +485,8 @@
 
         /* Register the fake provider so that we get called first */
         ap_register_auth_provider(cmd->pool, AUTHZ_PROVIDER_GROUP,
-                                  provider_alias, "0", &authz_alias_provider,
+                                  provider_alias, AUTHZ_PROVIDER_VERSION,
+                                  &authz_alias_provider,
                                   AP_AUTH_INTERNAL_PER_CONF);
     }
 
@@ -804,7 +807,8 @@
 
 static apr_array_header_t *authz_ap_list_provider_names(apr_pool_t *ptemp)
 {   
-    return ap_list_provider_names(ptemp, AUTHZ_PROVIDER_GROUP, "0");
+    return ap_list_provider_names(ptemp, AUTHZ_PROVIDER_GROUP,
+                                  AUTHZ_PROVIDER_VERSION);
 }
 
 static void register_hooks(apr_pool_t *p)

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_dbd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_dbd.c?rev=658046&r1=658045&r2=658046&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_dbd.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_dbd.c Mon May 19 16:53:05 2008
@@ -310,13 +310,16 @@
 
 static void authz_dbd_hooks(apr_pool_t *p)
 {
-    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "dbd-group", "0",
+    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "dbd-group",
+                              AUTHZ_PROVIDER_VERSION,
                               &authz_dbdgroup_provider,
                               AP_AUTH_INTERNAL_PER_CONF);
-    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "dbd-login", "0",
+    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "dbd-login",
+                              AUTHZ_PROVIDER_VERSION,
                               &authz_dbdlogin_provider,
                               AP_AUTH_INTERNAL_PER_CONF);
-    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "dbd-logout", "0",
+    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "dbd-logout",
+                              AUTHZ_PROVIDER_VERSION,
                               &authz_dbdlogout_provider,
                               AP_AUTH_INTERNAL_PER_CONF);
 }

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c?rev=658046&r1=658045&r2=658046&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c Mon May 19 16:53:05 2008
@@ -272,10 +272,12 @@
 {
     authz_owner_get_file_group = APR_RETRIEVE_OPTIONAL_FN(authz_owner_get_file_group);
 
-    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "dbm-group", "0",
+    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "dbm-group",
+                              AUTHZ_PROVIDER_VERSION,
                               &authz_dbmgroup_provider,
                               AP_AUTH_INTERNAL_PER_CONF);
-    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "dbm-file-group", "0",
+    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "dbm-file-group",
+                              AUTHZ_PROVIDER_VERSION,
                               &authz_dbmfilegroup_provider,
                               AP_AUTH_INTERNAL_PER_CONF);
 }

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c?rev=658046&r1=658045&r2=658046&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_groupfile.c Mon May 19 16:53:05 2008
@@ -266,10 +266,12 @@
 {
     authz_owner_get_file_group = APR_RETRIEVE_OPTIONAL_FN(authz_owner_get_file_group);
 
-    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "group", "0",
+    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "group",
+                              AUTHZ_PROVIDER_VERSION,
                               &authz_group_provider,
                               AP_AUTH_INTERNAL_PER_CONF);
-    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "file-group", "0",
+    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "file-group",
+                              AUTHZ_PROVIDER_VERSION,
                               &authz_filegroup_provider,
                               AP_AUTH_INTERNAL_PER_CONF);
 }

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_host.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_host.c?rev=658046&r1=658045&r2=658046&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_host.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_host.c Mon May 19 16:53:05 2008
@@ -241,13 +241,17 @@
 
 static void register_hooks(apr_pool_t *p)
 {
-    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "env", "0",
+    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "env",
+                              AUTHZ_PROVIDER_VERSION,
                               &authz_env_provider, AP_AUTH_INTERNAL_PER_CONF);
-    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "ip", "0",
+    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "ip",
+                              AUTHZ_PROVIDER_VERSION,
                               &authz_ip_provider, AP_AUTH_INTERNAL_PER_CONF);
-    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "host", "0",
+    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "host",
+                              AUTHZ_PROVIDER_VERSION,
                               &authz_host_provider, AP_AUTH_INTERNAL_PER_CONF);
-    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "all", "0",
+    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "all",
+                              AUTHZ_PROVIDER_VERSION,
                               &authz_all_provider, AP_AUTH_INTERNAL_PER_CONF);
 }
 

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_owner.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_owner.c?rev=658046&r1=658045&r2=658046&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_owner.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_owner.c Mon May 19 16:53:05 2008
@@ -167,7 +167,8 @@
 {
     APR_REGISTER_OPTIONAL_FN(authz_owner_get_file_group);
 
-    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "file-owner", "0",
+    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "file-owner",
+                              AUTHZ_PROVIDER_VERSION,
                               &authz_fileowner_provider,
                               AP_AUTH_INTERNAL_PER_CONF);
 }

Modified: httpd/httpd/trunk/modules/aaa/mod_authz_user.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_user.c?rev=658046&r1=658045&r2=658046&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_user.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_user.c Mon May 19 16:53:05 2008
@@ -81,9 +81,11 @@
 
 static void register_hooks(apr_pool_t *p)
 {
-    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "user", "0",
+    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "user",
+                              AUTHZ_PROVIDER_VERSION,
                               &authz_user_provider, AP_AUTH_INTERNAL_PER_CONF);
-    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "valid-user", "0",
+    ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "valid-user",
+                              AUTHZ_PROVIDER_VERSION,
                               &authz_validuser_provider,
                               AP_AUTH_INTERNAL_PER_CONF);
 }



Mime
View raw message