diff options
author | Arthur de Jong <arthur@arthurdejong.org> | 2007-09-09 17:06:11 +0200 |
---|---|---|
committer | Arthur de Jong <arthur@arthurdejong.org> | 2007-09-09 17:06:11 +0200 |
commit | 88e2db4c821ed27f49f257d7dd7b279e55cc8d30 (patch) | |
tree | 2620d88b9d8793c7108ce9b8aa2db2f1099b5411 /nslcd | |
parent | 3c0422d53b51bc72860e82ae55c1e9d708d23ae7 (diff) |
change naming of search functions to clearly indicate whether the synchronous or the asynchronous interface is used
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@389 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nslcd')
-rw-r--r-- | nslcd/group.c | 4 | ||||
-rw-r--r-- | nslcd/ldap-nss.c | 16 | ||||
-rw-r--r-- | nslcd/ldap-nss.h | 4 | ||||
-rw-r--r-- | nslcd/util.c | 2 |
4 files changed, 14 insertions, 12 deletions
diff --git a/nslcd/group.c b/nslcd/group.c index 1ae5ad1..3c1747a 100644 --- a/nslcd/group.c +++ b/nslcd/group.c @@ -181,7 +181,7 @@ static char *user2dn(const char *user) char filter[1024]; LDAPMessage *res, *e; mkfilter_passwd_byname(user,filter,sizeof(filter)); - if (_nss_ldap_search_locked(group_base,group_scope,filter,no_attrs,1,&res)==NSS_STATUS_SUCCESS) + if (_nss_ldap_search_sync_locked(group_base,group_scope,filter,no_attrs,1,&res)==NSS_STATUS_SUCCESS) { e=_nss_ldap_first_entry(res); if (e!=NULL) @@ -710,7 +710,7 @@ do_parse_group_members (LDAPMessage * e, res = NULL; } - stat = _nss_ldap_read (groupdn, uniquemember_attrs, &res); + stat=_nss_ldap_read_sync(groupdn,uniquemember_attrs,&res); if (stat != NSS_STATUS_SUCCESS) goto out; diff --git a/nslcd/ldap-nss.c b/nslcd/ldap-nss.c index 9a43854..96cc534 100644 --- a/nslcd/ldap-nss.c +++ b/nslcd/ldap-nss.c @@ -1575,8 +1575,9 @@ do_parse_s (struct ent_context *context, void *result, char * such as the RFC2307bis group expansion function. */ enum nss_status -_nss_ldap_read (const char *dn, const char **attributes, LDAPMessage ** res) +_nss_ldap_read_sync (const char *dn, const char **attributes, LDAPMessage ** res) { + /* synchronous search */ return do_with_reconnect (dn, LDAP_SCOPE_BASE, "(objectclass=*)", attributes, 1 /* sizelimit */, res, NULL); @@ -1656,7 +1657,7 @@ _nss_ldap_next_attribute (LDAPMessage * entry, BerElement * ber) * The generic synchronous lookup cover function. * Assumes caller holds lock. */ -enum nss_status _nss_ldap_search_locked( +enum nss_status _nss_ldap_search_sync_locked( const char *base,int scope,const char *filter, const char **attrs,int sizelimit,LDAPMessage **res) { @@ -1668,6 +1669,7 @@ enum nss_status _nss_ldap_search_locked( log_log(LOG_DEBUG,"<== _nss_ldap_search_locked"); return stat; } + /* synchronous search */ stat=do_with_reconnect( base,scope,filter,attrs, sizelimit,res,NULL); @@ -1679,7 +1681,7 @@ enum nss_status _nss_ldap_search_locked( * Assumes caller holds lock. */ static enum nss_status -_nss_ldap_search(const char *base,int scope,const char *filter,const char **attrs, +_nss_ldap_search_async_locked(const char *base,int scope,const char *filter,const char **attrs, int sizelimit, int *msgid) { enum nss_status stat; @@ -1692,7 +1694,7 @@ _nss_ldap_search(const char *base,int scope,const char *filter,const char **attr log_log(LOG_DEBUG,"<== _nss_ldap_search"); return stat; } - /* perform the search */ + /* asynchronous search */ stat=do_with_reconnect(base,scope,filter,attrs, sizelimit,NULL,msgid); log_log(LOG_DEBUG,"<== _nss_ldap_search"); @@ -1778,7 +1780,7 @@ _nss_ldap_getent_locked(struct ent_context *context, if (context->ec_msgid<0) { /* set up a new search */ - stat=_nss_ldap_search(base,scope,filter,attrs,LDAP_NO_LIMIT,&msgid); + stat=_nss_ldap_search_async_locked(base,scope,filter,attrs,LDAP_NO_LIMIT,&msgid); if (stat != NSS_STATUS_SUCCESS) { log_log(LOG_DEBUG,"<== _nss_ldap_getent_locked"); @@ -1828,7 +1830,7 @@ int _nss_ldap_getbyname(void *result, char *buffer, size_t buflen,int *errnop, _nss_ldap_ent_context_init_locked(&context); - stat=_nss_ldap_search_locked(base,scope,filter,attrs,1,&context.ec_res); + stat=_nss_ldap_search_sync_locked(base,scope,filter,attrs,1,&context.ec_res); if (stat!=NSS_STATUS_SUCCESS) { _nss_ldap_leave (); @@ -1916,7 +1918,7 @@ int _nss_ldap_searchbyname( _nss_ldap_ent_context_init_locked(&context); - stat=nss2nslcd(_nss_ldap_search_locked(base,scope,filter,attrs,1,&context.ec_res)); + stat=nss2nslcd(_nss_ldap_search_sync_locked(base,scope,filter,attrs,1,&context.ec_res)); /* write the result code */ WRITE_INT32(fp,stat); /* bail on nothing found */ diff --git a/nslcd/ldap-nss.h b/nslcd/ldap-nss.h index 2b0bd9b..644be45 100644 --- a/nslcd/ldap-nss.h +++ b/nslcd/ldap-nss.h @@ -175,7 +175,7 @@ char *_nss_ldap_next_attribute (LDAPMessage * entry, BerElement *ber); /* * Synchronous search cover (caller acquires lock). */ -enum nss_status _nss_ldap_search_locked( +enum nss_status _nss_ldap_search_sync_locked( const char *base,int scope,const char *filter, const char **attrs,int sizelimit,LDAPMessage **res); @@ -188,7 +188,7 @@ int _nss_ldap_write_attrvals(TFILE *fp,LDAPMessage *e,const char *attr); /* * Emulate X.500 read operation. */ -enum nss_status _nss_ldap_read (const char *dn, /* IN */ +enum nss_status _nss_ldap_read_sync (const char *dn, /* IN */ const char **attributes, /* IN */ LDAPMessage ** res /* OUT */ ); diff --git a/nslcd/util.c b/nslcd/util.c index 3ff4f45..ce26634 100644 --- a/nslcd/util.c +++ b/nslcd/util.c @@ -304,7 +304,7 @@ enum nss_status _nss_ldap_dn2uid(const char *dn,char **uid,char **buffer, attrs[2] = "objectClass"; attrs[3] = NULL; - if (_nss_ldap_read (dn, attrs, &res) == NSS_STATUS_SUCCESS) + if (_nss_ldap_read_sync(dn, attrs, &res)==NSS_STATUS_SUCCESS) { LDAPMessage *e = _nss_ldap_first_entry (res); if (e != NULL) |