diff options
Diffstat (limited to 'nslcd/alias.c')
-rw-r--r-- | nslcd/alias.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/nslcd/alias.c b/nslcd/alias.c index a1bb482..28c5f03 100644 --- a/nslcd/alias.c +++ b/nslcd/alias.c @@ -141,7 +141,7 @@ int nslcd_alias_byname(TFILE *fp) int nslcd_alias_all(TFILE *fp) { int32_t tmpint32,tmp2int32; - struct ent_context *alias_context=NULL; + struct ent_context context; char filter[1024]; /* these are here for now until we rewrite the LDAP code */ struct aliasent result; @@ -154,12 +154,11 @@ int nslcd_alias_all(TFILE *fp) WRITE_INT32(fp,NSLCD_VERSION); WRITE_INT32(fp,NSLCD_ACTION_ALIAS_ALL); /* initialize context */ - if (_nss_ldap_ent_context_init(&alias_context)==NULL) - return -1; + _nss_ldap_ent_context_init(&context); /* loop over all results */ mkfilter_alias_all(filter,sizeof(filter)); alias_attrs_init(); - while ((retv=_nss_ldap_getent(&alias_context,&result,buffer,sizeof(buffer),&errnop, + while ((retv=_nss_ldap_getent(&context,&result,buffer,sizeof(buffer),&errnop, NULL,filter,alias_attrs,LM_ALIASES,_nss_ldap_parse_alias))==NSLCD_RESULT_SUCCESS) { /* write the result */ @@ -171,7 +170,7 @@ int nslcd_alias_all(TFILE *fp) WRITE_FLUSH(fp); /* FIXME: if a previous call returns what happens to the context? */ _nss_ldap_enter(); - _nss_ldap_ent_context_release(alias_context); + _nss_ldap_ent_context_cleanup(&context); _nss_ldap_leave(); /* we're done */ return 0; |