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

Stash pointer to user group vector in LDAP handle and only reuse

Browse Source 
the query if it has not changed.  We always allocate a new buffer
when we reset the group vector so a simple pointer check is sufficient.
This commit is contained in:
Todd C. Miller
2011-01-20 16:16:08 -05:00
parent 165dcfa37f
commit 215500bb55
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/sudoers/ldap.c
View File

@@ -326,6 +326,7 @@ struct sudo_ldap_handle {
LDAP *ld; LDAP *ld;
struct ldap_result *result; struct ldap_result *result;
char *username; char *username;
GETGROUPS_T *groups;
}; };
struct sudo_nss sudo_nss_ldap = { struct sudo_nss sudo_nss_ldap = {
@@ -1467,7 +1468,6 @@ sudo_ldap_display_entry_short(LDAP *ld, LDAPMessage *entry, struct lbuf *lbuf)
"NOSETENV: " : "SETENV: "; "NOSETENV: " : "SETENV: ";
if (tag != NULL) if (tag != NULL)
lbuf_append(lbuf, tag, NULL); lbuf_append(lbuf, tag, NULL);
/* XXX - ignores other options */
} }
ldap_value_free_len(bv); ldap_value_free_len(bv);
} }
@@ -1991,6 +1991,7 @@ sudo_ldap_open(struct sudo_nss *nss)
handle->ld = ld; handle->ld = ld;
handle->result = NULL; handle->result = NULL;
handle->username = NULL; handle->username = NULL;
handle->groups = NULL;
nss->handle = handle; nss->handle = handle;
return(0); return(0);
@@ -2244,6 +2245,7 @@ sudo_ldap_result_free_nss(struct sudo_nss *nss)
efree(handle->username); efree(handle->username);
handle->username = NULL; handle->username = NULL;
} }
handle->groups = NULL;
handle->result = NULL; handle->result = NULL;
} }
} }
@@ -2269,7 +2271,8 @@ sudo_ldap_result_get(struct sudo_nss *nss, struct passwd *pw)
* have to contact the LDAP server again. * have to contact the LDAP server again.
*/ */
if (handle->result) { if (handle->result) {
if (strcmp(pw->pw_name, handle->username) == 0) { if (handle->groups == user_groups &&
strcmp(pw->pw_name, handle->username) == 0) {
DPRINTF(("reusing previous result (user %s) with %d entries", DPRINTF(("reusing previous result (user %s) with %d entries",
handle->username, handle->result->nentries), 1); handle->username, handle->result->nentries), 1);
return(handle->result); return(handle->result);
@@ -2342,6 +2345,7 @@ sudo_ldap_result_get(struct sudo_nss *nss, struct passwd *pw)
/* Store everything in the sudo_nss handle. */ /* Store everything in the sudo_nss handle. */
handle->result = lres; handle->result = lres;
handle->username = estrdup(pw->pw_name); handle->username = estrdup(pw->pw_name);
handle->groups = user_groups;
return(lres); return(lres);
} }