summaryrefslogtreecommitdiff
path: root/nslcd/protocol.c
diff options
context:
space:
mode:
authorArthur de Jong <arthur@arthurdejong.org>2007-09-07 11:10:45 +0000
committerArthur de Jong <arthur@arthurdejong.org>2007-09-07 11:10:45 +0000
commit7ded202fd6128c9e4586a63df1bf8a36c8835f11 (patch)
tree4f5160caeb214648aa4cb5b23691dce0127762d9 /nslcd/protocol.c
parent916f4afca2d7a655e7179f350d09362a18661bb5 (diff)
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
Diffstat (limited to 'nslcd/protocol.c')
-rw-r--r--nslcd/protocol.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/nslcd/protocol.c b/nslcd/protocol.c
index d502a08..278241f 100644
--- a/nslcd/protocol.c
+++ b/nslcd/protocol.c
@@ -208,7 +208,8 @@ int nslcd_protocol_bynumber(TFILE *fp)
int nslcd_protocol_all(TFILE *fp)
{
int32_t tmpint32,tmp2int32,tmp3int32;
- static struct ent_context *protocol_context;
+ struct ent_context *protocol_context;
+ char filter[1024];
/* these are here for now until we rewrite the LDAP code */
struct protoent result;
char buffer[1024];
@@ -223,8 +224,10 @@ int nslcd_protocol_all(TFILE *fp)
if (_nss_ldap_ent_context_init(&protocol_context)==NULL)
return -1;
/* loop over all results */
+ mkfilter_protocol_all(filter,sizeof(filter));
protocol_attrs_init();
- while ((retv=nss2nslcd(_nss_ldap_getent(&protocol_context,&result,buffer,1024,&errnop,_nss_ldap_filt_getprotoent,LM_PROTOCOLS,protocol_attrs,_nss_ldap_parse_proto)))==NSLCD_RESULT_SUCCESS)
+ while ((retv=_nss_ldap_getent(&protocol_context,&result,buffer,sizeof(buffer),&errnop,
+ NULL,filter,protocol_attrs,LM_PROTOCOLS,_nss_ldap_parse_proto))==NSLCD_RESULT_SUCCESS)
{
/* write the result code */
WRITE_INT32(fp,retv);