From: Nick Kew <niq@apache.org>
Date: Sun, 11 Jul 2010 06:08:34 +0000 (+0000)
Subject: Improve misleading error message.
X-Git-Tag: 2.2.16~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47b4c31ed0ddf6301a537b367254530626193c93;p=thirdparty%2Fapache%2Fhttpd.git

Improve misleading error message.
PR 38322


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@962991 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index b85c0b08cfd..3b7bb967684 100644
--- a/STATUS
+++ b/STATUS
@@ -122,11 +122,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
            option in the docs page, like e.g. we did for SSLInsecureRenegotiation.
     wrowe asks; you mean <Compatibility> tag?  Yes, of course.
 
-  *) core authnz: improve misleading error message.  PR 38322.
-     Trunk: N/A
-     2.2.x: https://issues.apache.org/bugzilla/attachment.cgi?id=25698
-     +1: niq, pgollucci, trawick
-
   *) mod_ldap: LDAP caching was suppressed (and ldap-status handler returns
      title page only) when any mod_ldap directives were used in VirtualHost
      context.
diff --git a/server/request.c b/server/request.c
index 6ca30f92647..0a805ff088e 100644
--- a/server/request.c
+++ b/server/request.c
@@ -190,7 +190,7 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r)
                 if (((access_status = ap_run_check_user_id(r)) != 0)
                     || !ap_auth_type(r)) {
                     return decl_die(access_status, ap_auth_type(r)
-                                  ? "check user.  No user file?"
+                                  ? "check user.  Check your authn provider!"
                                   : "perform authentication. AuthType not set!",
                                   r);
                 }
@@ -198,7 +198,7 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r)
                 if (((access_status = ap_run_auth_checker(r)) != 0)
                     || !ap_auth_type(r)) {
                     return decl_die(access_status, ap_auth_type(r)
-                                  ? "check access.  No groups file?"
+                                  ? "check access.  "Check your 'Require' directive"
                                   : "perform authentication. AuthType not set!",
                                    r);
                 }
@@ -214,7 +214,7 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r)
                 if (((access_status = ap_run_check_user_id(r)) != 0)
                     || !ap_auth_type(r)) {
                     return decl_die(access_status, ap_auth_type(r)
-                                  ? "check user.  No user file?"
+                                  ? "check user.  Check your authn provider!"
                                   : "perform authentication. AuthType not set!",
                                   r);
                 }
@@ -222,7 +222,7 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r)
                 if (((access_status = ap_run_auth_checker(r)) != 0)
                     || !ap_auth_type(r)) {
                     return decl_die(access_status, ap_auth_type(r)
-                                  ? "check access.  No groups file?"
+                                  ? "check access.  "Check your 'Require' directive"
                                   : "perform authentication. AuthType not set!",
                                   r);
                 }