From: Chris Darroch <chrisd@apache.org>
Date: Sat, 1 Nov 2008 18:22:55 +0000 (+0000)
Subject: move some variable initializations prior to larger changes
X-Git-Tag: 2.3.0~175
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99b3df75de1dc2c17f07b257825c67417a7cb621;p=apache

move some variable initializations prior to larger changes


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

diff --git a/modules/aaa/mod_authz_core.c b/modules/aaa/mod_authz_core.c
index ee5fcebfc1..f61d214ab8 100644
--- a/modules/aaa/mod_authz_core.c
+++ b/modules/aaa/mod_authz_core.c
@@ -194,10 +194,13 @@ static authz_status authz_alias_check_authorization(request_rec *r,
         if (prvdraliasrec) {
             ap_conf_vector_t *orig_dir_config = r->per_dir_config;
 
-            r->per_dir_config = ap_merge_per_dir_configs(r->pool, orig_dir_config,
-                                                         prvdraliasrec->sec_auth);
-            ret = prvdraliasrec->provider->check_authorization(r,
-                                                    prvdraliasrec->provider_args);
+            r->per_dir_config =
+                ap_merge_per_dir_configs(r->pool, orig_dir_config,
+                                         prvdraliasrec->sec_auth);
+
+            ret = prvdraliasrec->provider->
+                check_authorization(r, prvdraliasrec->provider_args);
+
             r->per_dir_config = orig_dir_config;
         }
     }
@@ -213,14 +216,14 @@ static const authz_provider authz_alias_provider =
 static const char *authz_require_alias_section(cmd_parms *cmd, void *mconfig,
                                                const char *arg)
 {
-    int old_overrides = cmd->override;
     const char *endp = ap_strrchr_c(arg, '>');
     const char *args;
-    char *provider_alias;
     char *provider_name;
+    char *provider_alias;
     char *provider_args;
-    const char *errmsg;
     ap_conf_vector_t *new_authz_config = ap_create_per_dir_config(cmd->pool);
+    int old_overrides = cmd->override;
+    const char *errmsg;
 
     const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
     if (err != NULL) {
@@ -525,14 +528,15 @@ static const char *add_authz_provider(cmd_parms *cmd, void *config,
     return merge_authz_provider(conf, newp);
 }
 
-static const char *authz_require_section(cmd_parms *cmd, void *mconfig, const char *arg)
+static const char *authz_require_section(cmd_parms *cmd,
+                                         void *mconfig, const char *arg)
 {
-    int old_overrides = cmd->override;
+    authz_core_dir_conf *conf = (authz_core_dir_conf*)mconfig;
     const char *endp = ap_strrchr_c(arg, '>');
     const char *args;
-    const char *errmsg;
     authz_request_state old_reqstate;
-    authz_core_dir_conf *conf = (authz_core_dir_conf*)mconfig;
+    int old_overrides = cmd->override;
+    const char *errmsg;
 
     if (endp == NULL) {
         return apr_pstrcat(cmd->pool, cmd->cmd->name,
@@ -745,12 +749,13 @@ static authz_status check_provider_list (request_rec *r, authz_provider_list *cu
 
 static int authorize_user(request_rec *r)
 {
-    authz_core_dir_conf *conf = ap_get_module_config(r->per_dir_config,
-            &authz_core_module);
+    authz_core_dir_conf *conf;
     authz_status auth_result;
     authz_provider_list *current_provider;
     const char *note = apr_table_get(r->notes, AUTHZ_ACCESS_PASSED_NOTE);
 
+    conf = ap_get_module_config(r->per_dir_config, &authz_core_module);
+
     /* If we're not really configured for providers, stop now. */
     if (!conf->providers) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
@@ -813,11 +818,12 @@ static int authorize_user(request_rec *r)
 
 static int authz_some_auth_required(request_rec *r)
 {
-    authz_core_dir_conf *conf = ap_get_module_config(r->per_dir_config,
-            &authz_core_module);
+    authz_core_dir_conf *conf;
     authz_provider_list *current_provider;
     int req_authz = 0;
 
+    conf = ap_get_module_config(r->per_dir_config, &authz_core_module);
+
     current_provider = conf->providers;
 
     while (current_provider) {