diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2011-08-03 21:54:53 +0200 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2011-08-03 21:54:53 +0200 |
| commit | d76bfc4731e425096679ce248f559de14f75a6bd (patch) | |
| tree | b50b2f08e87bdb4aabd2c3ebc8ac48b0634fb42f /nslcd/group.c | |
| parent | c85da1930153a849f48b3dca0236610d528f730c (diff) | |
switch to using the member attribute by default instead of uniqueMember
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1484 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nslcd/group.c')
| -rw-r--r-- | nslcd/group.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nslcd/group.c b/nslcd/group.c index dc45eed..ce3c5c4 100644 --- a/nslcd/group.c +++ b/nslcd/group.c @@ -44,7 +44,7 @@ * MUST ( cn $ gidNumber ) * MAY ( userPassword $ memberUid $ description ) ) * - * apart from the above a uniqueMember attribute is also supported that + * apart from the above a member attribute is also supported that * may contains a DN of a user * * nested groups (groups that are member of a group) are currently @@ -65,7 +65,7 @@ const char *attmap_group_cn = "cn"; const char *attmap_group_userPassword = "\"*\""; const char *attmap_group_gidNumber = "gidNumber"; const char *attmap_group_memberUid = "memberUid"; -const char *attmap_group_uniqueMember = "uniqueMember"; +const char *attmap_group_member = "member"; /* special property for objectSid-based searches (these are already LDAP-escaped strings) */ @@ -142,7 +142,7 @@ static int mkfilter_group_bymember(MYLDAP_SESSION *session, "(&%s(|(%s=%s)(%s=%s)))", group_filter, attmap_group_memberUid,safeuid, - attmap_group_uniqueMember,safedn); + attmap_group_member,safedn); } void group_init(void) @@ -168,7 +168,7 @@ void group_init(void) attmap_add_attributes(set,attmap_group_userPassword); attmap_add_attributes(set,attmap_group_memberUid); attmap_add_attributes(set,attmap_group_gidNumber); - attmap_add_attributes(set,attmap_group_uniqueMember); + attmap_add_attributes(set,attmap_group_member); group_attrs=set_tolist(set); set_free(set); } @@ -221,8 +221,8 @@ static const char **getmembers(MYLDAP_ENTRY *entry,MYLDAP_SESSION *session) if (isvalidname(values[i])) set_add(set,values[i]); } - /* add the uniqueMember values */ - values=myldap_get_values(entry,attmap_group_uniqueMember); + /* add the member values */ + values=myldap_get_values(entry,attmap_group_member); if (values!=NULL) for (i=0;values[i]!=NULL;i++) { @@ -294,7 +294,7 @@ static int write_group(TFILE *fp,MYLDAP_ENTRY *entry,const char *reqname, passwd=get_userpassword(entry,attmap_group_userPassword,passbuffer,sizeof(passbuffer)); if (passwd==NULL) passwd=default_group_userPassword; - /* get group memebers (memberUid&uniqueMember) */ + /* get group memebers (memberUid&member) */ if (wantmembers) members=getmembers(entry,session); else |