mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-31 14:25:15 +00:00
Code Issues Releases Wiki Activity

For ldap_search_ext_s() the sizelimit param should be 0, not -1, to

Browse Source 
indicate no limit.  From Mark Janssen.
This commit is contained in:
Todd C. Miller
2009-01-27 16:54:23 +00:00
parent 2d4aebed6e
commit da769cd429
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ldap.c
View File

@@ -1128,7 +1128,7 @@ sudo_ldap_display_defaults(nss, pw, lbuf)
return(-1); return(-1);
rc = ldap_search_ext_s(ld, ldap_conf.base, LDAP_SCOPE_SUBTREE, rc = ldap_search_ext_s(ld, ldap_conf.base, LDAP_SCOPE_SUBTREE,
"cn=defaults", NULL, 0, NULL, NULL, NULL, -1, &result); "cn=defaults", NULL, 0, NULL, NULL, NULL, 0, &result);
if (rc == LDAP_SUCCESS && (entry = ldap_first_entry(ld, result))) { if (rc == LDAP_SUCCESS && (entry = ldap_first_entry(ld, result))) {
bv = ldap_get_values_len(ld, entry, "sudoOption"); bv = ldap_get_values_len(ld, entry, "sudoOption");
if (bv != NULL) { if (bv != NULL) {
@@ -1358,7 +1358,7 @@ sudo_ldap_display_privs(nss, pw, lbuf)
filt = do_netgr ? estrdup("sudoUser=+*") : sudo_ldap_build_pass1(pw); filt = do_netgr ? estrdup("sudoUser=+*") : sudo_ldap_build_pass1(pw);
DPRINTF(("ldap search '%s'", filt), 1); DPRINTF(("ldap search '%s'", filt), 1);
rc = ldap_search_ext_s(ld, ldap_conf.base, LDAP_SCOPE_SUBTREE, filt, rc = ldap_search_ext_s(ld, ldap_conf.base, LDAP_SCOPE_SUBTREE, filt,
NULL, 0, NULL, NULL, NULL, -1, &result); NULL, 0, NULL, NULL, NULL, 0, &result);
efree(filt); efree(filt);
if (rc != LDAP_SUCCESS) if (rc != LDAP_SUCCESS)
continue; /* no entries for this pass */ continue; /* no entries for this pass */
@@ -1412,7 +1412,7 @@ sudo_ldap_display_cmnd(nss, pw)
filt = do_netgr ? estrdup("sudoUser=+*") : sudo_ldap_build_pass1(pw); filt = do_netgr ? estrdup("sudoUser=+*") : sudo_ldap_build_pass1(pw);
DPRINTF(("ldap search '%s'", filt), 1); DPRINTF(("ldap search '%s'", filt), 1);
rc = ldap_search_ext_s(ld, ldap_conf.base, LDAP_SCOPE_SUBTREE, filt, rc = ldap_search_ext_s(ld, ldap_conf.base, LDAP_SCOPE_SUBTREE, filt,
NULL, 0, NULL, NULL, NULL, -1, &result); NULL, 0, NULL, NULL, NULL, 0, &result);
efree(filt); efree(filt);
if (rc != LDAP_SUCCESS) if (rc != LDAP_SUCCESS)
continue; /* no entries for this pass */ continue; /* no entries for this pass */
@@ -1707,7 +1707,7 @@ sudo_ldap_setdefs(nss)
return(-1); return(-1);
rc = ldap_search_ext_s(ld, ldap_conf.base, LDAP_SCOPE_SUBTREE, rc = ldap_search_ext_s(ld, ldap_conf.base, LDAP_SCOPE_SUBTREE,
"cn=defaults", NULL, 0, NULL, NULL, NULL, -1, &result); "cn=defaults", NULL, 0, NULL, NULL, NULL, 0, &result);
if (rc == 0 && (entry = ldap_first_entry(ld, result))) { if (rc == 0 && (entry = ldap_first_entry(ld, result))) {
DPRINTF(("found:%s", ldap_get_dn(ld, entry)), 1); DPRINTF(("found:%s", ldap_get_dn(ld, entry)), 1);
sudo_ldap_parse_options(ld, entry); sudo_ldap_parse_options(ld, entry);
@@ -1748,7 +1748,7 @@ sudo_ldap_lookup(nss, ret, pwflag)
for (matched = 0, do_netgr = 0; !matched && do_netgr < 2; do_netgr++) { for (matched = 0, do_netgr = 0; !matched && do_netgr < 2; do_netgr++) {
filt = do_netgr ? estrdup("sudoUser=+*") : sudo_ldap_build_pass1(pw); filt = do_netgr ? estrdup("sudoUser=+*") : sudo_ldap_build_pass1(pw);
rc = ldap_search_ext_s(ld, ldap_conf.base, LDAP_SCOPE_SUBTREE, filt, rc = ldap_search_ext_s(ld, ldap_conf.base, LDAP_SCOPE_SUBTREE, filt,
NULL, 0, NULL, NULL, NULL, -1, &result); NULL, 0, NULL, NULL, NULL, 0, &result);
efree(filt); efree(filt);
if (rc != LDAP_SUCCESS) if (rc != LDAP_SUCCESS)
continue; continue;
@@ -1819,7 +1819,7 @@ sudo_ldap_lookup(nss, ret, pwflag)
filt = do_netgr ? estrdup("sudoUser=+*") : sudo_ldap_build_pass1(pw); filt = do_netgr ? estrdup("sudoUser=+*") : sudo_ldap_build_pass1(pw);
DPRINTF(("ldap search '%s'", filt), 1); DPRINTF(("ldap search '%s'", filt), 1);
rc = ldap_search_ext_s(ld, ldap_conf.base, LDAP_SCOPE_SUBTREE, filt, rc = ldap_search_ext_s(ld, ldap_conf.base, LDAP_SCOPE_SUBTREE, filt,
NULL, 0, NULL, NULL, NULL, -1, &result); NULL, 0, NULL, NULL, NULL, 0, &result);
if (rc != LDAP_SUCCESS) if (rc != LDAP_SUCCESS)
DPRINTF(("nothing found for '%s'", filt), 1); DPRINTF(("nothing found for '%s'", filt), 1);
efree(filt); efree(filt);