diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2007-09-08 17:19:07 +0200 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2007-09-08 17:19:07 +0200 |
| commit | 4b539318232ffc077eaa882963b9788d686610cb (patch) | |
| tree | ee200bf041a84ff883270309064e6284d6f421be /nslcd/ldap-nss.c | |
| parent | 30423d96ecd243663906a3a1c13f1f0e90ac6330 (diff) | |
move filters definitions to the database modules themselves (and already define base and scope but don't use them yet)
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@383 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nslcd/ldap-nss.c')
| -rw-r--r-- | nslcd/ldap-nss.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/nslcd/ldap-nss.c b/nslcd/ldap-nss.c index b9b05ec..e28cd23 100644 --- a/nslcd/ldap-nss.c +++ b/nslcd/ldap-nss.c @@ -1818,7 +1818,6 @@ enum nss_status _nss_ldap_search_s( { /* get search descriptor */ sd=nslcd_cfg->ldc_sds[sel]; -next: if (sd!=NULL) { if (sd->lsd_base!=NULL) @@ -1833,17 +1832,6 @@ next: base,scope,filter,attrs, sizelimit,res,(search_func_t)do_search_s); - /* If no entry was returned, try the next search descriptor. */ - if (sd != NULL && sd->lsd_next != NULL) - { - if (stat==NSS_STATUS_NOTFOUND || - (stat==NSS_STATUS_SUCCESS && - ldap_first_entry(__session.ls_conn,*res)==NULL)) - { - sd=sd->lsd_next; - goto next; - } - } return stat; } @@ -1879,11 +1867,7 @@ _nss_ldap_search (const char *base,const char *filter,const char **attrs, * just quit with NSS_STATUS_NOTFOUND. */ if (*csd != NULL) - { - sd = (*csd)->lsd_next; - if (sd == NULL) - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; else sd = nslcd_cfg->ldc_sds[sel]; *csd = sd; |