diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2007-09-03 23:47:36 +0200 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2007-09-03 23:47:36 +0200 |
| commit | d8026047e2b35abda4c8ef3ba747a0c037d5446d (patch) | |
| tree | 31d9fdd840897e0dbb499ba75803ef7664c2ac52 /nslcd/group.c | |
| parent | 7b7d982ac09aad6d12ef57447aa46d17637039b0 (diff) | |
include service name in attlst storage and functions
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@373 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nslcd/group.c')
| -rw-r--r-- | nslcd/group.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/nslcd/group.c b/nslcd/group.c index c61940b..7a93dd8 100644 --- a/nslcd/group.c +++ b/nslcd/group.c @@ -113,16 +113,16 @@ static enum nss_status ng_chase (const char *dn, ldap_initgroups_args_t * lia); static enum nss_status ng_chase_backlink (const char ** membersOf, ldap_initgroups_args_t * lia); /* the attributes to request with searches */ -static const char *attlst[6]; +static const char *group_attlst[6]; -static void attlst_init(void) +static void group_attlst_init(void) { - attlst[0] = attmap_group_cn; - attlst[1] = attmap_group_userPassword; - attlst[2] = attmap_group_memberUid; - attlst[3] = attmap_group_uniqueMember; - attlst[4] = attmap_group_gidNumber; - attlst[5] = NULL; + group_attlst[0]=attmap_group_cn; + group_attlst[1]=attmap_group_userPassword; + group_attlst[2]=attmap_group_memberUid; + group_attlst[3]=attmap_group_uniqueMember; + group_attlst[4]=attmap_group_gidNumber; + group_attlst[5]=NULL; } /* @@ -1157,8 +1157,8 @@ int nslcd_group_byname(TFILE *fp) LA_INIT(a); LA_STRING(a)=name; LA_TYPE(a)=LA_TYPE_STRING; - attlst_init(); - retv=nss2nslcd(_nss_ldap_getbyname(&a,&result,buffer,1024,&errnop,_nss_ldap_filt_getgrnam,LM_GROUP,attlst,_nss_ldap_parse_gr)); + group_attlst_init(); + retv=nss2nslcd(_nss_ldap_getbyname(&a,&result,buffer,1024,&errnop,_nss_ldap_filt_getgrnam,LM_GROUP,group_attlst,_nss_ldap_parse_gr)); /* write the response */ WRITE_INT32(fp,NSLCD_VERSION); WRITE_INT32(fp,NSLCD_ACTION_GROUP_BYNAME); @@ -1196,8 +1196,8 @@ int nslcd_group_bygid(TFILE *fp) LA_INIT(a); LA_NUMBER(a)=gid; LA_TYPE(a)=LA_TYPE_NUMBER; - attlst_init(); - retv=nss2nslcd(_nss_ldap_getbyname(&a,&result,buffer,1024,&errnop,_nss_ldap_filt_getgrgid,LM_GROUP,attlst,_nss_ldap_parse_gr)); + group_attlst_init(); + retv=nss2nslcd(_nss_ldap_getbyname(&a,&result,buffer,1024,&errnop,_nss_ldap_filt_getgrgid,LM_GROUP,group_attlst,_nss_ldap_parse_gr)); /* write the response */ WRITE_INT32(fp,NSLCD_VERSION); WRITE_INT32(fp,NSLCD_ACTION_GROUP_BYGID); @@ -1285,8 +1285,8 @@ int nslcd_group_all(TFILE *fp) if (_nss_ldap_ent_context_init(&gr_context)==NULL) return -1; /* loop over all results */ - attlst_init(); - while ((retv=nss2nslcd(_nss_ldap_getent(&gr_context,&result,buffer,1024,&errnop,_nss_ldap_filt_getgrent,LM_GROUP,attlst,_nss_ldap_parse_gr)))==NSLCD_RESULT_SUCCESS) + group_attlst_init(); + while ((retv=nss2nslcd(_nss_ldap_getent(&gr_context,&result,buffer,1024,&errnop,_nss_ldap_filt_getgrent,LM_GROUP,group_attlst,_nss_ldap_parse_gr)))==NSLCD_RESULT_SUCCESS) { /* write the result */ WRITE_INT32(fp,retv); |