isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace pass variable with do_netgr for better readability.

Browse Source
This commit is contained in:
Todd C. Miller
2005-04-11 04:37:49 +00:00
parent 3f84e1b18d
commit b8cbf50a38
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ldap.c
View File

@@ -843,7 +843,7 @@ sudo_ldap_check(v, pwflag)
LDAP *ld = (LDAP *) v; LDAP *ld = (LDAP *) v;
LDAPMessage *entry = NULL, *result = NULL; /* used for searches */ LDAPMessage *entry = NULL, *result = NULL; /* used for searches */
char *filt; /* used to parse attributes */ char *filt; /* used to parse attributes */
int rc = FALSE, ret = FALSE, pass = FALSE; /* temp/final return values */ int rc = FALSE, ret = FALSE, do_netgr; /* temp/final return values */
int ldap_user_matches = FALSE, ldap_host_matches = FALSE; /* flags */ int ldap_user_matches = FALSE, ldap_host_matches = FALSE; /* flags */
/* /*
@@ -861,14 +861,8 @@ sudo_ldap_check(v, pwflag)
* try to match them against the username. * try to match them against the username.
*/ */
for (pass = 1; !ret && pass <= 2; pass++) { for (do_netgr = 0; !ret && do_netgr < 2; do_netgr++) {
if (pass == 1) { filt = do_netgr ? estrdup("sudoUser=+*") : sudo_ldap_build_pass1();
/* Want the entries that match our usernames or groups */
filt = sudo_ldap_build_pass1();
} else { /* pass=2 */
/* Want the entries that have user netgroups in them. */
filt = estrdup("sudoUser=+*");
}
DPRINTF(("ldap search '%s'", filt), 1); DPRINTF(("ldap search '%s'", filt), 1);
rc = ldap_search_s(ld, ldap_conf.base, LDAP_SCOPE_ONELEVEL, filt, rc = ldap_search_s(ld, ldap_conf.base, LDAP_SCOPE_ONELEVEL, filt,
NULL, 0, &result); NULL, 0, &result);
@@ -882,7 +876,7 @@ sudo_ldap_check(v, pwflag)
DPRINTF(("found:%s", ldap_get_dn(ld, entry)), 1); DPRINTF(("found:%s", ldap_get_dn(ld, entry)), 1);
if ( if (
/* first verify user netgroup matches - only if in pass 2 */ /* first verify user netgroup matches - only if in pass 2 */
(pass != 2 || sudo_ldap_check_user_netgroup(ld, entry)) && (!do_netgr || sudo_ldap_check_user_netgroup(ld, entry)) &&
/* remember that user matched */ /* remember that user matched */
(ldap_user_matches = -1) && (ldap_user_matches = -1) &&
/* verify host match */ /* verify host match */