httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r106077 - /httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c
Date Sun, 21 Nov 2004 07:18:39 GMT
Author: wrowe
Date: Sat Nov 20 23:18:38 2004
New Revision: 106077

Modified:
   httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c
Log:

  Axe a dead variable


Modified: httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c	(original)
+++ httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c	Sat Nov 20 23:18:38 2004
@@ -403,9 +403,11 @@
                       "user %s authentication failed; URI %s [%s][%s]",
                       getpid(), user, r->uri, ldc->reason, ldap_err2string(result));
 
-        return (LDAP_NO_SUCH_OBJECT == result) ? AUTH_USER_NOT_FOUND: \
-               (LDAP_SECURITY_ERROR(result)) ? AUTH_DENIED: \
-               AUTH_GENERAL_ERROR;
+        return (LDAP_NO_SUCH_OBJECT == result) ? AUTH_USER_NOT_FOUND
+#ifdef LDAP_SECURITY_ERROR
+                 : (LDAP_SECURITY_ERROR(result)) ? AUTH_DENIED
+#endif
+                 : AUTH_GENERAL_ERROR;
     }
 
     /* mark the user and DN */
@@ -478,7 +480,6 @@
     const char *dn = NULL;
     const char **vals = NULL;
     const char *type = ap_auth_type(r);
-    char *tmpuser;
 
 /*
     if (!sec->enabled) {

Mime
View raw message