nss-pam-ldapd commit: r1770 - nss-pam-ldapd/nslcd

[Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Sun Sep 16 17:51:39 2012
New Revision: 1770
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=1770&view=revision

Log:
fix logic error when falling back to getting ranged attribute values for 
possibly binary attributes (thanks scan-build)

Modified:
   nss-pam-ldapd/nslcd/myldap.c

Modified: nss-pam-ldapd/nslcd/myldap.c
==============================================================================
--- nss-pam-ldapd/nslcd/myldap.c        Sun Sep 16 17:47:37 2012        (r1769)
+++ nss-pam-ldapd/nslcd/myldap.c        Sun Sep 16 17:51:39 2012        (r1770)
@@ -1622,6 +1622,7 @@
       rc=LDAP_SUCCESS;
       if 
(ldap_set_option(entry->search->session->ld,LDAP_OPT_ERROR_NUMBER,&rc)!=LDAP_SUCCESS)
         log_log(LOG_WARNING,"failed to clear the error flag");
+      return NULL;
     }
     else if (rc==LDAP_SUCCESS)
     {
@@ -1633,10 +1634,12 @@
       values=set_tolist(set);
     }
     else
+    {
       myldap_err(LOG_WARNING,entry->search->session->ld,rc,
                  "myldap_get_values_len() of attribute \"%s\" on entry \"%s\" 
returned NULL",
                  attr,myldap_get_dn(entry));
-    return NULL;
+      return NULL;
+    }
   }
   else
   {
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/