From 7ded202fd6128c9e4586a63df1bf8a36c8835f11 Mon Sep 17 00:00:00 2001 From: Arthur de Jong Date: Fri, 7 Sep 2007 11:10:45 +0000 Subject: also pass search filter for the *_all() functions from the database module instead of doing it in ldap-nss.c git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@377 ef36b2f9-881f-0410-afb5-c4e39611909c --- nslcd/service.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'nslcd/service.c') diff --git a/nslcd/service.c b/nslcd/service.c index d794ba4..cbfab55 100644 --- a/nslcd/service.c +++ b/nslcd/service.c @@ -325,7 +325,8 @@ int nslcd_service_bynumber(TFILE *fp) int nslcd_service_all(TFILE *fp) { int32_t tmpint32; - static struct ent_context *serv_context; + struct ent_context *serv_context; + char filter[1024]; /* these are here for now until we rewrite the LDAP code */ struct servent result; char buffer[1024]; @@ -340,8 +341,10 @@ int nslcd_service_all(TFILE *fp) if (_nss_ldap_ent_context_init(&serv_context)==NULL) return -1; /* loop over all results */ + mkfilter_service_all(filter,sizeof(filter)); service_attrs_init(); - while ((retv=nss2nslcd(_nss_ldap_getent(&serv_context,&result,buffer,1024,&errnop,_nss_ldap_filt_getservent,LM_SERVICES,service_attrs,_nss_ldap_parse_serv)))==NSLCD_RESULT_SUCCESS) + while ((retv=_nss_ldap_getent(&serv_context,&result,buffer,sizeof(buffer),&errnop, + NULL,filter,service_attrs,LM_SERVICES,_nss_ldap_parse_serv))==NSLCD_RESULT_SUCCESS) { /* write the result code */ WRITE_INT32(fp,retv); -- cgit v1.2.3