Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Add lots of unique tags to error log messages

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209766 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit 273b7aac7750c415d8981e8fa5f1ce3ba55d787a 1 parent 7e295ae
Stefan Fritsch authored
Showing with 2,201 additions and 2,185 deletions.
  1. +1 −1  docs/log-message-tags/next-number
  2. +1 −1  modules/aaa/mod_access_compat.c
  3. +1 −1  modules/aaa/mod_allowmethods.c
  4. +5 −5 modules/aaa/mod_auth_basic.c
  5. +40 −40 modules/aaa/mod_auth_digest.c
  6. +8 −8 modules/aaa/mod_auth_form.c
  7. +1 −1  modules/aaa/mod_authn_anon.c
  8. +1 −1  modules/aaa/mod_authn_core.c
  9. +10 −10 modules/aaa/mod_authn_dbd.c
  10. +2 −2 modules/aaa/mod_authn_dbm.c
  11. +4 −4 modules/aaa/mod_authn_file.c
  12. +17 −17 modules/aaa/mod_authn_socache.c
  13. +63 −63 modules/aaa/mod_authnz_ldap.c
  14. +8 −8 modules/aaa/mod_authz_core.c
  15. +11 −11 modules/aaa/mod_authz_dbd.c
  16. +8 −8 modules/aaa/mod_authz_dbm.c
  17. +8 −8 modules/aaa/mod_authz_groupfile.c
  18. +1 −1  modules/aaa/mod_authz_host.c
  19. +10 −10 modules/aaa/mod_authz_owner.c
  20. +1 −1  modules/aaa/mod_authz_user.c
  21. +14 −14 modules/apreq/filter.c
  22. +1 −1  modules/arch/netware/mod_netware.c
  23. +15 −15 modules/arch/netware/mod_nw_ssl.c
  24. +19 −19 modules/arch/unix/mod_privileges.c
  25. +15 −15 modules/arch/unix/mod_unixd.c
  26. +17 −17 modules/arch/win32/mod_isapi.c
  27. +3 −3 modules/arch/win32/mod_win32.c
  28. +8 −8 modules/cache/cache_storage.c
  29. +7 −7 modules/cache/cache_util.c
  30. +30 −30 modules/cache/mod_cache.c
  31. +39 −39 modules/cache/mod_cache_disk.c
  32. +8 −8 modules/cache/mod_file_cache.c
  33. +16 −16 modules/cache/mod_socache_dbm.c
  34. +10 −10 modules/cache/mod_socache_dc.c
  35. +9 −9 modules/cache/mod_socache_memcache.c
  36. +39 −39 modules/cache/mod_socache_shmcb.c
  37. +3 −3 modules/cluster/mod_heartbeat.c
  38. +29 −29 modules/cluster/mod_heartmonitor.c
  39. +5 −5 modules/core/mod_so.c
  40. +4 −4 modules/core/mod_watchdog.c
  41. +16 −16 modules/database/mod_dbd.c
  42. +3 −3 modules/dav/fs/dbm.c
  43. +45 −45 modules/dav/main/mod_dav.c
  44. +1 −1  modules/dav/main/util_lock.c
  45. +3 −3 modules/echo/mod_echo.c
  46. +1 −1  modules/examples/mod_example_hooks.c
  47. +5 −5 modules/examples/mod_example_ipc.c
  48. +3 −3 modules/experimental/mod_noloris.c
  49. +6 −6 modules/filters/mod_charset_lite.c
  50. +27 −27 modules/filters/mod_deflate.c
  51. +13 −13 modules/filters/mod_ext_filter.c
  52. +6 −6 modules/filters/mod_filter.c
  53. +59 −48 modules/filters/mod_include.c
  54. +10 −10 modules/filters/mod_proxy_html.c
  55. +4 −4 modules/filters/mod_ratelimit.c
  56. +1 −1  modules/filters/mod_reflector.c
  57. +1 −1  modules/filters/mod_reqtimeout.c
  58. +5 −5 modules/filters/mod_request.c
  59. +1 −1  modules/filters/mod_sed.c
  60. +1 −1  modules/filters/mod_substitute.c
  61. +22 −22 modules/filters/mod_xml2enc.c
  62. +4 −4 modules/generators/mod_asis.c
  63. +2 −2 modules/generators/mod_autoindex.c
  64. +17 −17 modules/generators/mod_cgi.c
  65. +37 −37 modules/generators/mod_cgid.c
  66. +1 −1  modules/generators/mod_status.c
  67. +1 −1  modules/generators/mod_suexec.c
  68. +2 −2 modules/http/byterange_filter.c
  69. +11 −11 modules/http/http_filters.c
  70. +1 −1  modules/http/http_protocol.c
  71. +4 −4 modules/http/http_request.c
  72. +14 −14 modules/http/mod_mime.c
  73. +46 −46 modules/ldap/util_ldap.c
  74. +5 −5 modules/ldap/util_ldap_cache_mgr.c
  75. +6 −6 modules/loggers/mod_log_config.c
  76. +4 −4 modules/loggers/mod_log_debug.c
  77. +2 −2 modules/loggers/mod_log_forensic.c
  78. +1 −1  modules/lua/lua_config.c
  79. +8 −8 modules/lua/lua_request.c
  80. +4 −4 modules/lua/lua_vmprep.c
  81. +8 −8 modules/lua/mod_lua.c
  82. +1 −1  modules/mappers/mod_actions.c
  83. +6 −6 modules/mappers/mod_alias.c
  84. +3 −3 modules/mappers/mod_imagemap.c
  85. +11 −11 modules/mappers/mod_negotiation.c
  86. +18 −18 modules/mappers/mod_rewrite.c
  87. +3 −3 modules/metadata/mod_cern_meta.c
  88. +1 −1  modules/metadata/mod_env.c
  89. +1 −1  modules/metadata/mod_expires.c
  90. +4 −4 modules/metadata/mod_headers.c
  91. +7 −7 modules/metadata/mod_ident.c
  92. +53 −53 modules/metadata/mod_mime_magic.c
  93. +2 −2 modules/metadata/mod_remoteip.c
  94. +1 −1  modules/metadata/mod_setenvif.c
  95. +5 −5 modules/metadata/mod_unique_id.c
  96. +1 −1  modules/metadata/mod_usertrack.c
  97. +34 −34 modules/proxy/ajp_header.c
  98. +5 −5 modules/proxy/ajp_link.c
  99. +3 −3 modules/proxy/ajp_msg.c
  100. +9 −9 modules/proxy/ajp_utils.c
  101. +2 −2 modules/proxy/balancers/mod_lbmethod_bybusyness.c
  102. +2 −2 modules/proxy/balancers/mod_lbmethod_byrequests.c
  103. +2 −2 modules/proxy/balancers/mod_lbmethod_bytraffic.c
  104. +2 −2 modules/proxy/balancers/mod_lbmethod_heartbeat.c
  105. +3 −3 modules/proxy/examples/mod_lbmethod_rr.c
  106. +16 −16 modules/proxy/mod_proxy.c
  107. +31 −31 modules/proxy/mod_proxy_ajp.c
  108. +50 −50 modules/proxy/mod_proxy_balancer.c
  109. +13 −13 modules/proxy/mod_proxy_connect.c
  110. +6 −6 modules/proxy/mod_proxy_express.c
  111. +21 −21 modules/proxy/mod_proxy_fcgi.c
  112. +6 −6 modules/proxy/mod_proxy_fdpass.c
  113. +25 −25 modules/proxy/mod_proxy_ftp.c
  114. +33 −33 modules/proxy/mod_proxy_http.c
  115. +10 −10 modules/proxy/mod_proxy_scgi.c
  116. +16 −16 modules/proxy/mod_serf.c
  117. +69 −69 modules/proxy/proxy_util.c
  118. +9 −9 modules/session/mod_session.c
  119. +27 −27 modules/session/mod_session_crypto.c
  120. +16 −16 modules/session/mod_session_dbd.c
  121. +4 −4 modules/ssl/mod_ssl.c
  122. +42 −42 modules/ssl/ssl_engine_init.c
  123. +33 −28 modules/ssl/ssl_engine_io.c
  124. +17 −17 modules/ssl/ssl_engine_kernel.c
  125. +3 −3 modules/ssl/ssl_engine_log.c
  126. +4 −4 modules/ssl/ssl_engine_mutex.c
  127. +8 −8 modules/ssl/ssl_engine_ocsp.c
  128. +5 −5 modules/ssl/ssl_engine_pphrase.c
  129. +1 −1  modules/ssl/ssl_engine_rand.c
  130. +2 −2 modules/ssl/ssl_engine_vars.c
  131. +4 −4 modules/ssl/ssl_scache.c
  132. +18 −18 modules/ssl/ssl_util_ocsp.c
  133. +35 −35 modules/ssl/ssl_util_stapling.c
  134. +4 −4 modules/test/mod_dialup.c
  135. +1 −1  modules/test/mod_optional_fn_export.c
  136. +1 −1  modules/test/mod_optional_hook_import.c
  137. +2 −2 os/bs2000/os.c
  138. +10 −10 os/unix/unixd.c
  139. +13 −13 server/config.c
  140. +33 −33 server/core.c
  141. +1 −1  server/core_filters.c
  142. +13 −13 server/listen.c
  143. +24 −24 server/log.c
  144. +10 −10 server/main.c
  145. +65 −65 server/mpm/event/event.c
  146. +1 −1  server/mpm/event/pod.c
  147. +17 −17 server/mpm/mpmt_os2/mpmt_os2.c
  148. +11 −11 server/mpm/mpmt_os2/mpmt_os2_child.c
  149. +18 −18 server/mpm/netware/mpm_netware.c
  150. +47 −47 server/mpm/prefork/prefork.c
  151. +7 −7 server/mpm/simple/simple_api.c
  152. +1 −1  server/mpm/simple/simple_children.c
  153. +1 −1  server/mpm/simple/simple_core.c
  154. +9 −9 server/mpm/simple/simple_io.c
  155. +10 −10 server/mpm/simple/simple_run.c
  156. +39 −39 server/mpm/winnt/child.c
  157. +75 −75 server/mpm/winnt/mpm_winnt.c
  158. +17 −17 server/mpm/winnt/service.c
  159. +1 −1  server/mpm/worker/pod.c
  160. +62 −62 server/mpm/worker/worker.c
  161. +5 −5 server/mpm_common.c
  162. +22 −22 server/mpm_unix.c
  163. +18 −18 server/protocol.c
  164. +15 −15 server/request.c
  165. +5 −5 server/scoreboard.c
  166. +8 −8 server/util.c
  167. +5 −5 server/util_cookies.c
  168. +5 −5 server/util_ebcdic.c
  169. +3 −3 server/util_expr_eval.c
  170. +5 −5 server/util_filter.c
  171. +4 −4 server/util_mutex.c
  172. +3 −3 server/util_xml.c
  173. +4 −4 server/vhost.c
