summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBradley Nicholes <bnicholes@apache.org>2006-01-07 00:03:20 +0000
committerBradley Nicholes <bnicholes@apache.org>2006-01-07 00:03:20 +0000
commit2b438a059c48f1589acdf621ceaf062c09d9e8d1 (patch)
tree1ac1db5a337c8cb55d48b3429d4af6ff66089f04
parentde0a8728c9f4e545f9462356983673e6e8819202 (diff)
downloadhttpd-2b438a059c48f1589acdf621ceaf062c09d9e8d1.tar.gz
Fix a few minor compiler errors in the merge of mod_authn_alias into mod_authn_core
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@366604 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--modules/aaa/mod_authn_core.c8
-rw-r--r--modules/aaa/mod_authz_core.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/aaa/mod_authn_core.c b/modules/aaa/mod_authn_core.c
index 0c5e9d27a2..b8e189e1cd 100644
--- a/modules/aaa/mod_authn_core.c
+++ b/modules/aaa/mod_authn_core.c
@@ -30,8 +30,8 @@
#define CORE_PRIVATE
#include "ap_config.h"
#include "httpd.h"
-#include "http_core.h"
#include "http_config.h"
+#include "http_core.h"
#include "http_log.h"
#include "http_request.h"
#include "http_protocol.h"
@@ -114,7 +114,7 @@ static authn_status authn_alias_check_password(request_rec *r, const char *user,
authn_status ret = AUTH_USER_NOT_FOUND;
authn_alias_srv_conf *authcfg =
(authn_alias_srv_conf *)ap_get_module_config(r->server->module_config,
- &authn_alias_module);
+ &authn_core_module);
if (provider_name) {
provider_alias_rec *prvdraliasrec = apr_hash_get(authcfg->alias_rec,
@@ -146,7 +146,7 @@ static authn_status authn_alias_get_realm_hash(request_rec *r, const char *user,
authn_status ret = AUTH_USER_NOT_FOUND;
authn_alias_srv_conf *authcfg =
(authn_alias_srv_conf *)ap_get_module_config(r->server->module_config,
- &authn_alias_module);
+ &authn_core_module);
if (provider_name) {
provider_alias_rec *prvdraliasrec = apr_hash_get(authcfg->alias_rec,
@@ -194,7 +194,7 @@ static const char *authaliassection(cmd_parms *cmd, void *mconfig, const char *a
ap_conf_vector_t *new_auth_config = ap_create_per_dir_config(cmd->pool);
authn_alias_srv_conf *authcfg =
(authn_alias_srv_conf *)ap_get_module_config(cmd->server->module_config,
- &authn_alias_module);
+ &authn_core_module);
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) {
diff --git a/modules/aaa/mod_authz_core.c b/modules/aaa/mod_authz_core.c
index 150c9ea705..68ee794fbe 100644
--- a/modules/aaa/mod_authz_core.c
+++ b/modules/aaa/mod_authz_core.c
@@ -84,9 +84,9 @@ X- Reimplement the host based authorization 'allow', 'deny'
and 'order' as authz providers
X- Remove the 'allow', 'deny' and 'order' directives
- Merge mod_authn_alias into mod_authn_core
-- Remove all of the references to the authzxxxAuthoritative
+X- Remove all of the references to the authzxxxAuthoritative
directives from the documentation
-- Remove the Satisfy directive from the documentation
+X- Remove the Satisfy directive from the documentation
*/
typedef struct provider_alias_rec {