Commit b840fc5f authored by Chris Darroch's avatar Chris Darroch
Browse files

remove trailing whitespace, adjust formatting and comments prior 

to larger changes


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

modules/aaa/mod_authz_core.c

+14 −12
Changes for modules/aaa/mod_authz_core.c: 14 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -125,7 +125,8 @@ static void *create_authz_core_dir_config(apr_pool_t *p, char *dummy) 
    return (void *)conf;

}



static void *merge_authz_core_dir_config(apr_pool_t *a, void *basev, void *newv)

static void *merge_authz_core_dir_config(apr_pool_t *a,

                                         void *basev, void *newv)

{

    authz_core_dir_conf *base = (authz_core_dir_conf *)basev;

    authz_core_dir_conf *new = (authz_core_dir_conf *)newv;
@@ -399,23 +400,23 @@ static const char *add_authz_provider(cmd_parms *cmd, void *config, 
}



/* This is a fake authz provider that really merges various authz alias

 * configurations and then envokes them. 

 * configurations and then invokes them.

 */

static authz_status authz_alias_check_authorization(request_rec *r,

                                                    const char *require_args)

{

    /* Look up the provider alias in the alias list.

     * Get the the dir_config and call ap_Merge_per_dir_configs()

     * Call the real provider->check_authorization() function

     * return the result of the above function call 

     */



    const char *provider_name = apr_table_get(r->notes, AUTHZ_PROVIDER_NAME_NOTE);

    authz_status ret = AUTHZ_DENIED;

    authz_core_srv_conf *authcfg =

        (authz_core_srv_conf *)ap_get_module_config(r->server->module_config,

                                                     &authz_core_module);



    /* Look up the provider alias in the alias list.

     * Get the the dir_config and call ap_Merge_per_dir_configs()

     * Call the real provider->check_authorization() function

     * return the result of the above function call

     */



    if (provider_name) {

        provider_alias_rec *prvdraliasrec = apr_hash_get(authcfg->alias_rec,

                                                         provider_name,
@@ -438,7 +439,7 @@ static authz_status authz_alias_check_authorization(request_rec *r, 


static const authz_provider authz_alias_provider =

{

    &authz_alias_check_authorization,

    &authz_alias_check_authorization

};



static const char *authz_require_alias_section(cmd_parms *cmd, void *mconfig,
@@ -483,7 +484,7 @@ static const char *authz_require_alias_section(cmd_parms *cmd, void *mconfig, 
                           "> directive requires additional arguments", NULL);

    }



    /* walk the subsection configuration to get the per_dir config that we will

    /* Walk the subsection configuration to get the per_dir config that we will

     * merge just before the real provider is called.

     */

    cmd->override = OR_ALL|ACCESS_CONF;
@@ -496,8 +497,8 @@ static const char *authz_require_alias_section(cmd_parms *cmd, void *mconfig, 
            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 

        /* Save off the new directory config along with the original

         * provider name and function pointer data

         */

        prvdraliasrec->sec_auth = new_authz_config;

        prvdraliasrec->provider_name = provider_name;
@@ -848,3 +849,4 @@ module AP_MODULE_DECLARE_DATA authz_core_module = 
    authz_cmds,

    register_hooks                  /* register hooks */

};