From: Jim Jagielski <jim@apache.org>
Date: Fri, 6 Mar 2020 16:13:09 +0000 (+0000)
Subject: Merge r1874424 from trunk:
X-Git-Tag: 2.4.42~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8cf60e50043b9548308b0d6b18dcd650217b6906;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1874424 from trunk:

PR64172: drop severity of AH01666


Submitted by: covener
Reviewed by: covener, ylavic, jim


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

diff --git a/CHANGES b/CHANGES
index 740163f44f5..b5b8e352859 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.42
 
+  *) mod_authz_groupfile: Drop AH01666 from loglevel "error" to "info".
+     PR64172.
+
   *) mod_usertrack: Add CookieSameSite, CookieHTTPOnly, and CookieSecure 
      to allow customization of the usertrack cookie. PR64077.
      [Prashant Keshvani <prashant2400 gmail.com>, Eric Covener]
diff --git a/STATUS b/STATUS
index 0fe458e7669..99c4a0f2623 100644
--- a/STATUS
+++ b/STATUS
@@ -146,12 +146,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1874323 ^/httpd/httpd/trunk .
      +1: ylavic, gsmith, rpluem
 
-  *) authz_groupfile: drop severity of AH0166 (user not found in groupfile)
-     from ERR to INFO.
-     trunk patch: http://svn.apache.org/r1874424
-     2.4.x patch: svn merge -c 1874424 ^/httpd/httpd/trunk .
-     +:1 covener, ylavic, jim
-
   *) mod_proxy_hcheck: Allow %{Content-Type} to work in expressions
      trunk patch: http://svn.apache.org/r1874616
      2.4.x patch:  svn merge -c 1874616 ^/httpd/httpd/trunk .
diff --git a/modules/aaa/mod_authz_groupfile.c b/modules/aaa/mod_authz_groupfile.c
index 76957f71afa..88c6cf0f3e4 100644
--- a/modules/aaa/mod_authz_groupfile.c
+++ b/modules/aaa/mod_authz_groupfile.c
@@ -172,7 +172,7 @@ static authz_status group_check_authorization(request_rec *r,
 
     if (apr_is_empty_table(grpstatus)) {
         /* no groups available, so exit immediately */
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01666)
+        ap_log_rerror(APLOG_MARK, APLOG_INFO, 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);