Imported Upstream version 1.7.4p4

[debian/sudo] / ldap.c

diff --git a/ldap.c b/ldap.c
index 9554df22e8c4ad5637510b0f819f174b151e3249..81d3c408cbfe0173f5e4b4bab9fba3002e2cc090 100644 (file)
--- a/ldap.c
+++ b/ldap.c
@@ -1227,7 +1227,7 @@ sudo_ldap_display_defaults(nss, pw, lbuf)
     int rc, count = 0;
 
     if (ld == NULL)
-       return(-1);
+       goto done;
 
     for (base = ldap_conf.base; base != NULL; base = base->next) {
        result = NULL;
@@ -1251,6 +1251,7 @@ sudo_ldap_display_defaults(nss, pw, lbuf)
        if (result)
            ldap_msgfree(result);
     }
+done:
     return(count);
 }
 
@@ -1263,7 +1264,7 @@ sudo_ldap_display_bound_defaults(nss, pw, lbuf)
     struct passwd *pw;
     struct lbuf *lbuf;
 {
-    return(1);
+    return(0);
 }
 
 /*
@@ -1440,7 +1441,7 @@ sudo_ldap_display_privs(nss, pw, lbuf)
     int rc, do_netgr, count = 0;
 
     if (ld == NULL)
-       return(-1);
+       goto done;
 
     /*
      * Okay - time to search for anything that matches this user
@@ -1482,6 +1483,7 @@ sudo_ldap_display_privs(nss, pw, lbuf)
        }
        efree(filt);
     }
+done:
     return(count);
 }