From e35f6d1f09610b052246768b8d2c11897720be69 Mon Sep 17 00:00:00 2001 From: Ryan Bloom Date: Tue, 23 Nov 1999 13:47:01 +0000 Subject: [PATCH] Update some dependancies. Move the final two files out of apr/inc and into apr/include. Basically just finish some cleanup from some changes I've been making over the last two days. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84147 13f79535-47bb-0310-9956-ffa450edef68 --- modules/aaa/mod_auth.c | 9 +++++---- modules/generators/mod_autoindex.c | 2 +- modules/http/http_core.c | 2 +- modules/http/http_request.c | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/aaa/mod_auth.c b/modules/aaa/mod_auth.c index 107d7d9e82..6b348f5e24 100644 --- a/modules/aaa/mod_auth.c +++ b/modules/aaa/mod_auth.c @@ -203,7 +203,7 @@ static int authenticate_basic_user(request_rec *r) (auth_config_rec *) ap_get_module_config(r->per_dir_config, &auth_module); const char *sent_pw; char *real_pw; - char *invalid_pw; + ap_status_t invalid_pw; int res; if ((res = ap_get_basic_auth_pw(r, &sent_pw))) @@ -221,10 +221,11 @@ static int authenticate_basic_user(request_rec *r) return AUTH_REQUIRED; } invalid_pw = ap_validate_password(sent_pw, real_pw); - if (invalid_pw != NULL) { + if (invalid_pw != APR_SUCCESS) { ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r, - "user %s: authentication failure for \"%s\": %s", - r->user, r->uri, invalid_pw); + "user %s: authentication failure for \"%s\": " + "Password Mismatch", + r->user, r->uri); ap_note_basic_auth_failure(r); return AUTH_REQUIRED; } diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c index aeefbad829..157a75fdd8 100644 --- a/modules/generators/mod_autoindex.c +++ b/modules/generators/mod_autoindex.c @@ -72,7 +72,7 @@ #include "http_log.h" #include "http_main.h" #include "util_script.h" -#include "fnmatch.h" +#include "apr_fnmatch.h" module MODULE_VAR_EXPORT autoindex_module; diff --git a/modules/http/http_core.c b/modules/http/http_core.c index 3dc26270af..598f19dbd2 100644 --- a/modules/http/http_core.c +++ b/modules/http/http_core.c @@ -67,7 +67,7 @@ #include "http_log.h" #include "rfc1413.h" #include "util_md5.h" -#include "fnmatch.h" +#include "apr_fnmatch.h" #include "http_connection.h" /* Allow Apache to use ap_mmap */ diff --git a/modules/http/http_request.c b/modules/http/http_request.c index 7fe520e584..5c7cacfc17 100644 --- a/modules/http/http_request.c +++ b/modules/http/http_request.c @@ -76,7 +76,7 @@ #if 0 #include "scoreboard.h" #endif -#include "fnmatch.h" +#include "apr_fnmatch.h" HOOK_STRUCT( HOOK_LINK(translate_name) -- 2.40.0