diff options
author | Arthur de Jong <arthur@arthurdejong.org> | 2007-09-07 09:28:20 +0000 |
---|---|---|
committer | Arthur de Jong <arthur@arthurdejong.org> | 2007-09-07 09:28:20 +0000 |
commit | 916f4afca2d7a655e7179f350d09362a18661bb5 (patch) | |
tree | 510208d208f613d8489d98872106773d81aac046 /nslcd/alias.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/alias.c')
-rw-r--r-- | nslcd/alias.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/nslcd/alias.c b/nslcd/alias.c index eec46ba..b3a6c0d 100644 --- a/nslcd/alias.c +++ b/nslcd/alias.c @@ -46,7 +46,7 @@ #include "ldap-schema.h" /* the attributes to request with searches */ -static const char *alias_attlst[3]; +static const char *alias_attrs[3]; /* create a search filter for searching an alias by name, return -1 on errors */ @@ -74,11 +74,11 @@ static int mkfilter_alias_all(char *buffer,size_t buflen) attmap_objectClass,attmap_alias_objectClass); } -static void alias_attlst_init(void) +static void alias_attrs_init(void) { - alias_attlst[0]=attmap_alias_cn; - alias_attlst[1]=attmap_alias_rfc822MailMember; - alias_attlst[2]=NULL; + alias_attrs[0]=attmap_alias_cn; + alias_attrs[1]=attmap_alias_rfc822MailMember; + alias_attrs[2]=NULL; } static enum nss_status _nss_ldap_parse_alias( @@ -132,8 +132,8 @@ int nslcd_alias_byname(TFILE *fp) WRITE_INT32(fp,NSLCD_ACTION_ALIAS_BYNAME); /* do the LDAP request */ mkfilter_alias_byname(name,filter,sizeof(filter)); - alias_attlst_init(); - _nss_ldap_searchbyname(NULL,filter,LM_ALIASES,alias_attlst,fp,write_alias); + alias_attrs_init(); + _nss_ldap_searchbyname(NULL,filter,LM_ALIASES,alias_attrs,fp,write_alias); WRITE_FLUSH(fp); /* we're done */ return 0; @@ -157,8 +157,8 @@ int nslcd_alias_all(TFILE *fp) if (_nss_ldap_ent_context_init(&alias_context)==NULL) return -1; /* loop over all results */ - alias_attlst_init(); - while ((retv=nss2nslcd(_nss_ldap_getent(&alias_context,&result,buffer,1024,&errnop,_nss_ldap_filt_getaliasent,LM_ALIASES,alias_attlst,_nss_ldap_parse_alias)))==NSLCD_RESULT_SUCCESS) + alias_attrs_init(); + while ((retv=nss2nslcd(_nss_ldap_getent(&alias_context,&result,buffer,1024,&errnop,_nss_ldap_filt_getaliasent,LM_ALIASES,alias_attrs,_nss_ldap_parse_alias)))==NSLCD_RESULT_SUCCESS) { /* write the result */ WRITE_INT32(fp,retv); |