httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpl...@apache.org
Subject svn commit: r425731 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/aaa/mod_authnz_ldap.c
Date Wed, 26 Jul 2006 13:31:38 GMT
Author: rpluem
Date: Wed Jul 26 06:31:38 2006
New Revision: 425731

URL: http://svn.apache.org/viewvc?rev=425731&view=rev
Log:
Merge r411306 from trunk:

* Fix a problem with invalid auth error detection for LDAP client SDKs that don't
  support the LDAP_SECURITY_ERROR macro.

PR: 39529
Submitted by: Ray Price <dohrayme yahoo.com>, Josh Fenlason <jfenlason ptc.com>
Reviewed by: bnicholes, wrowe, fielding

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/aaa/mod_authnz_ldap.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=425731&r1=425730&r2=425731&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Wed Jul 26 06:31:38 2006
@@ -1,6 +1,10 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.3
 
+  *) mod_authnz_ldap: Fix a problem with invalid auth error detection for LDAP
+     client SDKs that don't support the LDAP_SECURITY_ERROR macro. PR 39529.
+     [Ray Price <dohrayme yahoo.com>, Josh Fenlason <jfenlason ptc.com>]
+
   *) mod_cache: Do not overwrite the Content-Type in the cache, for
      successfully revalidated cached objects. PR 39647. [Ruediger Pluem]
 

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=425731&r1=425730&r2=425731&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Wed Jul 26 06:31:38 2006
@@ -82,13 +82,6 @@
        http://issues.apache.org/bugzilla/attachment.cgi?id=18636
        +1: bnicholes, rpluem, fielding
 
-    * mod_authnz_ldap: Fix a problem with invalid auth error detection 
-       for LDAP client SDKs that don't support LDAP_SECURITY_ERROR 
-       macro. PR#39529
-       http://svn.apache.org/viewvc?view=rev&revision=411306
-       +1: bnicholes, wrowe, fielding
-         wrowe observes; CONST==result is a horrid style convention
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * Bundled PCRE: backport r381783 from trunk

Modified: httpd/httpd/branches/2.2.x/modules/aaa/mod_authnz_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/aaa/mod_authnz_ldap.c?rev=425731&r1=425730&r2=425731&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/aaa/mod_authnz_ldap.c (original)
+++ httpd/httpd/branches/2.2.x/modules/aaa/mod_authnz_ldap.c Wed Jul 26 06:31:38 2006
@@ -413,6 +413,15 @@
         return (LDAP_NO_SUCH_OBJECT == result) ? AUTH_USER_NOT_FOUND
 #ifdef LDAP_SECURITY_ERROR
                  : (LDAP_SECURITY_ERROR(result)) ? AUTH_DENIED
+#else
+				 : (LDAP_INAPPROPRIATE_AUTH == result) ? AUTH_DENIED
+				 : (LDAP_INVALID_CREDENTIALS == result) ? AUTH_DENIED
+#ifdef LDAP_INSUFFICIENT_ACCESS
+                 : (LDAP_INSUFFICIENT_ACCESS == result) ? AUTH_DENIED
+#endif
+#ifdef LDAP_INSUFFICIENT_RIGHTS
+				 : (LDAP_INSUFFICIENT_RIGHTS == result) ? AUTH_DENIED
+#endif
 #endif
                  : AUTH_GENERAL_ERROR;
     }



Mime
View raw message