diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2010-11-04 21:48:34 +0100 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2010-11-04 21:48:34 +0100 |
| commit | 7d9baf67b727c7b50c3666721821e38485d76332 (patch) | |
| tree | dcb1c20271ff6c8b987ccc056b65b4ddba7eabaf /nslcd/passwd.c | |
| parent | 2df226afd962fa2f1a3023228bcda5c5903ddfd2 (diff) | |
| parent | 30c5d829633689ba885b0240d9c6522fb025d362 (diff) | |
merge changes from trunk
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd-solaris@1299 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nslcd/passwd.c')
| -rw-r--r-- | nslcd/passwd.c | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/nslcd/passwd.c b/nslcd/passwd.c index da26d88..a0b61d7 100644 --- a/nslcd/passwd.c +++ b/nslcd/passwd.c @@ -140,14 +140,14 @@ struct dn2uid_cache_entry /* Perform an LDAP lookup to translate the DN into a uid. This function either returns NULL or a strdup()ed string. */ -char *lookup_dn2uid(MYLDAP_SESSION *session,const char *dn,int *rcp) +char *lookup_dn2uid(MYLDAP_SESSION *session,const char *dn,int *rcp,char *buf,size_t buflen) { MYLDAP_SEARCH *search; MYLDAP_ENTRY *entry; static const char *attrs[2]; int rc=LDAP_SUCCESS; const char **values; - char *uid; + char *uid=NULL; if (rcp==NULL) rcp=&rc; /* we have to look up the entry */ @@ -169,10 +169,12 @@ char *lookup_dn2uid(MYLDAP_SESSION *session,const char *dn,int *rcp) /* get uid (just use first one) */ values=myldap_get_values(entry,attmap_passwd_uid); /* check the result for presence and validity */ - if ((values!=NULL)&&(values[0]!=NULL)&&isvalidname(values[0])) - uid=strdup(values[0]); - else - uid=NULL; + if ((values!=NULL)&&(values[0]!=NULL)&&isvalidname(values[0])&&(strlen(values[0])<buflen)) + { + strcpy(buf,values[0]); + uid=buf; + } + /* clean up and return */ myldap_search_close(search); return uid; } @@ -216,31 +218,38 @@ char *dn2uid(MYLDAP_SESSION *session,const char *dn,char *buf,size_t buflen) } pthread_mutex_unlock(&dn2uid_cache_mutex); /* look up the uid using an LDAP query */ - uid=lookup_dn2uid(session,dn,NULL); + uid=lookup_dn2uid(session,dn,NULL,buf,buflen); /* store the result in the cache */ pthread_mutex_lock(&dn2uid_cache_mutex); + /* try to get the entry from the cache here again because it could have + changed in the meantime */ + cacheentry=dict_get(dn2uid_cache,dn); if (cacheentry==NULL) { /* allocate a new entry in the cache */ cacheentry=(struct dn2uid_cache_entry *)malloc(sizeof(struct dn2uid_cache_entry)); if (cacheentry!=NULL) + { + cacheentry->uid=NULL; dict_put(dn2uid_cache,dn,cacheentry); + } } - else if (cacheentry->uid!=NULL) - free(cacheentry->uid); /* update the cache entry */ if (cacheentry!=NULL) { cacheentry->timestamp=time(NULL); - cacheentry->uid=uid; + /* copy the uid if needed */ + if (cacheentry->uid==NULL) + cacheentry->uid=uid!=NULL?strdup(uid):NULL; + else if (strcmp(cacheentry->uid,uid)!=0) + { + free(cacheentry->uid); + cacheentry->uid=uid!=NULL?strdup(uid):NULL; + } } pthread_mutex_unlock(&dn2uid_cache_mutex); /* copy the result into the buffer */ - if ((uid!=NULL)&&(strlen(uid)<buflen)) - strcpy(buf,uid); - else - buf=NULL; - return buf; + return uid; } MYLDAP_ENTRY *uid2entry(MYLDAP_SESSION *session,const char *uid) |