View
2  docs/log-message-tags/next-number
@@ -1 +1 @@
-1
+2183
View
2  modules/aaa/mod_access_compat.c
@@ -350,7 +350,7 @@ static int check_dir_access(request_rec *r)
}
if (ret == HTTP_FORBIDDEN) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01797)
"client denied by server configuration: %s%s",
r->filename ? "" : "uri ",
r->filename ? r->filename : r->uri);
View
2  modules/aaa/mod_allowmethods.c
@@ -67,7 +67,7 @@ static int am_check_access(request_rec *r)
return DECLINED;
}
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01623)
"client method denied by server configuration: '%s' to %s%s",
r->method,
r->filename ? "" : "uri ",
View
10 modules/aaa/mod_auth_basic.c
@@ -155,7 +155,7 @@ static int get_basic_auth(request_rec *r, const char **user,
if (strcasecmp(ap_getword(r->pool, &auth_line, ' '), "Basic")) {
/* Client tried to authenticate using wrong auth scheme */
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01614)
"client used wrong authentication scheme: %s", r->uri);
note_basic_auth_failure(r);
return HTTP_UNAUTHORIZED;
@@ -201,7 +201,7 @@ static int authenticate_basic_user(request_rec *r)
/* We need an authentication realm. */
if (!ap_auth_name(r)) {
ap_log_rerror(APLOG_MARK, APLOG_ERR,
- 0, r, "need AuthName: %s", r->uri);
+ 0, r, APLOGNO(01615) "need AuthName: %s", r->uri);
return HTTP_INTERNAL_SERVER_ERROR;
}
@@ -225,7 +225,7 @@ static int authenticate_basic_user(request_rec *r)
AUTHN_PROVIDER_VERSION);
if (!provider || !provider->check_password) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01616)
"No Authn provider configured");
auth_result = AUTH_GENERAL_ERROR;
break;
@@ -265,14 +265,14 @@ static int authenticate_basic_user(request_rec *r)
switch (auth_result) {
case AUTH_DENIED:
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01617)
"user %s: authentication failure for \"%s\": "
"Password Mismatch",
sent_user, r->uri);
return_code = HTTP_UNAUTHORIZED;
break;
case AUTH_USER_NOT_FOUND:
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01618)
"user %s not found: %s", sent_user, r->uri);
return_code = HTTP_UNAUTHORIZED;
break;
View
80 modules/aaa/mod_auth_digest.c
@@ -200,7 +200,7 @@ module AP_MODULE_DECLARE_DATA auth_digest_module;
static apr_status_t cleanup_tables(void *not_used)
{
- ap_log_error(APLOG_MARK, APLOG_INFO, 0, NULL,
+ ap_log_error(APLOG_MARK, APLOG_INFO, 0, NULL, APLOGNO(01756)
"cleaning up shared memory");
if (client_rmm) {
@@ -230,7 +230,7 @@ static apr_status_t initialize_secret(server_rec *s)
{
apr_status_t status;
- ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s,
+ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s, APLOGNO(01757)
"generating secret for digest authentication ...");
#if APR_HAS_RANDOM
@@ -241,20 +241,20 @@ static apr_status_t initialize_secret(server_rec *s)
if (status != APR_SUCCESS) {
char buf[120];
- ap_log_error(APLOG_MARK, APLOG_CRIT, status, s,
+ ap_log_error(APLOG_MARK, APLOG_CRIT, status, s, APLOGNO(01758)
"error generating secret: %s",
apr_strerror(status, buf, sizeof(buf)));
return status;
}
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "done");
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01759) "done");
return APR_SUCCESS;
}
static void log_error_and_cleanup(char *msg, apr_status_t sts, server_rec *s)
{
- ap_log_error(APLOG_MARK, APLOG_ERR, sts, s,
+ ap_log_error(APLOG_MARK, APLOG_ERR, sts, s, APLOGNO(01760)
"%s - all nonce-count checking, one-time nonces, and "
"MD5-sess algorithm disabled", msg);
@@ -273,7 +273,7 @@ static int initialize_tables(server_rec *s, apr_pool_t *ctx)
sts = apr_temp_dir_get(&tempdir, ctx);
if (APR_SUCCESS != sts) {
- ap_log_error(APLOG_MARK, APLOG_ERR, sts, s,
+ ap_log_error(APLOG_MARK, APLOG_ERR, sts, s, APLOGNO(01761)
"Failed to find temporary directory");
log_error_and_cleanup("failed to find temp dir", sts, s);
return HTTP_INTERNAL_SERVER_ERROR;
@@ -292,7 +292,7 @@ static int initialize_tables(server_rec *s, apr_pool_t *ctx)
sts = apr_shm_create(&client_shm, shmem_size,
client_shm_filename, ctx);
if (APR_SUCCESS != sts) {
- ap_log_error(APLOG_MARK, APLOG_ERR, sts, s,
+ ap_log_error(APLOG_MARK, APLOG_ERR, sts, s, APLOGNO(01762)
"Failed to create shared memory segment on file %s",
client_shm_filename);
log_error_and_cleanup("failed to initialize shm", sts, s);
@@ -671,7 +671,7 @@ static const char *set_shmem_size(cmd_parms *cmd, void *config,
if (num_buckets == 0) {
num_buckets = 1;
}
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server,
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server, APLOGNO(01763)
"Set shmem-size: %" APR_SIZE_T_FMT ", num-buckets: %ld",
shmem_size, num_buckets);
@@ -785,11 +785,11 @@ static client_entry *get_client(unsigned long key, const request_rec *r)
apr_global_mutex_unlock(client_lock);
if (entry) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01764)
"get_client(): client %lu found", key);
}
else {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01765)
"get_client(): client %lu not found", key);
}
@@ -860,7 +860,7 @@ static client_entry *add_client(unsigned long key, client_entry *info,
entry = apr_rmm_addr_get(client_rmm, apr_rmm_malloc(client_rmm, sizeof(client_entry)));
if (!entry) {
long num_removed = gc();
- ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
+ ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, APLOGNO(01766)
"gc'd %ld client entries. Total new clients: "
"%ld; Total removed clients: %ld; Total renewed clients: "
"%ld", num_removed,
@@ -868,7 +868,7 @@ static client_entry *add_client(unsigned long key, client_entry *info,
client_list->num_removed, client_list->num_renewed);
entry = apr_rmm_addr_get(client_rmm, apr_rmm_malloc(client_rmm, sizeof(client_entry)));
if (!entry) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(01767)
"unable to allocate new auth_digest client");
apr_global_mutex_unlock(client_lock);
return NULL; /* give up */
@@ -886,7 +886,7 @@ static client_entry *add_client(unsigned long key, client_entry *info,
apr_global_mutex_unlock(client_lock);
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01768)
"allocated new client %lu", key);
return entry;
@@ -1144,7 +1144,7 @@ static client_entry *gen_client(const request_rec *r)
apr_global_mutex_unlock(opaque_lock);
if (!(entry = add_client(op, &new_entry, r->server))) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01769)
"failed to allocate client entry - ignoring client");
return NULL;
}
@@ -1416,7 +1416,7 @@ static authn_status get_hash(request_rec *r, const char *user,
AUTHN_PROVIDER_VERSION);
if (!provider || !provider->get_realm_hash) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01770)
"No Authn provider configured");
auth_result = AUTH_GENERAL_ERROR;
break;
@@ -1464,7 +1464,7 @@ static int check_nc(const request_rec *r, const digest_header_rec *resp,
if (conf->check_nc && !client_shm) {
/* Shouldn't happen, but just in case... */
- ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01771)
"cannot check nonce count without shared memory");
return OK;
}
@@ -1478,7 +1478,7 @@ static int check_nc(const request_rec *r, const digest_header_rec *resp,
&&!strcasecmp(conf->qop_list[0], "none")) {
/* qop is none, client must not send a nonce count */
if (snc != NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01772)
"invalid nc %s received - no nonce count allowed when qop=none",
snc);
return !OK;
@@ -1489,7 +1489,7 @@ static int check_nc(const request_rec *r, const digest_header_rec *resp,
nc = strtol(snc, &endptr, 16);
if (endptr < (snc+strlen(snc)) && !apr_isspace(*endptr)) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01773)
"invalid nc %s received - not a number", snc);
return !OK;
}
@@ -1499,7 +1499,7 @@ static int check_nc(const request_rec *r, const digest_header_rec *resp,
}
if (nc != resp->client->nonce_count) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01774)
"Warning, possible replay attack: nonce-count "
"check failed: %lu != %lu", nc,
resp->client->nonce_count);
@@ -1517,7 +1517,7 @@ static int check_nonce(request_rec *r, digest_header_rec *resp,
char tmp, hash[NONCE_HASH_LEN+1];
if (strlen(resp->nonce) != NONCE_LEN) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01775)
"invalid nonce %s received - length is not %d",
resp->nonce, NONCE_LEN);
note_digest_auth_failure(r, conf, resp, 1);
@@ -1532,7 +1532,7 @@ static int check_nonce(request_rec *r, digest_header_rec *resp,
resp->nonce_time = nonce_time.time;
if (strcmp(hash, resp->nonce+NONCE_TIME_LEN)) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01776)
"invalid nonce %s received - hash is not %s",
resp->nonce, hash);
note_digest_auth_failure(r, conf, resp, 1);
@@ -1541,7 +1541,7 @@ static int check_nonce(request_rec *r, digest_header_rec *resp,
dt = r->request_time - nonce_time.time;
if (conf->nonce_lifetime > 0 && dt < 0) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01777)
"invalid nonce %s received - user attempted "
"time travel", resp->nonce);
note_digest_auth_failure(r, conf, resp, 1);
@@ -1550,7 +1550,7 @@ static int check_nonce(request_rec *r, digest_header_rec *resp,
if (conf->nonce_lifetime > 0) {
if (dt > conf->nonce_lifetime) {
- ap_log_rerror(APLOG_MARK, APLOG_INFO, 0,r,
+ ap_log_rerror(APLOG_MARK, APLOG_INFO, 0,r, APLOGNO(01778)
"user %s: nonce expired (%.2f seconds old "
"- max lifetime %.2f) - sending new nonce",
r->user, (double)apr_time_sec(dt),
@@ -1561,7 +1561,7 @@ static int check_nonce(request_rec *r, digest_header_rec *resp,
}
else if (conf->nonce_lifetime == 0 && resp->client) {
if (memcmp(resp->client->last_nonce, resp->nonce, NONCE_LEN)) {
- ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01779)
"user %s: one-time-nonce mismatch - sending "
"new nonce", r->user);
note_digest_auth_failure(r, conf, resp, 1);
@@ -1697,7 +1697,7 @@ static int authenticate_digest_user(request_rec *r)
}
if (!ap_auth_name(r)) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01780)
"need AuthName: %s", r->uri);
return HTTP_INTERNAL_SERVER_ERROR;
}
@@ -1727,12 +1727,12 @@ static int authenticate_digest_user(request_rec *r)
if (resp->auth_hdr_sts != VALID) {
if (resp->auth_hdr_sts == NOT_DIGEST) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01781)
"client used wrong authentication scheme `%s': %s",
resp->scheme, r->uri);
}
else if (resp->auth_hdr_sts == INVALID) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01782)
"missing user, realm, nonce, uri, digest, "
"cnonce, or nonce_count in authorization header: %s",
r->uri);
@@ -1755,7 +1755,7 @@ static int authenticate_digest_user(request_rec *r)
copy_uri_components(&r_uri, resp->psd_request_uri, r);
if (apr_uri_parse(r->pool, resp->uri, &d_uri) != APR_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01783)
"invalid uri <%s> in Authorization header",
resp->uri);
return HTTP_BAD_REQUEST;
@@ -1790,7 +1790,7 @@ static int authenticate_digest_user(request_rec *r)
if (apr_table_get(r->subprocess_env,
"AuthDigestEnableQueryStringHack")) {
- ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01784)
"applying AuthDigestEnableQueryStringHack "
"to uri <%s>", resp->raw_request_uri);
@@ -1800,7 +1800,7 @@ static int authenticate_digest_user(request_rec *r)
if (r->method_number == M_CONNECT) {
if (!r_uri.hostinfo || strcmp(resp->uri, r_uri.hostinfo)) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01785)
"uri mismatch - <%s> does not match "
"request-uri <%s>", resp->uri, r_uri.hostinfo);
return HTTP_BAD_REQUEST;
@@ -1828,7 +1828,7 @@ static int authenticate_digest_user(request_rec *r)
&& (!d_uri.query || !r_uri.query
|| strcmp(d_uri.query, r_uri.query)))
) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01786)
"uri mismatch - <%s> does not match "
"request-uri <%s>", resp->uri, resp->raw_request_uri);
return HTTP_BAD_REQUEST;
@@ -1836,7 +1836,7 @@ static int authenticate_digest_user(request_rec *r)
}
if (resp->opaque && resp->opaque_num == 0) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01787)
"received invalid opaque - got `%s'",
resp->opaque);
note_digest_auth_failure(r, conf, resp, 0);
@@ -1844,7 +1844,7 @@ static int authenticate_digest_user(request_rec *r)
}
if (strcmp(resp->realm, conf->realm)) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01788)
"realm mismatch - got `%s' but expected `%s'",
resp->realm, conf->realm);
note_digest_auth_failure(r, conf, resp, 0);
@@ -1854,7 +1854,7 @@ static int authenticate_digest_user(request_rec *r)
if (resp->algorithm != NULL
&& strcasecmp(resp->algorithm, "MD5")
&& strcasecmp(resp->algorithm, "MD5-sess")) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01789)
"unknown algorithm `%s' received: %s",
resp->algorithm, r->uri);
note_digest_auth_failure(r, conf, resp, 0);
@@ -1864,7 +1864,7 @@ static int authenticate_digest_user(request_rec *r)
return_code = get_hash(r, r->user, conf);
if (return_code == AUTH_USER_NOT_FOUND) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01790)
"user `%s' in realm `%s' not found: %s",
r->user, conf->realm, r->uri);
note_digest_auth_failure(r, conf, resp, 0);
@@ -1875,7 +1875,7 @@ static int authenticate_digest_user(request_rec *r)
}
else if (return_code == AUTH_DENIED) {
/* authentication denied in the provider before attempting a match */
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01791)
"user `%s' in realm `%s' denied by provider: %s",
r->user, conf->realm, r->uri);
note_digest_auth_failure(r, conf, resp, 0);
@@ -1892,7 +1892,7 @@ static int authenticate_digest_user(request_rec *r)
if (resp->message_qop == NULL) {
/* old (rfc-2069) style digest */
if (strcmp(resp->digest, old_digest(r, resp, conf->ha1))) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01792)
"user %s: password mismatch: %s", r->user,
r->uri);
note_digest_auth_failure(r, conf, resp, 0);
@@ -1912,7 +1912,7 @@ static int authenticate_digest_user(request_rec *r)
if (!match
&& !(conf->qop_list[0] == NULL
&& !strcasecmp(resp->message_qop, "auth"))) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01793)
"invalid qop `%s' received: %s",
resp->message_qop, r->uri);
note_digest_auth_failure(r, conf, resp, 0);
@@ -1925,7 +1925,7 @@ static int authenticate_digest_user(request_rec *r)
return HTTP_INTERNAL_SERVER_ERROR;
}
if (strcmp(resp->digest, exp_digest)) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01794)
"user %s: password mismatch: %s", r->user,
r->uri);
note_digest_auth_failure(r, conf, resp, 0);
@@ -2005,7 +2005,7 @@ static int add_auth_info(request_rec *r)
if (resp->algorithm && !strcasecmp(resp->algorithm, "MD5-sess")) {
ha1 = get_session_HA1(r, resp, conf, 0);
if (!ha1) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01795)
"internal error: couldn't find session "
"info for user %s", resp->username);
return !OK;
View
16 modules/aaa/mod_auth_form.c
@@ -742,7 +742,7 @@ static int check_authn(request_rec * r, const char *sent_user, const char *sent_
AUTHN_PROVIDER_VERSION);
if (!provider || !provider->check_password) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01806)
"no authn provider configured");
auth_result = AUTH_GENERAL_ERROR;
break;
@@ -786,14 +786,14 @@ static int check_authn(request_rec * r, const char *sent_user, const char *sent_
switch (auth_result) {
case AUTH_DENIED:
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01807)
"user '%s': authentication failure for \"%s\": "
"password Mismatch",
sent_user, r->uri);
return_code = HTTP_UNAUTHORIZED;
break;
case AUTH_USER_NOT_FOUND:
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01808)
"user '%s' not found: %s", sent_user, r->uri);
return_code = HTTP_UNAUTHORIZED;
break;
@@ -868,7 +868,7 @@ static int authenticate_form_authn(request_rec * r)
*/
if (PROXYREQ_PROXY == r->proxyreq) {
ap_log_rerror(APLOG_MARK, APLOG_ERR,
- 0, r, "form auth cannot be used for proxy "
+ 0, r, APLOGNO(01809) "form auth cannot be used for proxy "
"requests due to XSS risk, access denied: %s", r->uri);
return HTTP_INTERNAL_SERVER_ERROR;
}
@@ -876,7 +876,7 @@ static int authenticate_form_authn(request_rec * r)
/* We need an authentication realm. */
if (!ap_auth_name(r)) {
ap_log_rerror(APLOG_MARK, APLOG_ERR,
- 0, r, "need AuthName: %s", r->uri);
+ 0, r, APLOGNO(01810) "need AuthName: %s", r->uri);
return HTTP_INTERNAL_SERVER_ERROR;
}
@@ -1068,7 +1068,7 @@ static int authenticate_form_login_handler(request_rec * r)
}
if (r->method_number != M_POST) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01811)
"the " FORM_LOGIN_HANDLER " only supports the POST method for %s",
r->uri);
return HTTP_METHOD_NOT_ALLOWED;
@@ -1170,7 +1170,7 @@ static int authenticate_form_redirect_handler(request_rec * r)
if (r->kept_body && sent_method && sent_mimetype) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01812)
"internal redirect to method '%s' and body mimetype '%s' for the "
"uri: %s", sent_method, sent_mimetype, r->uri);
@@ -1179,7 +1179,7 @@ static int authenticate_form_redirect_handler(request_rec * r)
}
else {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01813)
"internal redirect requested but one or all of method, mimetype or "
"body are NULL: %s", r->uri);
return HTTP_INTERNAL_SERVER_ERROR;
View
2  modules/aaa/mod_authn_anon.c
@@ -179,7 +179,7 @@ static authn_status check_anonymous(request_rec *r, const char *user,
|| (ap_strchr_c(sent_pw, '@') && ap_strchr_c(sent_pw, '.'))))
{
if (conf->logemail && ap_is_initial_req(r)) {
- ap_log_rerror(APLOG_MARK, APLOG_INFO, APR_SUCCESS, r,
+ ap_log_rerror(APLOG_MARK, APLOG_INFO, APR_SUCCESS, r, APLOGNO(01672)
"Anonymous: Passwd <%s> Accepted",
sent_pw ? sent_pw : "\'none\'");
}
View
2  modules/aaa/mod_authn_core.c
@@ -351,7 +351,7 @@ static int authenticate_no_user(request_rec *r)
/* there's an AuthType configured, but no authentication module
* loaded to support it
*/
- ap_log_rerror(APLOG_MARK, APLOG_ERR, APR_SUCCESS, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, APR_SUCCESS, r, APLOGNO(01796)
"AuthType %s configured without corresponding module",
ap_auth_type(r));
View
20 modules/aaa/mod_authn_dbd.c
@@ -105,28 +105,28 @@ static authn_status authn_dbd_password(request_rec *r, const char *user,
&authn_dbd_module);
ap_dbd_t *dbd = authn_dbd_acquire_fn(r);
if (dbd == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01653)
"Failed to acquire database connection to look up "
"user '%s'", user);
return AUTH_GENERAL_ERROR;
}
if (conf->user == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01654)
"No AuthDBDUserPWQuery has been specified");
return AUTH_GENERAL_ERROR;
}
statement = apr_hash_get(dbd->prepared, conf->user, APR_HASH_KEY_STRING);
if (statement == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01655)
"A prepared statement could not be found for "
"AuthDBDUserPWQuery with the key '%s'", conf->user);
return AUTH_GENERAL_ERROR;
}
if (apr_dbd_pvselect(dbd->driver, r->pool, dbd->handle, &res, statement,
0, user, NULL) != 0) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01656)
"Query execution error looking up '%s' "
"in database", user);
return AUTH_GENERAL_ERROR;
@@ -135,7 +135,7 @@ static authn_status authn_dbd_password(request_rec *r, const char *user,
rv != -1;
rv = apr_dbd_get_row(dbd->driver, r->pool, res, &row, -1)) {
if (rv != 0) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01657)
"Error retrieving results while looking up '%s' "
"in database", user);
return AUTH_GENERAL_ERROR;
@@ -198,26 +198,26 @@ static authn_status authn_dbd_realm(request_rec *r, const char *user,
&authn_dbd_module);
ap_dbd_t *dbd = authn_dbd_acquire_fn(r);
if (dbd == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01658)
"Failed to acquire database connection to look up "
"user '%s:%s'", user, realm);
return AUTH_GENERAL_ERROR;
}
if (conf->realm == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01659)
"No AuthDBDUserRealmQuery has been specified");
return AUTH_GENERAL_ERROR;
}
statement = apr_hash_get(dbd->prepared, conf->realm, APR_HASH_KEY_STRING);
if (statement == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01660)
"A prepared statement could not be found for "
"AuthDBDUserRealmQuery with the key '%s'", conf->realm);
return AUTH_GENERAL_ERROR;
}
if (apr_dbd_pvselect(dbd->driver, r->pool, dbd->handle, &res, statement,
0, user, realm, NULL) != 0) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01661)
"Query execution error looking up '%s:%s' "
"in database", user, realm);
return AUTH_GENERAL_ERROR;
@@ -226,7 +226,7 @@ static authn_status authn_dbd_realm(request_rec *r, const char *user,
rv != -1;
rv = apr_dbd_get_row(dbd->driver, r->pool, res, &row, -1)) {
if (rv != 0) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01662)
"Error retrieving results while looking up '%s:%s' "
"in database", user, realm);
return AUTH_GENERAL_ERROR;
View
4 modules/aaa/mod_authn_dbm.c
@@ -128,7 +128,7 @@ static authn_status check_dbm_pw(request_rec *r, const char *user,
r->pool);
if (rv != APR_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01754)
"could not open dbm (type %s) auth file: %s",
conf->dbmtype, conf->pwfile);
return AUTH_GENERAL_ERROR;
@@ -167,7 +167,7 @@ static authn_status get_dbm_realm_hash(request_rec *r, const char *user,
&dbm_hash, r->pool);
if (rv != APR_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01755)
"Could not open dbm (type %s) hash file: %s",
conf->dbmtype, conf->pwfile);
return AUTH_GENERAL_ERROR;
View
8 modules/aaa/mod_authn_file.c
@@ -76,7 +76,7 @@ static authn_status check_password(request_rec *r, const char *user,
char *file_password = NULL;
if (!conf->pwfile) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01619)
"AuthUserFile not specified in the configuration");
return AUTH_GENERAL_ERROR;
}
@@ -84,7 +84,7 @@ static authn_status check_password(request_rec *r, const char *user,
status = ap_pcfg_openfile(&f, r->pool, conf->pwfile);
if (status != APR_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(01620)
"Could not open password file: %s", conf->pwfile);
return AUTH_GENERAL_ERROR;
}
@@ -131,7 +131,7 @@ static authn_status get_realm_hash(request_rec *r, const char *user,
char *file_hash = NULL;
if (!conf->pwfile) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01621)
"AuthUserFile not specified in the configuration");
return AUTH_GENERAL_ERROR;
}
@@ -139,7 +139,7 @@ static authn_status get_realm_hash(request_rec *r, const char *user,
status = ap_pcfg_openfile(&f, r->pool, conf->pwfile);
if (status != APR_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(01622)
"Could not open password file: %s", conf->pwfile);
return AUTH_GENERAL_ERROR;
}
View
34 modules/aaa/mod_authn_socache.c
@@ -72,7 +72,7 @@ static int authn_cache_precfg(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *p
apr_status_t rv = ap_mutex_register(pconf, authn_cache_id,
NULL, APR_LOCK_DEFAULT, 0);
if (rv != APR_SUCCESS) {
- ap_log_perror(APLOG_MARK, APLOG_CRIT, rv, plog,
+ ap_log_perror(APLOG_MARK, APLOG_CRIT, rv, plog, APLOGNO(01673)
"failed to register %s mutex", authn_cache_id);
return 500; /* An HTTP status would be a misnomer! */
}
@@ -93,7 +93,7 @@ static int authn_cache_post_config(apr_pool_t *pconf, apr_pool_t *plog,
return OK; /* don't waste the overhead of creating mutex & cache */
}
if (socache_provider == NULL) {
- ap_log_perror(APLOG_MARK, APLOG_CRIT, 0, plog,
+ ap_log_perror(APLOG_MARK, APLOG_CRIT, 0, plog, APLOGNO(01674)
"Please select a socache provider with AuthnCacheSOCache "
"(no default found on this platform)");
return 500; /* An HTTP status would be a misnomer! */
@@ -102,7 +102,7 @@ static int authn_cache_post_config(apr_pool_t *pconf, apr_pool_t *plog,
rv = ap_global_mutex_create(&authn_cache_mutex, NULL,
authn_cache_id, NULL, s, pconf, 0);
if (rv != APR_SUCCESS) {
- ap_log_perror(APLOG_MARK, APLOG_CRIT, rv, plog,
+ ap_log_perror(APLOG_MARK, APLOG_CRIT, rv, plog, APLOGNO(01675)
"failed to create %s mutex", authn_cache_id);
return 500; /* An HTTP status would be a misnomer! */
}
@@ -110,14 +110,14 @@ static int authn_cache_post_config(apr_pool_t *pconf, apr_pool_t *plog,
errmsg = socache_provider->create(&socache_instance, NULL, ptmp, pconf);
if (errmsg) {
- ap_log_perror(APLOG_MARK, APLOG_CRIT, rv, plog, "%s", errmsg);
+ ap_log_perror(APLOG_MARK, APLOG_CRIT, rv, plog, APLOGNO(01676) "%s", errmsg);
return 500; /* An HTTP status would be a misnomer! */
}
rv = socache_provider->init(socache_instance, authn_cache_id,
&authn_cache_hints, s, pconf);
if (rv != APR_SUCCESS) {
- ap_log_perror(APLOG_MARK, APLOG_CRIT, rv, plog,
+ ap_log_perror(APLOG_MARK, APLOG_CRIT, rv, plog, APLOGNO(01677)
"failed to initialise %s cache", authn_cache_id);
return 500; /* An HTTP status would be a misnomer! */
}
@@ -134,7 +134,7 @@ static void authn_cache_child_init(apr_pool_t *p, server_rec *s)
lock = apr_global_mutex_lockfile(authn_cache_mutex);
rv = apr_global_mutex_child_init(&authn_cache_mutex, lock, p);
if (rv != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
+ ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s, APLOGNO(01678)
"failed to initialise mutex in child_init");
}
}
@@ -281,12 +281,12 @@ static void ap_authn_cache_store(request_rec *r, const char *module,
rv = apr_global_mutex_trylock(authn_cache_mutex);
if (APR_STATUS_IS_EBUSY(rv)) {
/* don't wait around; just abandon it */
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r, APLOGNO(01679)
"authn credentials for %s not cached (mutex busy)", user);
return;
}
else if (rv != APR_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01680)
"Failed to cache authn credentials for %s in %s",
module, dcfg->context);
return;
@@ -302,12 +302,12 @@ static void ap_authn_cache_store(request_rec *r, const char *module,
(unsigned char*)key, strlen(key), expiry,
(unsigned char*)data, strlen(data), r->pool);
if (rv == APR_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01681)
"Cached authn credentials for %s in %s",
user, dcfg->context);
}
else {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01682)
"Failed to cache authn credentials for %s in %s",
module, dcfg->context);
}
@@ -315,7 +315,7 @@ static void ap_authn_cache_store(request_rec *r, const char *module,
/* We're done with the mutex */
rv = apr_global_mutex_unlock(authn_cache_mutex);
if (rv != APR_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, "Failed to release mutex!");
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01683) "Failed to release mutex!");
}
return;
}
@@ -351,20 +351,20 @@ static authn_status check_password(request_rec *r, const char *user,
if (APR_STATUS_IS_NOTFOUND(rv)) {
/* not found - just return */
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01684)
"Authn cache: no credentials found for %s", user);
return AUTH_USER_NOT_FOUND;
}
else if (rv == APR_SUCCESS) {
/* OK, we got a value */
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01685)
"Authn cache: found credentials for %s", user);
val[vallen] = 0;
}
else {
/* error: give up and pass the buck */
/* FIXME: getting this for NOTFOUND - prolly a bug in mod_socache */
- ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01686)
"Error accessing authentication cache");
return AUTH_USER_NOT_FOUND;
}
@@ -396,19 +396,19 @@ static authn_status get_realm_hash(request_rec *r, const char *user,
if (APR_STATUS_IS_NOTFOUND(rv)) {
/* not found - just return */
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01687)
"Authn cache: no credentials found for %s", user);
return AUTH_USER_NOT_FOUND;
}
else if (rv == APR_SUCCESS) {
/* OK, we got a value */
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01688)
"Authn cache: found credentials for %s", user);
}
else {
/* error: give up and pass the buck */
/* FIXME: getting this for NOTFOUND - prolly a bug in mod_socache */
- ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01689)
"Error accessing authentication cache");
return AUTH_USER_NOT_FOUND;
}
View
126 modules/aaa/mod_authnz_ldap.c
@@ -492,24 +492,24 @@ static authn_status authn_ldap_check_password(request_rec *r, const char *user,
sec->deref, sec->secure);
}
else {
- ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01690)
"auth_ldap authenticate: no sec->host - weird...?");
return AUTH_GENERAL_ERROR;
}
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01691)
"auth_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,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01692)
"auth_ldap authenticate: no password specified");
util_ldap_connection_close(ldc);
return AUTH_GENERAL_ERROR;
}
if (user == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01693)
"auth_ldap authenticate: no user specified");
util_ldap_connection_close(ldc);
return AUTH_GENERAL_ERROR;
@@ -533,14 +533,14 @@ static authn_status authn_ldap_check_password(request_rec *r, const char *user,
/* handle bind failure */
if (result != LDAP_SUCCESS) {
if (!sec->bind_authoritative) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01694)
"auth_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,
+ ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01695)
"auth_ldap authenticate: "
"user %s authentication failed; URI %s [%s][%s]",
user, r->uri, ldc->reason, ldap_err2string(result));
@@ -580,7 +580,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,
+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01696)
"auth_ldap authenticate: "
"REMOTE_USER was to be set with attribute '%s', "
"but this attribute was not requested for in the "
@@ -589,7 +589,7 @@ static authn_status authn_ldap_check_password(request_rec *r, const char *user,
sec->remote_user_attribute);
}
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01697)
"auth_ldap authenticate: accepting %s", user);
return AUTH_GRANTED;
@@ -628,7 +628,7 @@ static authz_status ldapuser_check_authorization(request_rec *r,
apr_pool_cleanup_null);
}
else {
- ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01698)
"auth_ldap authorize: no sec->host - weird...?");
return AUTHZ_DENIED;
}
@@ -641,13 +641,13 @@ static authz_status ldapuser_check_authorization(request_rec *r,
if (!strlen(r->user)) {
- ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01699)
"ldap authorize: Userid is blank, AuthType=%s",
r->ap_auth_type);
}
if(!req) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01700)
"ldap authorize: Creating LDAP req structure");
req = (authn_ldap_request_t *)apr_pcalloc(r->pool,
@@ -662,7 +662,7 @@ static authz_status ldapuser_check_authorization(request_rec *r,
/* Search failed, log error and return failure */
if(result != LDAP_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01701)
"auth_ldap authorise: User DN not found, %s", ldc->reason);
return AUTHZ_DENIED;
}
@@ -674,7 +674,7 @@ static authz_status ldapuser_check_authorization(request_rec *r,
}
if (req->dn == NULL || strlen(req->dn) == 0) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01702)
"auth_ldap authorize: require user: user's DN has not "
"been defined; failing authorization");
return AUTHZ_DENIED;
@@ -687,14 +687,14 @@ static authz_status ldapuser_check_authorization(request_rec *r,
result = util_ldap_cache_compare(r, ldc, sec->url, req->dn, sec->attribute, require_args);
switch(result) {
case LDAP_COMPARE_TRUE: {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01703)
"auth_ldap authorize: require user: authorization "
"successful");
set_request_vars(r, LDAP_AUTHZ);
return AUTHZ_GRANTED;
}
default: {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01704)
"auth_ldap authorize: require user: "
"authorization failed [%s][%s]",
ldc->reason, ldap_err2string(result));
@@ -709,14 +709,14 @@ static authz_status ldapuser_check_authorization(request_rec *r,
result = util_ldap_cache_compare(r, ldc, sec->url, req->dn, sec->attribute, w);
switch(result) {
case LDAP_COMPARE_TRUE: {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01705)
"auth_ldap authorize: "
"require user: authorization successful");
set_request_vars(r, LDAP_AUTHZ);
return AUTHZ_GRANTED;
}
default: {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01706)
"auth_ldap authorize: "
"require user: authorization failed [%s][%s]",
ldc->reason, ldap_err2string(result));
@@ -724,7 +724,7 @@ static authz_status ldapuser_check_authorization(request_rec *r,
}
}
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01707)
"auth_ldap authorize user: authorization denied for "
"user %s to %s",
r->user, r->uri);
@@ -766,7 +766,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r,
apr_pool_cleanup_null);
}
else {
- ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01708)
"auth_ldap authorize: no sec->host - weird...?");
return AUTHZ_DENIED;
}
@@ -814,13 +814,13 @@ static authz_status ldapgroup_check_authorization(request_rec *r,
*/
if (!strlen(r->user)) {
- ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01709)
"ldap authorize: Userid is blank, AuthType=%s",
r->ap_auth_type);
}
if(!req) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01710)
"ldap authorize: Creating LDAP req structure");
req = (authn_ldap_request_t *)apr_pcalloc(r->pool,
@@ -834,7 +834,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r,
/* Search failed, log error and return failure */
if(result != LDAP_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01711)
"auth_ldap authorise: User DN not found, %s", ldc->reason);
return AUTHZ_DENIED;
}
@@ -848,7 +848,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,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01712)
"auth_ldap authorize: require group: user's DN has "
"not been defined; failing authorization for user %s",
r->user);
@@ -865,13 +865,13 @@ static authz_status ldapgroup_check_authorization(request_rec *r,
t = require_args;
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01713)
"auth_ldap authorize: require group: testing for group "
"membership in \"%s\"",
t);
for (i = 0; i < sec->groupattr->nelts; i++) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01714)
"auth_ldap authorize: require group: testing for %s: "
"%s (%s)",
ent[i].name,
@@ -881,7 +881,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r,
sec->group_attrib_is_dn ? req->dn : req->user);
switch(result) {
case LDAP_COMPARE_TRUE: {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01715)
"auth_ldap authorize: require group: "
"authorization successful (attribute %s) "
"[%s][%d - %s]",
@@ -901,7 +901,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r,
authnz_ldap_cleanup_connection_close,
apr_pool_cleanup_null);
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01716)
"auth_ldap authorise: require group \"%s\": "
"failed [%s][%d - %s], checking sub-groups",
t, ldc->reason, result, ldap_err2string(result));
@@ -912,7 +912,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r,
sec->subgroupclasses,
0, sec->maxNestingDepth);
if(result == LDAP_COMPARE_TRUE) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01717)
"auth_ldap authorise: require group "
"(sub-group): authorisation successful "
"(attribute %s) [%s][%d - %s]",
@@ -922,7 +922,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r,
return AUTHZ_GRANTED;
}
else {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01718)
"auth_ldap authorise: require group "
"(sub-group) \"%s\": authorisation failed "
"[%s][%d - %s]",
@@ -932,7 +932,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r,
break;
}
default: {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01719)
"auth_ldap authorize: require group \"%s\": "
"authorization failed [%s][%d - %s]",
t, ldc->reason, result, ldap_err2string(result));
@@ -940,7 +940,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r,
}
}
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01720)
"auth_ldap authorize group: authorization denied for "
"user %s to %s",
r->user, r->uri);
@@ -980,7 +980,7 @@ static authz_status ldapdn_check_authorization(request_rec *r,
apr_pool_cleanup_null);
}
else {
- ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01721)
"auth_ldap authorize: no sec->host - weird...?");
return AUTHZ_DENIED;
}
@@ -992,13 +992,13 @@ static authz_status ldapdn_check_authorization(request_rec *r,
*/
if (!strlen(r->user)) {
- ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01722)
"ldap authorize: Userid is blank, AuthType=%s",
r->ap_auth_type);
}
if(!req) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01723)
"ldap authorize: Creating LDAP req structure");
req = (authn_ldap_request_t *)apr_pcalloc(r->pool,
@@ -1012,7 +1012,7 @@ static authz_status ldapdn_check_authorization(request_rec *r,
/* Search failed, log error and return failure */
if(result != LDAP_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01724)
"auth_ldap authorise: User DN not found with filter %s: %s", filtbuf, ldc->reason);
return AUTHZ_DENIED;
}
@@ -1025,7 +1025,7 @@ static authz_status ldapdn_check_authorization(request_rec *r,
t = require_args;
if (req->dn == NULL || strlen(req->dn) == 0) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01725)
"auth_ldap authorize: require dn: user's DN has not "
"been defined; failing authorization");
return AUTHZ_DENIED;
@@ -1034,14 +1034,14 @@ static authz_status ldapdn_check_authorization(request_rec *r,
result = util_ldap_cache_comparedn(r, ldc, sec->url, req->dn, t, sec->compare_dn_on_server);
switch(result) {
case LDAP_COMPARE_TRUE: {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01726)
"auth_ldap authorize: "
"require dn: authorization successful");
set_request_vars(r, LDAP_AUTHZ);
return AUTHZ_GRANTED;
}
default: {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01727)
"auth_ldap authorize: "
"require dn \"%s\": LDAP error [%s][%s]",
t, ldc->reason, ldap_err2string(result));
@@ -1049,7 +1049,7 @@ static authz_status ldapdn_check_authorization(request_rec *r,
}
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01728)
"auth_ldap authorize dn: authorization denied for "
"user %s to %s",
r->user, r->uri);
@@ -1090,7 +1090,7 @@ static authz_status ldapattribute_check_authorization(request_rec *r,
apr_pool_cleanup_null);
}
else {
- ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01729)
"auth_ldap authorize: no sec->host - weird...?");
return AUTHZ_DENIED;
}
@@ -1102,13 +1102,13 @@ static authz_status ldapattribute_check_authorization(request_rec *r,
*/
if (!strlen(r->user)) {
- ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01730)
"ldap authorize: Userid is blank, AuthType=%s",
r->ap_auth_type);
}
if(!req) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01731)
"ldap authorize: Creating LDAP req structure");
req = (authn_ldap_request_t *)apr_pcalloc(r->pool,
@@ -1122,7 +1122,7 @@ static authz_status ldapattribute_check_authorization(request_rec *r,
/* Search failed, log error and return failure */
if(result != LDAP_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01732)
"auth_ldap authorise: User DN not found with filter %s: %s", filtbuf, ldc->reason);
return AUTHZ_DENIED;
}
@@ -1133,7 +1133,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,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01733)
"auth_ldap authorize: require ldap-attribute: user's DN "
"has not been defined; failing authorization");
return AUTHZ_DENIED;
@@ -1144,20 +1144,20 @@ static authz_status ldapattribute_check_authorization(request_rec *r,
w = ap_getword(r->pool, &t, '=');
value = ap_getword_conf(r->pool, &t);
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01734)
"auth_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,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01735)
"auth_ldap authorize: "
"require attribute: authorization successful");
set_request_vars(r, LDAP_AUTHZ);
return AUTHZ_GRANTED;
}
default: {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01736)
"auth_ldap authorize: require attribute: "
"authorization failed [%s][%s]",
ldc->reason, ldap_err2string(result));
@@ -1165,7 +1165,7 @@ static authz_status ldapattribute_check_authorization(request_rec *r,
}
}
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01737)
"auth_ldap authorize attribute: authorization denied for "
"user %s to %s",
r->user, r->uri);
@@ -1204,7 +1204,7 @@ static authz_status ldapfilter_check_authorization(request_rec *r,
apr_pool_cleanup_null);
}
else {
- ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01738)
"auth_ldap authorize: no sec->host - weird...?");
return AUTHZ_DENIED;
}
@@ -1216,13 +1216,13 @@ static authz_status ldapfilter_check_authorization(request_rec *r,
*/
if (!strlen(r->user)) {
- ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01739)
"ldap authorize: Userid is blank, AuthType=%s",
r->ap_auth_type);
}
if(!req) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01740)
"ldap authorize: Creating LDAP req structure");
req = (authn_ldap_request_t *)apr_pcalloc(r->pool,
@@ -1236,7 +1236,7 @@ static authz_status ldapfilter_check_authorization(request_rec *r,
/* Search failed, log error and return failure */
if(result != LDAP_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01741)
"auth_ldap authorise: User DN not found with filter %s: %s", filtbuf, ldc->reason);
return AUTHZ_DENIED;
}
@@ -1247,7 +1247,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,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01742)
"auth_ldap authorize: require ldap-filter: user's DN "
"has not been defined; failing authorization");
return AUTHZ_DENIED;
@@ -1256,7 +1256,7 @@ static authz_status ldapfilter_check_authorization(request_rec *r,
t = require_args;
if (t[0]) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01743)
"auth_ldap authorize: checking filter %s", t);
/* Build the username filter */
@@ -1268,7 +1268,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,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01744)
"auth_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 */
@@ -1282,21 +1282,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,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01745)
"auth_ldap authorize: require ldap-filter: "
"authorization successful");
set_request_vars(r, LDAP_AUTHZ);
return AUTHZ_GRANTED;
}
case LDAP_FILTER_ERROR: {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01746)
"auth_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,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01747)
"auth_ldap authorize: require ldap-filter: "
"authorization failed [%s][%s]",
ldc->reason, ldap_err2string(result));
@@ -1304,7 +1304,7 @@ static authz_status ldapfilter_check_authorization(request_rec *r,
}
}
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01748)
"auth_ldap authorize filter: authorization denied for "
"user %s to %s",
r->user, r->uri);
@@ -1669,7 +1669,7 @@ static int authnz_ldap_post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *
/* make sure that mod_ldap (util_ldap) is loaded */
if (ap_find_linked_module("util_ldap.c") == NULL) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(01749)
"Module mod_ldap missing. Mod_ldap (aka. util_ldap) "
"must be loaded in order for mod_authnz_ldap to function properly");
return HTTP_INTERNAL_SERVER_ERROR;
@@ -1682,7 +1682,7 @@ static int authnz_ldap_post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *
charset_confname = ap_server_root_relative(p, charset_confname);
if (!charset_confname) {
- ap_log_error(APLOG_MARK, APLOG_ERR, APR_EBADPATH, s,
+ ap_log_error(APLOG_MARK, APLOG_ERR, APR_EBADPATH, s, APLOGNO(01750)
"Invalid charset conversion config path %s",
(const char *)ap_get_module_config(s->module_config,
&authnz_ldap_module));
@@ -1690,7 +1690,7 @@ static int authnz_ldap_post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *
}
if ((status = ap_pcfg_openfile(&f, ptemp, charset_confname))
!= APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, status, s,
+ ap_log_error(APLOG_MARK, APLOG_ERR, status, s, APLOGNO(01751)
"could not open charset conversion config file %s.",
charset_confname);
return HTTP_INTERNAL_SERVER_ERROR;
@@ -1717,7 +1717,7 @@ static int authnz_ldap_post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *
to_charset = derive_codepage_from_lang (p, "utf-8");
if (to_charset == NULL) {
- ap_log_error(APLOG_MARK, APLOG_ERR, status, s,
+ ap_log_error(APLOG_MARK, APLOG_ERR, status, s, APLOGNO(01752)
"could not find the UTF-8 charset in the file %s.",
charset_confname);
return HTTP_INTERNAL_SERVER_ERROR;
View
16 modules/aaa/mod_authz_core.c
@@ -606,7 +606,7 @@ static int authz_core_check_section(apr_pool_t *p, server_rec *s,
}
if (ret != OK) {
- ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, APR_SUCCESS, s,
+ ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, APR_SUCCESS, s, APLOGNO(01624)
"%s",
apr_pstrcat(p, (is_conf
? "<Directory>, <Location>, or similar"
@@ -695,7 +695,7 @@ static authz_status apply_authz_sections(request_rec *r,
auth_result =
(parent_op == AUTHZ_LOGIC_AND) ? AUTHZ_GRANTED : AUTHZ_NEUTRAL;
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, r, APLOGNO(01625)
"authorization result of %s: %s "
"(directive limited to other methods)",
format_authz_command(r->pool, section),
@@ -777,7 +777,7 @@ static authz_status apply_authz_sections(request_rec *r,
}
}
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, r, APLOGNO(01626)
"authorization result of %s: %s",
format_authz_command(r->pool, section),
format_authz_result(auth_result));
@@ -798,14 +798,14 @@ static int authorize_user_core(request_rec *r, int after_authn)
* directives applied to support it
*/
- ap_log_rerror(APLOG_MARK, APLOG_ERR, APR_SUCCESS, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, APR_SUCCESS, r, APLOGNO(01627)
"AuthType configured with no corresponding "
"authorization directives");
return HTTP_INTERNAL_SERVER_ERROR;
}
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, r, APLOGNO(01628)
"authorization result: granted (no directives)");
return OK;
@@ -818,7 +818,7 @@ static int authorize_user_core(request_rec *r, int after_authn)
}
else if (auth_result == AUTHZ_DENIED_NO_USER) {
if (after_authn) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, APR_SUCCESS, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, APR_SUCCESS, r, APLOGNO(01629)
"authorization failure (no authenticated user): %s",
r->uri);
/*
@@ -841,7 +841,7 @@ static int authorize_user_core(request_rec *r, int after_authn)
}
else if (auth_result == AUTHZ_DENIED || auth_result == AUTHZ_NEUTRAL) {
if (!after_authn || ap_auth_type(r) == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, APR_SUCCESS, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, APR_SUCCESS, r, APLOGNO(01630)
"client denied by server configuration: %s%s",
r->filename ? "" : "uri ",
r->filename ? r->filename : r->uri);
@@ -849,7 +849,7 @@ static int authorize_user_core(request_rec *r, int after_authn)
return HTTP_FORBIDDEN;
}
else {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, APR_SUCCESS, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, APR_SUCCESS, r, APLOGNO(01631)
"user %s: authorization failure for \"%s\": ",
r->user, r->uri);
View
22 modules/aaa/mod_authz_dbd.c
@@ -122,13 +122,13 @@ static int authz_dbd_login(request_rec *r, authz_dbd_cfg *cfg,
apr_dbd_row_t *row = NULL;
if (cfg->query == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01642)
"No query configured for %s!", action);
return HTTP_INTERNAL_SERVER_ERROR;
}
query = apr_hash_get(dbd->prepared, cfg->query, APR_HASH_KEY_STRING);
if (query == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01643)
"Error retrieving Query for %s!", action);
return HTTP_INTERNAL_SERVER_ERROR;
}
@@ -137,14 +137,14 @@ static int authz_dbd_login(request_rec *r, authz_dbd_cfg *cfg,
query, r->user, NULL);
if (rv == 0) {
if (nrows != 1) {
- ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01644)
"authz_dbd: %s of user %s updated %d rows",
action, r->user, nrows);
}
}
else {
message = apr_dbd_error(dbd->driver, dbd->handle, rv);
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01645)
"authz_dbd: query for %s failed; user %s [%s]",
action, r->user, message?message:noerror);
return HTTP_INTERNAL_SERVER_ERROR;
@@ -158,7 +158,7 @@ static int authz_dbd_login(request_rec *r, authz_dbd_cfg *cfg,
query = apr_hash_get(dbd->prepared, cfg->redir_query,
APR_HASH_KEY_STRING);
if (query == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01646)
"authz_dbd: no redirect query!");
/* OK, this is non-critical; we can just not-redirect */
}
@@ -169,7 +169,7 @@ static int authz_dbd_login(request_rec *r, authz_dbd_cfg *cfg,
rv = apr_dbd_get_row(dbd->driver, r->pool, res, &row, -1)) {
if (rv != 0) {
message = apr_dbd_error(dbd->driver, dbd->handle, rv);
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01647)
"authz_dbd in get_row; action=%s user=%s [%s]",
action, r->user, message?message:noerror);
}
@@ -181,7 +181,7 @@ static int authz_dbd_login(request_rec *r, authz_dbd_cfg *cfg,
}
else {
message = apr_dbd_error(dbd->driver, dbd->handle, rv);
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01648)
"authz_dbd/redirect for %s of %s [%s]",
action, r->user, message?message:noerror);
}
@@ -207,13 +207,13 @@ static int authz_dbd_group_query(request_rec *r, authz_dbd_cfg *cfg,
const char **group;
if (cfg->query == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01649)
"No query configured for dbd-group!");
return HTTP_INTERNAL_SERVER_ERROR;
}
query = apr_hash_get(dbd->prepared, cfg->query, APR_HASH_KEY_STRING);
if (query == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01650)
"Error retrieving query for dbd-group!");
return HTTP_INTERNAL_SERVER_ERROR;
}
@@ -229,7 +229,7 @@ static int authz_dbd_group_query(request_rec *r, authz_dbd_cfg *cfg,
}
else {
message = apr_dbd_error(dbd->driver, dbd->handle, rv);
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01651)
"authz_dbd in get_row; group query for user=%s [%s]",
r->user, message?message:noerror);
return HTTP_INTERNAL_SERVER_ERROR;
@@ -238,7 +238,7 @@ static int authz_dbd_group_query(request_rec *r, authz_dbd_cfg *cfg,
}
else {
message = apr_dbd_error(dbd->driver, dbd->handle, rv);
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01652)
"authz_dbd, in groups query for %s [%s]",
r->user, message?message:noerror);
return HTTP_INTERNAL_SERVER_ERROR;
View
16 modules/aaa/mod_authz_dbm.c
@@ -149,7 +149,7 @@ static authz_status dbmgroup_check_authorization(request_rec *r,
}
if (!conf->grpfile) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01798)
"No group file was specified in the configuration");
return AUTHZ_DENIED;
}
@@ -162,7 +162,7 @@ static authz_status dbmgroup_check_authorization(request_rec *r,
user, conf->grpfile, conf->dbmtype, &groups);
if (status != APR_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(01799)
"could not open dbm (type %s) group access "
"file: %s", conf->dbmtype, conf->grpfile);
return AUTHZ_GENERAL_ERROR;
@@ -170,7 +170,7 @@ static authz_status dbmgroup_check_authorization(request_rec *r,
if (groups == NULL) {
/* no groups available, so exit immediately */
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01800)
"Authorization of user %s to access %s failed, reason: "
"user doesn't appear in DBM group file (%s).",
r->user, r->uri, conf->grpfile);
@@ -191,7 +191,7 @@ static authz_status dbmgroup_check_authorization(request_rec *r,
}
}
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01801)
"Authorization of user %s to access %s failed, reason: "
"user is not part of the 'require'ed group(s).",
r->user, r->uri);
@@ -220,7 +220,7 @@ static authz_status dbmfilegroup_check_authorization(request_rec *r,
}
if (!conf->grpfile) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01802)
"No group file was specified in the configuration");
return AUTHZ_DENIED;
}
@@ -230,7 +230,7 @@ static authz_status dbmfilegroup_check_authorization(request_rec *r,
user, conf->grpfile, conf->dbmtype, &groups);
if (status != APR_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(01803)
"could not open dbm (type %s) group access "
"file: %s", conf->dbmtype, conf->grpfile);
return AUTHZ_DENIED;
@@ -238,7 +238,7 @@ static authz_status dbmfilegroup_check_authorization(request_rec *r,
if (groups == NULL) {
/* no groups available, so exit immediately */
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01804)
"Authorization of user %s to access %s failed, reason: "
"user doesn't appear in DBM group file (%s).",
r->user, r->uri, conf->grpfile);
@@ -259,7 +259,7 @@ static authz_status dbmfilegroup_check_authorization(request_rec *r,
}
}
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01805)
"Authorization of user %s to access %s failed, reason: "
"user is not part of the 'require'ed group(s).",
r->user, r->uri);
View
16 modules/aaa/mod_authz_groupfile.c
@@ -161,7 +161,7 @@ static authz_status group_check_authorization(request_rec *r,
* configured. So decline.
*/
if (!(conf->groupfile)) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01664)
"No group file was specified in the configuration");
return AUTHZ_DENIED;
}
@@ -170,7 +170,7 @@ static authz_status group_check_authorization(request_rec *r,
&grpstatus);
if (status != APR_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(01665)
"Could not open group file: %s",
conf->groupfile);
return AUTHZ_DENIED;
@@ -178,7 +178,7 @@ static authz_status group_check_authorization(request_rec *r,
if (apr_table_elts(grpstatus)->nelts == 0) {
/* no groups available, so exit immediately */
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01666)
"Authorization of user %s to access %s failed, reason: "
"user doesn't appear in group file (%s).",
r->user, r->uri, conf->groupfile);
@@ -192,7 +192,7 @@ static authz_status group_check_authorization(request_rec *r,
}
}
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01667)
"Authorization of user %s to access %s failed, reason: "
"user is not part of the 'require'ed group(s).",
r->user, r->uri);
@@ -221,7 +221,7 @@ static authz_status filegroup_check_authorization(request_rec *r,
* configured. So decline.
*/