diff --git a/modules/aaa/mod_authnz_ldap.c b/modules/aaa/mod_authnz_ldap.c index d9212f2..c8419c8 100644 --- a/modules/aaa/mod_authnz_ldap.c +++ b/modules/aaa/mod_authnz_ldap.c @@ -547,24 +547,24 @@ static authn_status authn_ldap_check_password(request_rec *r, const char *user, } else { ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01690) - "auth_ldap authenticate: no sec->host - weird...?"); + "authnz_ldap authenticate: no sec->host - weird...?"); return AUTH_GENERAL_ERROR; } ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01691) - "auth_ldap authenticate: using URL %s", sec->url); + "authnz_ldap authenticate: using URL %s", sec->url); /* Get the password that the client sent */ if (password == NULL) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01692) - "auth_ldap authenticate: no password specified"); + "authnz_ldap authenticate: no password specified"); release_ldc(r, ldc); return AUTH_GENERAL_ERROR; } if (user == NULL) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01693) - "auth_ldap authenticate: no user specified"); + "authnz_ldap authenticate: no user specified"); release_ldc(r, ldc); return AUTH_GENERAL_ERROR; } @@ -572,14 +572,14 @@ static authn_status authn_ldap_check_password(request_rec *r, const char *user, /* build the username filter */ if (APR_SUCCESS != authn_ldap_build_filter(filtbuf, r, user, NULL, sec)) { ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02622) - "auth_ldap authenticate: ldap filter too long (>%d): %s", + "authnz_ldap authenticate: ldap filter too long (>%d): %s", FILTER_LENGTH, filtbuf); release_ldc(r, ldc); return AUTH_GENERAL_ERROR; } ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, - "auth_ldap authenticate: final authn filter is %s", filtbuf); + "authnz_ldap authenticate: final authn filter is %s", filtbuf); /* convert password to utf-8 */ utfpassword = authn_ldap_xlate_password(r, password); @@ -594,14 +594,14 @@ static authn_status authn_ldap_check_password(request_rec *r, const char *user, if (result != LDAP_SUCCESS) { if (!sec->bind_authoritative) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01694) - "auth_ldap authenticate: user %s authentication failed; " + "authnz_ldap authenticate: user %s authentication failed; " "URI %s [%s][%s] (not authoritative)", user, r->uri, ldc->reason, ldap_err2string(result)); return AUTH_USER_NOT_FOUND; } ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01695) - "auth_ldap authenticate: " + "authnz_ldap authenticate: " "user %s authentication failed; URI %s [%s][%s]", user, r->uri, ldc->reason, ldap_err2string(result)); @@ -646,7 +646,7 @@ static authn_status authn_ldap_check_password(request_rec *r, const char *user, /* sanity check */ if (sec->remote_user_attribute && !remote_user_attribute_set) { ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01696) - "auth_ldap authenticate: " + "authnz_ldap authenticate: " "REMOTE_USER was to be set with attribute '%s', " "but this attribute was not requested for in the " "LDAP query for the user. REMOTE_USER will fall " @@ -655,7 +655,7 @@ static authn_status authn_ldap_check_password(request_rec *r, const char *user, } ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01697) - "auth_ldap authenticate: accepting %s", user); + "authnz_ldap authenticate: accepting %s", user); return AUTH_GRANTED; } @@ -673,7 +673,7 @@ static authz_status get_dn_for_nonldap_authn(request_rec *r, util_ldap_connectio /* Build the username filter */ if (APR_SUCCESS != authn_ldap_build_filter(filtbuf, r, r->user, NULL, sec)) { ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02623) - "auth_ldap authorize: ldap filter too long (>%d): %s", + "authnz_ldap authorize: ldap filter too long (>%d): %s", FILTER_LENGTH, filtbuf); return AUTHZ_DENIED; } @@ -685,7 +685,7 @@ static authz_status get_dn_for_nonldap_authn(request_rec *r, util_ldap_connectio /* Search failed, log error and return failure */ if (result != LDAP_SUCCESS) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01701) - "auth_ldap authorise: User DN not found, %s", ldc->reason); + "authnz_ldap authorise: User DN not found, %s", ldc->reason); return AUTHZ_DENIED; } @@ -724,7 +724,7 @@ static authz_status ldapuser_check_authorization(request_rec *r, if (!sec->host) { ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01698) - "auth_ldap authorize: no sec->host - weird...?"); + "authnz_ldap authorize: no sec->host - weird...?"); return AUTHZ_DENIED; } @@ -750,13 +750,13 @@ static authz_status ldapuser_check_authorization(request_rec *r, if (!strlen(r->user)) { ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01699) - "ldap authorize: Userid is blank, AuthType=%s", + "authnz_ldap authorize: Userid is blank, AuthType=%s", r->ap_auth_type); } if (req->dn == NULL || strlen(req->dn) == 0) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01702) - "auth_ldap authorize: require user: user's DN has not " + "authnz_ldap authorize: require user: user's DN has not " "been defined; failing authorization"); return AUTHZ_DENIED; } @@ -764,7 +764,7 @@ static authz_status ldapuser_check_authorization(request_rec *r, require = ap_expr_str_exec(r, expr, &err); if (err) { ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02585) - "auth_ldap authorize: require user: Can't evaluate expression: %s", + "authnz_ldap authorize: require user: Can't evaluate expression: %s", err); return AUTHZ_DENIED; } @@ -777,14 +777,14 @@ static authz_status ldapuser_check_authorization(request_rec *r, switch(result) { case LDAP_COMPARE_TRUE: { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01703) - "auth_ldap authorize: require user: authorization " + "authnz_ldap authorize: require user: authorization " "successful"); set_request_vars(r, LDAP_AUTHZ, req->vals); return AUTHZ_GRANTED; } default: { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01704) - "auth_ldap authorize: require user: " + "authnz_ldap authorize: require user: " "authorization failed [%s][%s]", ldc->reason, ldap_err2string(result)); } @@ -799,14 +799,14 @@ static authz_status ldapuser_check_authorization(request_rec *r, switch(result) { case LDAP_COMPARE_TRUE: { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01705) - "auth_ldap authorize: " + "authnz_ldap authorize: " "require user: authorization successful"); set_request_vars(r, LDAP_AUTHZ, req->vals); return AUTHZ_GRANTED; } default: { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01706) - "auth_ldap authorize: " + "authnz_ldap authorize: " "require user: authorization failed [%s][%s]", ldc->reason, ldap_err2string(result)); } @@ -814,7 +814,7 @@ static authz_status ldapuser_check_authorization(request_rec *r, } ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01707) - "auth_ldap authorize user: authorization denied for " + "authnz_ldap authorize user: authorization denied for " "user %s to %s", r->user, r->uri); @@ -852,7 +852,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r, if (!sec->host) { ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01708) - "auth_ldap authorize: no sec->host - weird...?"); + "authnz_ldap authorize: no sec->host - weird...?"); return AUTHZ_DENIED; } @@ -912,7 +912,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r, if (!strlen(r->user)) { ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01709) - "ldap authorize: Userid is blank, AuthType=%s", + "authnz_ldap authorize: Userid is blank, AuthType=%s", r->ap_auth_type); } @@ -922,7 +922,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r, if (sec->group_attrib_is_dn) { if (req->dn == NULL || strlen(req->dn) == 0) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01712) - "auth_ldap authorize: require group: user's DN has " + "authnz_ldap authorize: require group: user's DN has " "not been defined; failing authorization for user %s", r->user); return AUTHZ_DENIED; @@ -939,7 +939,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r, require = ap_expr_str_exec(r, expr, &err); if (err) { ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02586) - "auth_ldap authorize: require group: Can't evaluate expression: %s", + "authnz_ldap authorize: require group: Can't evaluate expression: %s", err); return AUTHZ_DENIED; } @@ -947,14 +947,14 @@ static authz_status ldapgroup_check_authorization(request_rec *r, t = require; ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01713) - "auth_ldap authorize: require group: testing for group " + "authnz_ldap authorize: require group: testing for group " "membership in \"%s\"", t); /* PR52464 exhaust attrs in base group before checking subgroups */ for (i = 0; i < sec->groupattr->nelts; i++) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01714) - "auth_ldap authorize: require group: testing for %s: " + "authnz_ldap authorize: require group: testing for %s: " "%s (%s)", ent[i].name, sec->group_attrib_is_dn ? req->dn : req->user, t); @@ -963,7 +963,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r, sec->group_attrib_is_dn ? req->dn : req->user); if (result == LDAP_COMPARE_TRUE) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01715) - "auth_ldap authorize: require group: " + "authnz_ldap authorize: require group: " "authorization successful (attribute %s) " "[%s][%d - %s]", ent[i].name, ldc->reason, result, @@ -973,7 +973,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r, } else { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01719) - "auth_ldap authorize: require group \"%s\": " + "authnz_ldap authorize: require group \"%s\": " "didn't match with attr %s [%s][%d - %s]", t, ent[i].name, ldc->reason, result, ldap_err2string(result)); @@ -985,7 +985,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r, release_ldc(r, ldc); ldc = get_connection_for_authz(r, LDAP_COMPARE_AND_SEARCH); ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01716) - "auth_ldap authorise: require group \"%s\": " + "authnz_ldap authorise: require group \"%s\": " "failed [%s][%d - %s], checking sub-groups", t, ldc->reason, result, ldap_err2string(result)); } @@ -999,7 +999,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r, 0, sec->maxNestingDepth); if (result == LDAP_COMPARE_TRUE) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01717) - "auth_ldap authorise: require group " + "authnz_ldap authorise: require group " "(sub-group): authorisation successful " "(attribute %s) [%s][%d - %s]", ent[i].name, ldc->reason, result, @@ -1009,7 +1009,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r, } else { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01718) - "auth_ldap authorise: require group " + "authnz_ldap authorise: require group " "(sub-group) \"%s\": didn't match with attr %s " "[%s][%d - %s]", t, ldc->reason, ent[i].name, result, @@ -1018,7 +1018,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r, } ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01720) - "auth_ldap authorize group: authorization denied for " + "authnz_ldap authorize group: authorization denied for " "user %s to %s", r->user, r->uri); @@ -1053,19 +1053,19 @@ static authz_status ldapdn_check_authorization(request_rec *r, if (!sec->host) { ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01721) - "auth_ldap authorize: no sec->host - weird...?"); + "authnz_ldap authorize: no sec->host - weird...?"); return AUTHZ_DENIED; } /* - * If we have been authenticated by some other module than mod_auth_ldap, + * If we have been authenticated by some other module than mod_authnz_ldap, * the req structure needed for authorization needs to be created * and populated with the userid and DN of the account in LDAP */ if (!strlen(r->user)) { ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01722) - "ldap authorize: Userid is blank, AuthType=%s", + "authnz_ldap authorize: Userid is blank, AuthType=%s", r->ap_auth_type); } @@ -1084,7 +1084,7 @@ static authz_status ldapdn_check_authorization(request_rec *r, require = ap_expr_str_exec(r, expr, &err); if (err) { ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02587) - "auth_ldap authorize: require dn: Can't evaluate expression: %s", + "authnz_ldap authorize: require dn: Can't evaluate expression: %s", err); return AUTHZ_DENIED; } @@ -1093,7 +1093,7 @@ static authz_status ldapdn_check_authorization(request_rec *r, if (req->dn == NULL || strlen(req->dn) == 0) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01725) - "auth_ldap authorize: require dn: user's DN has not " + "authnz_ldap authorize: require dn: user's DN has not " "been defined; failing authorization"); return AUTHZ_DENIED; } @@ -1102,14 +1102,14 @@ static authz_status ldapdn_check_authorization(request_rec *r, switch(result) { case LDAP_COMPARE_TRUE: { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01726) - "auth_ldap authorize: " + "authnz_ldap authorize: " "require dn: authorization successful"); set_request_vars(r, LDAP_AUTHZ, req->vals); return AUTHZ_GRANTED; } default: { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01727) - "auth_ldap authorize: " + "authnz_ldap authorize: " "require dn \"%s\": LDAP error [%s][%s]", t, ldc->reason, ldap_err2string(result)); } @@ -1117,7 +1117,7 @@ static authz_status ldapdn_check_authorization(request_rec *r, ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01728) - "auth_ldap authorize dn: authorization denied for " + "authnz_ldap authorize dn: authorization denied for " "user %s to %s", r->user, r->uri); @@ -1153,19 +1153,19 @@ static authz_status ldapattribute_check_authorization(request_rec *r, if (!sec->host) { ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01729) - "auth_ldap authorize: no sec->host - weird...?"); + "authnz_ldap authorize: no sec->host - weird...?"); return AUTHZ_DENIED; } /* - * If we have been authenticated by some other module than mod_auth_ldap, + * If we have been authenticated by some other module than mod_authnz_ldap, * the req structure needed for authorization needs to be created * and populated with the userid and DN of the account in LDAP */ if (!strlen(r->user)) { ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01730) - "ldap authorize: Userid is blank, AuthType=%s", + "authnz_ldap authorize: Userid is blank, AuthType=%s", r->ap_auth_type); } @@ -1183,7 +1183,7 @@ static authz_status ldapattribute_check_authorization(request_rec *r, if (req->dn == NULL || strlen(req->dn) == 0) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01733) - "auth_ldap authorize: require ldap-attribute: user's DN " + "authnz_ldap authorize: require ldap-attribute: user's DN " "has not been defined; failing authorization"); return AUTHZ_DENIED; } @@ -1191,7 +1191,7 @@ static authz_status ldapattribute_check_authorization(request_rec *r, require = ap_expr_str_exec(r, expr, &err); if (err) { ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02588) - "auth_ldap authorize: require ldap-attribute: Can't " + "authnz_ldap authorize: require ldap-attribute: Can't " "evaluate expression: %s", err); return AUTHZ_DENIED; } @@ -1203,20 +1203,20 @@ static authz_status ldapattribute_check_authorization(request_rec *r, value = ap_getword_conf(r->pool, &t); ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01734) - "auth_ldap authorize: checking attribute %s has value %s", + "authnz_ldap authorize: checking attribute %s has value %s", w, value); result = util_ldap_cache_compare(r, ldc, sec->url, req->dn, w, value); switch(result) { case LDAP_COMPARE_TRUE: { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01735) - "auth_ldap authorize: " + "authnz_ldap authorize: " "require attribute: authorization successful"); set_request_vars(r, LDAP_AUTHZ, req->vals); return AUTHZ_GRANTED; } default: { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01736) - "auth_ldap authorize: require attribute: " + "authnz_ldap authorize: require attribute: " "authorization failed [%s][%s]", ldc->reason, ldap_err2string(result)); } @@ -1224,7 +1224,7 @@ static authz_status ldapattribute_check_authorization(request_rec *r, } ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01737) - "auth_ldap authorize attribute: authorization denied for " + "authnz_ldap authorize attribute: authorization denied for " "user %s to %s", r->user, r->uri); @@ -1262,19 +1262,19 @@ static authz_status ldapfilter_check_authorization(request_rec *r, if (!sec->host) { ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01738) - "auth_ldap authorize: no sec->host - weird...?"); + "authnz_ldap authorize: no sec->host - weird...?"); return AUTHZ_DENIED; } /* - * If we have been authenticated by some other module than mod_auth_ldap, + * If we have been authenticated by some other module than mod_authnz_ldap, * the req structure needed for authorization needs to be created * and populated with the userid and DN of the account in LDAP */ if (!strlen(r->user)) { ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01739) - "ldap authorize: Userid is blank, AuthType=%s", + "authnz_ldap authorize: Userid is blank, AuthType=%s", r->ap_auth_type); } @@ -1292,7 +1292,7 @@ static authz_status ldapfilter_check_authorization(request_rec *r, if (req->dn == NULL || strlen(req->dn) == 0) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01742) - "auth_ldap authorize: require ldap-filter: user's DN " + "authnz_ldap authorize: require ldap-filter: user's DN " "has not been defined; failing authorization"); return AUTHZ_DENIED; } @@ -1300,7 +1300,7 @@ static authz_status ldapfilter_check_authorization(request_rec *r, require = ap_expr_str_exec(r, expr, &err); if (err) { ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02589) - "auth_ldap authorize: require ldap-filter: Can't " + "authnz_ldap authorize: require ldap-filter: Can't " "evaluate require expression: %s", err); return AUTHZ_DENIED; } @@ -1309,12 +1309,12 @@ static authz_status ldapfilter_check_authorization(request_rec *r, if (t[0]) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01743) - "auth_ldap authorize: checking filter %s", t); + "authnz_ldap authorize: checking filter %s", t); /* Build the username filter */ if (APR_SUCCESS != authn_ldap_build_filter(filtbuf, r, req->user, t, sec)) { ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02628) - "auth_ldap authorize: ldap filter too long (>%d): %s", + "authnz_ldap authorize: ldap filter too long (>%d): %s", FILTER_LENGTH, filtbuf); return AUTHZ_DENIED; } @@ -1326,7 +1326,7 @@ static authz_status ldapfilter_check_authorization(request_rec *r, /* Make sure that the filtered search returned the correct user dn */ if (result == LDAP_SUCCESS) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01744) - "auth_ldap authorize: checking dn match %s", dn); + "authnz_ldap authorize: checking dn match %s", dn); if (sec->compare_as_user) { /* ldap-filter is the only authz that requires a search and a compare */ release_ldc(r, ldc); @@ -1339,21 +1339,21 @@ static authz_status ldapfilter_check_authorization(request_rec *r, switch(result) { case LDAP_COMPARE_TRUE: { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01745) - "auth_ldap authorize: require ldap-filter: " + "authnz_ldap authorize: require ldap-filter: " "authorization successful"); set_request_vars(r, LDAP_AUTHZ, req->vals); return AUTHZ_GRANTED; } case LDAP_FILTER_ERROR: { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01746) - "auth_ldap authorize: require ldap-filter: " + "authnz_ldap authorize: require ldap-filter: " "%s authorization failed [%s][%s]", filtbuf, ldc->reason, ldap_err2string(result)); break; } default: { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01747) - "auth_ldap authorize: require ldap-filter: " + "authnz_ldap authorize: require ldap-filter: " "authorization failed [%s][%s]", ldc->reason, ldap_err2string(result)); } @@ -1361,7 +1361,7 @@ static authz_status ldapfilter_check_authorization(request_rec *r, } ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01748) - "auth_ldap authorize filter: authorization denied for " + "authnz_ldap authorize filter: authorization denied for " "user %s to %s", r->user, r->uri); @@ -1393,14 +1393,14 @@ static authz_status ldapsearch_check_authorization(request_rec *r, } else { ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(02636) - "auth_ldap authorize: no sec->host - weird...?"); + "authnz_ldap authorize: no sec->host - weird...?"); return AUTHZ_DENIED; } require = ap_expr_str_exec(r, expr, &err); if (err) { ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02629) - "auth_ldap authorize: require ldap-search: Can't " + "authnz_ldap authorize: require ldap-search: Can't " "evaluate require expression: %s", err); return AUTHZ_DENIED; } @@ -1411,7 +1411,7 @@ static authz_status ldapsearch_check_authorization(request_rec *r, const char **vals; ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02630) - "auth_ldap authorize: checking filter %s", t); + "authnz_ldap authorize: checking filter %s", t); /* Search for the user DN */ result = util_ldap_cache_getuserdn(r, ldc, sec->url, sec->basedn, @@ -1420,20 +1420,20 @@ static authz_status ldapsearch_check_authorization(request_rec *r, /* Make sure that the filtered search returned a single dn */ if (result == LDAP_SUCCESS && dn) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02631) - "auth_ldap authorize: require ldap-search: " + "authnz_ldap authorize: require ldap-search: " "authorization successful"); return AUTHZ_GRANTED; } else { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02632) - "auth_ldap authorize: require ldap-search: " + "authnz_ldap authorize: require ldap-search: " "%s authorization failed [%s][%s]", t, ldc->reason, ldap_err2string(result)); } } ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02633) - "auth_ldap authorize search: authorization denied for " + "authnz_ldap authorize search: authorization denied for " "to %s", r->uri); return AUTHZ_DENIED; @@ -1556,7 +1556,7 @@ static const char *mod_auth_ldap_parse_url(cmd_parms *cmd, sec->have_ldap_url = 1; ap_log_error(APLOG_MARK, APLOG_TRACE1, 0, cmd->server, - "auth_ldap url parse: `%s', Host: %s, Port: %d, DN: %s, " + "authnz_ldap url parse: `%s', Host: %s, Port: %d, DN: %s, " "attrib: %s, scope: %s, filter: %s, connection mode: %s", url, urld->lud_host, @@ -1766,7 +1766,7 @@ static const command_rec authnz_ldap_cmds[] = AP_INIT_FLAG("AuthLDAPCompareDNOnServer", ap_set_flag_slot, (void *)APR_OFFSETOF(authn_ldap_config_t, compare_dn_on_server), OR_AUTHCFG, - "Set to 'on' to force auth_ldap to do DN compares (for the \"require dn\" " + "Set to 'on' to force authnz_ldap to do DN compares (for the \"require dn\" " "directive) using the server, and set it 'off' to do the compares locally " "(at the expense of possible false matches). See the documentation for " "a complete description of this option."), @@ -1788,8 +1788,8 @@ static const command_rec authnz_ldap_cmds[] = AP_INIT_FLAG("AuthLDAPGroupAttributeIsDN", ap_set_flag_slot, (void *)APR_OFFSETOF(authn_ldap_config_t, group_attrib_is_dn), OR_AUTHCFG, - "If set to 'on', auth_ldap uses the DN that is retrieved from the server for " - "subsequent group comparisons. If set to 'off', auth_ldap uses the string " + "If set to 'on', authnz_ldap uses the DN that is retrieved from the server for " + "subsequent group comparisons. If set to 'off', authnz_ldap uses the string " "provided by the client directly. Defaults to 'on'."), AP_INIT_TAKE1("AuthLDAPDereferenceAliases", mod_auth_ldap_set_deref, NULL, OR_AUTHCFG,