Quotes cannot be used around require group and require dn

directives, update the documentation to reflect this. Also add
quotes around the dn and group within debug messages, to make it
more obvious why authentication is failing if quotes are used in
error.
PR:	19304
Obtained from:
Submitted by:
Reviewed by:	minfrin, jim, trawick, bnicholes

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

diff --git a/CHANGES b/CHANGES
index 2d8018dc17c1f97507a755b07b0384bda8226adc..c9545637529cd977af629ab9e4b41562f969406c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,11 @@
 Changes with Apache 2.0.50
 
+  *) Quotes cannot be used around require group and require dn
+     directives, update the documentation to reflect this. Also add
+     quotes around the dn and group within debug messages, to make it
+     more obvious why authentication is failing if quotes are used in
+     error. PR 19304 [Graham Leggett]
+
   *) The Microsoft LDAP SDK escapes filters for us, stop util_ldap
      from escaping filters twice when the backslash character is used.
      PR 24437 [Jess Holle <jessh@ptc.com>]

diff --git a/STATUS b/STATUS
index 5e5f1f0f88a6b5aac38f56225ea9f67dc89640a3..b499561a91b35e702b5664c59a4c4cdc8146e7f6 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/05/21 23:20:48 $]
+Last modified at [$Date: 2004/05/21 23:39:41 $]
 
 Release:
 
@@ -85,16 +85,6 @@ PATCHES TO BACKPORT FROM 2.1
        PR 26686 [Jari Ahonen <jah@progress.com>]
        +1: jim, trawick, bnicholes
 
-    *) Quotes cannot be used around require group and require dn
-       directives, update the documentation to reflect this. Also add
-       quotes around the dn and group within debug messages, to make it
-       more obvious why authentication is failing if quotes are used in
-       error.
-       docs/manual/mod/mod_auth_ldap.xml r1.18
-       modules/experimental/mod_auth_ldap.c r1.27
-       PR 19304
-       +1: minfrin, jim, trawick, bnicholes
-
     *) Fix handling of IPv6 numeric strings in mod_proxy.
          modules/proxy/proxy_ftp.c r1.141, r1.142
          modules/proxy/proxy_http.c r1.186

diff --git a/modules/experimental/mod_auth_ldap.c b/modules/experimental/mod_auth_ldap.c
index aabd81fbc945216b135488828847afa7b33e4379..ee9ad718714460467fc5f5ffdd65393f19621a7e 100644 (file)
--- a/modules/experimental/mod_auth_ldap.c
+++ b/modules/experimental/mod_auth_ldap.c
@@ -574,8 +574,8 @@ int mod_auth_ldap_auth_checker(request_rec *r)
                 default: {
                     ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r, 
                                   "[%d] auth_ldap authorise: "
-                                  "require dn: LDAP error [%s][%s]",
-                                  getpid(), ldc->reason, ldap_err2string(result));
+                                  "require dn \"%s\": LDAP error [%s][%s]",
+                                  getpid(), t, ldc->reason, ldap_err2string(result));
                 }
             }
         }
@@ -600,7 +600,7 @@ int mod_auth_ldap_auth_checker(request_rec *r)
             }
 
             ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r, 
-                          "[%d] auth_ldap authorise: require group: testing for group membership in `%s'", 
+                          "[%d] auth_ldap authorise: require group: testing for group membership in \"%s\"", 
                          getpid(), t);
 
             for (i = 0; i < sec->groupattr->nelts; i++) {
@@ -620,9 +620,9 @@ int mod_auth_ldap_auth_checker(request_rec *r)
                     }
                     default: {
                         ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r, 
-                                      "[%d] auth_ldap authorise: require group: "
+                                      "[%d] auth_ldap authorise: require group \"%s\": "
                                       "authorisation failed [%s][%s]",
-                                      getpid(), ldc->reason, ldap_err2string(result));
+                                      getpid(), t, ldc->reason, ldap_err2string(result));
                     }
                 }
             }