diff options
Diffstat (limited to 'nslcd/rpc.c')
-rw-r--r-- | nslcd/rpc.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/nslcd/rpc.c b/nslcd/rpc.c index b91040e..de25b5a 100644 --- a/nslcd/rpc.c +++ b/nslcd/rpc.c @@ -68,7 +68,7 @@ #define RPC_NUMBER result->r_number /* the attributes to request with searches */ -static const char *rpc_attlst[3]; +static const char *rpc_attrs[3]; static int mkfilter_rpc_byname(const char *name, char *buffer,size_t buflen) @@ -101,11 +101,11 @@ static int mkfilter_rpc_all(char *buffer,size_t buflen) attmap_objectClass,attmap_rpc_objectClass); } -static void rpc_attlst_init(void) +static void rpc_attrs_init(void) { - rpc_attlst[0]=attmap_rpc_cn; - rpc_attlst[1]=attmap_rpc_oncRpcNumber; - rpc_attlst[2]=NULL; + rpc_attrs[0]=attmap_rpc_cn; + rpc_attrs[1]=attmap_rpc_oncRpcNumber; + rpc_attrs[2]=NULL; } /* write a single rpc entry to the stream */ @@ -167,9 +167,9 @@ int nslcd_rpc_byname(TFILE *fp) WRITE_INT32(fp,NSLCD_ACTION_RPC_BYNAME); /* do the LDAP request */ mkfilter_rpc_byname(name,filter,sizeof(filter)); - rpc_attlst_init(); + rpc_attrs_init(); retv=_nss_ldap_getbyname(&result,buffer,1024,&errnop,LM_RPC, - NULL,filter,rpc_attlst,_nss_ldap_parse_rpc); + NULL,filter,rpc_attrs,_nss_ldap_parse_rpc); /* write the response */ WRITE_INT32(fp,retv); if (retv==NSLCD_RESULT_SUCCESS) @@ -198,9 +198,9 @@ int nslcd_rpc_bynumber(TFILE *fp) WRITE_INT32(fp,NSLCD_ACTION_RPC_BYNUMBER); /* do the LDAP request */ mkfilter_rpc_bynumber(number,filter,sizeof(filter)); - rpc_attlst_init(); + rpc_attrs_init(); retv=_nss_ldap_getbyname(&result,buffer,1024,&errnop,LM_RPC, - NULL,filter,rpc_attlst,_nss_ldap_parse_rpc); + NULL,filter,rpc_attrs,_nss_ldap_parse_rpc); /* write the response */ WRITE_INT32(fp,retv); if (retv==NSLCD_RESULT_SUCCESS) @@ -228,8 +228,8 @@ int nslcd_rpc_all(TFILE *fp) if (_nss_ldap_ent_context_init(&rpc_context)==NULL) return -1; /* loop over all results */ - rpc_attlst_init(); - while ((retv=nss2nslcd(_nss_ldap_getent(&rpc_context,&result,buffer,1024,&errnop,_nss_ldap_filt_getrpcent,LM_RPC,rpc_attlst,_nss_ldap_parse_rpc)))==NSLCD_RESULT_SUCCESS) + rpc_attrs_init(); + while ((retv=nss2nslcd(_nss_ldap_getent(&rpc_context,&result,buffer,1024,&errnop,_nss_ldap_filt_getrpcent,LM_RPC,rpc_attrs,_nss_ldap_parse_rpc)))==NSLCD_RESULT_SUCCESS) { /* write the result code */ WRITE_INT32(fp,retv); |