[389-commits] Branch 'Directory_Server_8_2_Branch' - mod_admserv/mod_admserv.c

[Mark Reynolds]

 mod_admserv/mod_admserv.c |   23 -----------------------
 1 file changed, 23 deletions(-)

New commits:
commit 9982ef0dbd0b3462acdbb313cf3a22ca1f6f749f
Author: Mark Reynolds <mreynolds at redhat.com>
Date:   Tue Jul 3 15:07:20 2012 -0400

    Bugzilla 627906 - Console break when disabling anonymous binding
    
    Bug Description:  If anonymous binds are not allowed onthe config DS instance,
                      then all console logins will fail, because the console always
                      starts with an anonymous bind to see if the config DS is up
                      and running.
    
    Fix Description:  This initial anonymous bind is not needed, so its removed.

diff --git a/mod_admserv/mod_admserv.c b/mod_admserv/mod_admserv.c
index d3a659a..60e02a4 100644
--- a/mod_admserv/mod_admserv.c
+++ b/mod_admserv/mod_admserv.c
@@ -2643,29 +2643,6 @@ authenticate_user(LdapServerData *data, char *baseDN, char *user, const char *pw
       ap_log_rerror(APLOG_MARK, APLOG_NOTICE|APLOG_NOERRNO, 0, r,
           "unable to open LDAPConnection to server [%s:%d]", data->host, data->port);
 
-  tries = 0;
-  do {
-      ldapError = admserv_ldap_auth_server(server, data);
-      if (ldapError != LDAP_SERVER_DOWN && ldapError != LDAP_CONNECT_ERROR)
-          break;
-
-      closeLDAPConnection(server);
-      if (!(server = openLDAPConnection(data)))
-          ap_log_rerror(APLOG_MARK, APLOG_NOTICE|APLOG_NOERRNO, 0, r,
-              "unable to open LDAPConnection to server [%s:%d]", data->host, data->port);
-          return DECLINED;
-  } while (server != NULL && ++tries < 2);
-
-  if (ldapError != LDAPU_SUCCESS)
-  {
-      closeLDAPConnection(server);
-      ap_log_rerror(APLOG_MARK, APLOG_NOTICE|APLOG_NOERRNO, 0, r,
-          "unable to bind to server [%s:%d] as [%s]",
-          data->host, data->port,
-          (data->bindDN && *data->bindDN) ? data->bindDN : "(anonymous)"); /*i18n*/
-      return DECLINED;
-  }
-
   /* The basic auth data may be either uid:pw or userDN:pw. The test for '='
    * is hopefully adequate to detect a DN...
    */