diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2007-09-07 11:28:20 +0200 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2007-09-07 11:28:20 +0200 |
| commit | 916f4afca2d7a655e7179f350d09362a18661bb5 (patch) | |
| tree | 510208d208f613d8489d98872106773d81aac046 /nslcd/ether.c | |
| parent | f32b9a15950fd37aed5dae2ccf0a1e60a0fc78ee (diff) | |
rename attlst stuff to attrs since that is the name of the parameter that is passed
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@376 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nslcd/ether.c')
| -rw-r--r-- | nslcd/ether.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/nslcd/ether.c b/nslcd/ether.c index 8b0083a..9898880 100644 --- a/nslcd/ether.c +++ b/nslcd/ether.c @@ -74,7 +74,7 @@ struct ether }; /* the attributes to request with searches */ -static const char *ether_attlst[3]; +static const char *ether_attrs[3]; /* create a search filter for searching an ethernet address by name, return -1 on errors */ @@ -117,11 +117,11 @@ static int mkfilter_ether_all(char *buffer,size_t buflen) attmap_objectClass,attmap_ether_objectClass); } -static void ether_attlst_init(void) +static void ether_attrs_init(void) { - ether_attlst[0]=attmap_ether_cn; - ether_attlst[1]=attmap_ether_macAddress; - ether_attlst[2]=NULL; + ether_attrs[0]=attmap_ether_cn; + ether_attrs[1]=attmap_ether_macAddress; + ether_attrs[2]=NULL; } static enum nss_status @@ -175,9 +175,9 @@ int nslcd_ether_byname(TFILE *fp) WRITE_INT32(fp,NSLCD_ACTION_ETHER_BYNAME); /* do the LDAP request */ mkfilter_ether_byname(name,filter,sizeof(filter)); - ether_attlst_init(); + ether_attrs_init(); retv=_nss_ldap_getbyname(&result,buffer,1024,&errnop,LM_ETHERS, - NULL,filter,ether_attlst,_nss_ldap_parse_ether); + NULL,filter,ether_attrs,_nss_ldap_parse_ether); /* write the response */ WRITE_INT32(fp,retv); if (retv==NSLCD_RESULT_SUCCESS) @@ -208,9 +208,9 @@ int nslcd_ether_byether(TFILE *fp) WRITE_INT32(fp,NSLCD_ACTION_ETHER_BYETHER); /* do the LDAP request */ mkfilter_ether_byether(&addr,filter,sizeof(filter)); - ether_attlst_init(); + ether_attrs_init(); retv=_nss_ldap_getbyname(&result,buffer,1024,&errnop,LM_ETHERS, - NULL,filter,ether_attlst,_nss_ldap_parse_ether); + NULL,filter,ether_attrs,_nss_ldap_parse_ether); /* write the response */ WRITE_INT32(fp,retv); if (retv==NSLCD_RESULT_SUCCESS) @@ -240,8 +240,8 @@ int nslcd_ether_all(TFILE *fp) if (_nss_ldap_ent_context_init(ðer_context)==NULL) return -1; /* loop over all results */ - ether_attlst_init(); - while ((retv=nss2nslcd(_nss_ldap_getent(ðer_context,&result,buffer,1024,&errnop,_nss_ldap_filt_getetherent,LM_ETHERS,ether_attlst,_nss_ldap_parse_ether)))==NSLCD_RESULT_SUCCESS) + ether_attrs_init(); + while ((retv=nss2nslcd(_nss_ldap_getent(ðer_context,&result,buffer,1024,&errnop,_nss_ldap_filt_getetherent,LM_ETHERS,ether_attrs,_nss_ldap_parse_ether)))==NSLCD_RESULT_SUCCESS) { /* write the result */ WRITE_INT32(fp,retv); |