Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 5 Nov 2004 23:41:38 -0000
Message-ID: <20041105234138.51711.qmail@minotaur.apache.org>
From: bnicholes@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/aaa mod_authnz_ldap.c

bnicholes    2004/11/05 15:41:38

  Modified:    modules/aaa mod_authnz_ldap.c
  Log:
  Return the correct error when the user object is not found
  
  Revision  Changes    Path
  1.9       +4 -6      httpd-2.0/modules/aaa/mod_authnz_ldap.c
  
  Index: mod_authnz_ldap.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_authnz_ldap.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- mod_authnz_ldap.c	5 Nov 2004 18:48:16 -0000	1.8
  +++ mod_authnz_ldap.c	5 Nov 2004 23:41:38 -0000	1.9
  @@ -402,12 +402,10 @@
                         "[%d] auth_ldap authenticate: "
                         "user %s authentication failed; URI %s [%s][%s]",
                         getpid(), user, r->uri, ldc->reason, ldap_err2string(result));
  -        if (LDAP_INVALID_CREDENTIALS == result) {
  -            return AUTH_DENIED;
  -        }
  -        else {
  -            return AUTH_GENERAL_ERROR;
  -        }
  +
  +        return (LDAP_NO_SUCH_OBJECT == result) ? AUTH_USER_NOT_FOUND: \
  +               (LDAP_SECURITY_ERROR(result)) ? AUTH_DENIED: \
  +               AUTH_GENERAL_ERROR;
       }
   
       /* mark the user and DN */