summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur de Jong <arthur@arthurdejong.org>2011-03-11 18:02:59 +0000
committerArthur de Jong <arthur@arthurdejong.org>2011-03-11 18:02:59 +0000
commit09c01fe918a1966e0255ea55eb8c7fd09701d74d (patch)
treee6dbd0277ee35be063c24a28d862ab1d08f59a9a
parent2c4be1e08674667a919bd66129f3e3ed39b921dd (diff)
fix problem with endless loop on incorrect password
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1388 ef36b2f9-881f-0410-afb5-c4e39611909c
-rw-r--r--nslcd/myldap.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/nslcd/myldap.c b/nslcd/myldap.c
index df2d653..4742406 100644
--- a/nslcd/myldap.c
+++ b/nslcd/myldap.c
@@ -901,10 +901,8 @@ static int do_retry_search(MYLDAP_SEARCH *search)
if (nexttry>=endtime)
{
if (search->session->binddn[0]=='\0')
- {
log_log(LOG_ERR,"no available LDAP server found: %s",ldap_err2string(rc));
- return LDAP_UNAVAILABLE;
- }
+ return rc;
}
/* sleep between tries */
sleeptime=nexttry-time(NULL);
@@ -1706,7 +1704,6 @@ int myldap_passwd(
int myldap_modify(MYLDAP_SESSION *session,const char *dn,LDAPMod *mods[])
{
- int rc;
if (!is_valid_session(session)||(dn==NULL))
{
log_log(LOG_ERR,"myldap_passwd(): invalid parameter passed");