http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95913
Revision: 95913
Author: laner
Date: 2011-08-31 22:42:37 +0000 (Wed, 31 Aug 2011)
Log Message:
-----------
Changing group objectclasses and attributes, since we are switching them for
SVN and Labs LDAP
Modified Paths:
--------------
trunk/tools/subversion/user-management/add-ldap-group
trunk/tools/subversion/user-management/modify-ldap-group
Modified: trunk/tools/subversion/user-management/add-ldap-group
===================================================================
--- trunk/tools/subversion/user-management/add-ldap-group 2011-08-31
22:09:42 UTC (rev 95912)
+++ trunk/tools/subversion/user-management/add-ldap-group 2011-08-31
22:42:37 UTC (rev 95913)
@@ -36,7 +36,7 @@
dn = 'cn=' + groupname + ',ou=group,' + base
cn = groupname
- objectClasses = ['posixGroup', 'groupOfUniqueNames', 'top']
+ objectClasses = ['posixGroup', 'groupOfNames', 'top']
if options.gidNumber:
try:
groupcheck = grp.getgrgid(options.gidNumber)
@@ -64,7 +64,7 @@
# TODO: make this use LDAP calls
instead of getent
checkuid = pwd.getpwnam(raw_member)
- # uniqueMember expects DNs
+ # member expects DNs
members.append('uid=' + raw_member +
',ou=people,' + base)
except KeyError:
sys.stderr.write(raw_member + " doesn't
exist, and won't be added to the group.\n")
@@ -74,7 +74,7 @@
groupEntry['gidNumber'] = gidNumber
groupEntry['cn'] = cn
if members:
- groupEntry['uniqueMember'] = members
+ groupEntry['member'] = members
modlist = ldap.modlist.addModlist(groupEntry)
ds.add_s(dn, modlist)
Modified: trunk/tools/subversion/user-management/modify-ldap-group
===================================================================
--- trunk/tools/subversion/user-management/modify-ldap-group 2011-08-31
22:09:42 UTC (rev 95912)
+++ trunk/tools/subversion/user-management/modify-ldap-group 2011-08-31
22:42:37 UTC (rev 95913)
@@ -67,23 +67,23 @@
checkuid =
pwd.getpwnam(raw_member)
membertoadd = 'uid=' +
raw_member + ',ou=people,' + base
- # uniqueMember expects DNs
- if 'uniqueMember' in
NewPosixData.keys():
- if membertoadd in
NewPosixData['uniqueMember']:
+ # member expects DNs
+ if 'member' in
NewPosixData.keys():
+ if membertoadd in
NewPosixData['member']:
sys.stderr.write(raw_member + " is already a member of the group, skipping.\n")
else:
-
NewPosixData['uniqueMember'].append(membertoadd)
+
NewPosixData['member'].append(membertoadd)
else:
-
NewPosixData['uniqueMember'] = [ membertoadd ]
+ NewPosixData['member']
= [ membertoadd ]
except KeyError:
sys.stderr.write(raw_member + "
doesn't exist, and won't be added to the group.\n")
elif options.deleteMembers:
raw_members = options.deleteMembers.split(',')
for raw_member in raw_members:
membertoremove = 'uid=' + raw_member +
',ou=people,' + base
- if 'uniqueMember' in
NewPosixData.keys():
- if membertoremove in
NewPosixData['uniqueMember']:
-
NewPosixData['uniqueMember'].remove(membertoremove)
+ if 'member' in NewPosixData.keys():
+ if membertoremove in
NewPosixData['member']:
+
NewPosixData['member'].remove(membertoremove)
else:
sys.stderr.write(raw_member + " isn't a member of the group, skipping.\n")
else:
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
