From: Stefan Fritsch <sf@apache.org>
Date: Sat, 16 Jun 2012 22:44:36 +0000 (+0000)
Subject: pass the provider name to parse_require_line as pool userdata
X-Git-Tag: 2.5.0-alpha~6733
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb0cf2cf8151b4999620773a1cda0570129cd094;p=thirdparty%2Fapache%2Fhttpd.git

pass the provider name to parse_require_line as pool userdata

This allows a single C function to implement several authz providers.


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

diff --git a/modules/aaa/mod_authz_core.c b/modules/aaa/mod_authz_core.c
index dc116696aed..a5c628e8de1 100644
--- a/modules/aaa/mod_authz_core.c
+++ b/modules/aaa/mod_authz_core.c
@@ -413,8 +413,14 @@ static const char *add_authz_provider(cmd_parms *cmd, void *config,
     section->limited = cmd->limited;
 
     if (section->provider->parse_require_line) {
-        const char *err = section->provider->parse_require_line(cmd, args,
-                                                                &section->provider_parsed_args);
+        const char *err;
+        apr_pool_userdata_setn(section->provider_name,
+                               AUTHZ_PROVIDER_NAME_NOTE,
+                               apr_pool_cleanup_null,
+                               cmd->temp_pool);
+        err = section->provider->parse_require_line(cmd, args,
+                                              &section->provider_parsed_args);
+
         if (err)
             return err;
     }