Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 7477 invoked from network); 21 May 2004 23:39:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 21 May 2004 23:39:56 -0000 Received: (qmail 10402 invoked by uid 500); 21 May 2004 23:40:14 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 10124 invoked by uid 500); 21 May 2004 23:40:09 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 10024 invoked by uid 500); 21 May 2004 23:40:08 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 9937 invoked by uid 98); 21 May 2004 23:40:06 -0000 Received: from minfrin@apache.org by hermes.apache.org by uid 82 with qmail-scanner-1.20 (clamuko: 0.70. Clear:RC:0(209.237.227.194):. Processed in 0.072764 secs); 21 May 2004 23:40:06 -0000 X-Qmail-Scanner-Mail-From: minfrin@apache.org via hermes.apache.org X-Qmail-Scanner: 1.20 (Clear:RC:0(209.237.227.194):. Processed in 0.072764 secs) Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by hermes.apache.org with SMTP; 21 May 2004 23:40:06 -0000 Received: (qmail 7331 invoked by uid 1263); 21 May 2004 23:39:42 -0000 Date: 21 May 2004 23:39:42 -0000 Message-ID: <20040521233942.7330.qmail@minotaur.apache.org> From: minfrin@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0 CHANGES STATUS X-Spam-Rating: hermes.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N minfrin 2004/05/21 16:39:42 Modified: modules/experimental Tag: APACHE_2_0_BRANCH mod_auth_ldap.c . Tag: APACHE_2_0_BRANCH CHANGES STATUS Log: 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 Reviewed by: minfrin, jim, trawick, bnicholes Revision Changes Path No revision No revision 1.8.2.15 +5 -5 httpd-2.0/modules/experimental/mod_auth_ldap.c Index: mod_auth_ldap.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_auth_ldap.c,v retrieving revision 1.8.2.14 retrieving revision 1.8.2.15 diff -u -r1.8.2.14 -r1.8.2.15 --- mod_auth_ldap.c 21 May 2004 23:20:47 -0000 1.8.2.14 +++ mod_auth_ldap.c 21 May 2004 23:39:41 -0000 1.8.2.15 @@ -574,8 +574,8 @@ 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 @@ } 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 @@ } 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)); } } } No revision No revision 1.988.2.279 +6 -0 httpd-2.0/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/httpd-2.0/CHANGES,v retrieving revision 1.988.2.278 retrieving revision 1.988.2.279 diff -u -r1.988.2.278 -r1.988.2.279 --- CHANGES 21 May 2004 23:20:47 -0000 1.988.2.278 +++ CHANGES 21 May 2004 23:39:41 -0000 1.988.2.279 @@ -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 ] 1.751.2.870 +1 -11 httpd-2.0/STATUS Index: STATUS =================================================================== RCS file: /home/cvs/httpd-2.0/STATUS,v retrieving revision 1.751.2.869 retrieving revision 1.751.2.870 diff -u -r1.751.2.869 -r1.751.2.870 --- STATUS 21 May 2004 23:20:48 -0000 1.751.2.869 +++ STATUS 21 May 2004 23:39:41 -0000 1.751.2.870 @@ -85,16 +85,6 @@ PR 26686 [Jari Ahonen ] +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