From: Giovanni Bechis <gbechis@apache.org>
Date: Wed, 20 Apr 2022 16:49:15 +0000 (+0000)
Subject: fix select-groups example, bz 66010
X-Git-Tag: 2.5.0-alpha2-ci-test-only~375
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d1ca7bd74ba5c25666245b93c932a2b34aafc73;p=thirdparty%2Fapache%2Fhttpd.git

fix select-groups example, bz 66010


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1900077 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_authz_dbd.xml b/docs/manual/mod/mod_authz_dbd.xml
index db753de8a99..c41d7bb6a4d 100644
--- a/docs/manual/mod/mod_authz_dbd.xml
+++ b/docs/manual/mod/mod_authz_dbd.xml
@@ -70,7 +70,7 @@
 
     <highlight language="config">
 Require dbd-group team
-AuthzDBDQuery "SELECT group FROM authz WHERE user = %s"
+AuthzDBDQuery "SELECT user_group FROM authz WHERE user = %s"
     </highlight>
 
 </section>
diff --git a/modules/aaa/mod_authz_dbd.c b/modules/aaa/mod_authz_dbd.c
index e1bb6232cf3..5d169e1afbe 100644
--- a/modules/aaa/mod_authz_dbd.c
+++ b/modules/aaa/mod_authz_dbd.c
@@ -212,7 +212,7 @@ static int authz_dbd_login(request_rec *r, authz_dbd_cfg *cfg,
 static int authz_dbd_group_query(request_rec *r, authz_dbd_cfg *cfg,
                                  apr_array_header_t *groups)
 {
-    /* SELECT group FROM authz WHERE user = %s */
+    /* SELECT user_group FROM authz WHERE user = %s */
     int rv;
     const char *message;
     ap_dbd_t *dbd;
@@ -254,7 +254,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, APLOGNO(01651)
-                        "authz_dbd in get_row; group query for user=%s [%s]",
+                        "authz_dbd in get_row; user_group query for user=%s [%s]",
                         r->user, message?message:noerror);
                 return HTTP_INTERNAL_SERVER_ERROR;
             }