From: William A. Rowe Jr <wrowe@apache.org>
Date: Sun, 21 Nov 2004 07:18:38 +0000 (+0000)
Subject:   Axe a dead variable
X-Git-Tag: 2.1.2~151
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a565eff67e93add3a9a4022a49873c3dcb99469;p=apache

  Axe a dead variable


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

diff --git a/modules/aaa/mod_authnz_ldap.c b/modules/aaa/mod_authnz_ldap.c
index 336603ac00..20d108e99c 100644
--- a/modules/aaa/mod_authnz_ldap.c
+++ b/modules/aaa/mod_authnz_ldap.c
@@ -403,9 +403,11 @@ start_over:
                       "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 @@ static int authz_ldap_check_user_access(request_rec *r)
     const char *dn = NULL;
     const char **vals = NULL;
     const char *type = ap_auth_type(r);
-    char *tmpuser;
 
 /*
     if (!sec->enabled) {