r96140 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r96139‎ | r96140 | r96141 >
Date:18:45, 2 September 2011
Author:laner
Status:deferred
Tags:
Comment:
Change group ou location, since we've changed this in the cluster. TThese scripts really need to be updated to use a config file for this stuff.
Modified paths:
  • /trunk/tools/subversion/user-management/add-ldap-group (modified) (history)
  • /trunk/tools/subversion/user-management/ldaplist (modified) (history)
  • /trunk/tools/subversion/user-management/modify-ldap-group (modified) (history)

Diff [purge]

Index: trunk/tools/subversion/user-management/modify-ldap-group
@@ -38,7 +38,7 @@
3939 # w00t We're in!
4040 try:
4141 groupname = args[0]
42 - PosixData = ds.search_s("ou=group," + base,ldap.SCOPE_SUBTREE,"(&(objectclass=posixGroup)(cn=" + groupname + "))")
 42+ PosixData = ds.search_s("ou=groups," + base,ldap.SCOPE_SUBTREE,"(&(objectclass=posixGroup)(cn=" + groupname + "))")
4343 if not PosixData:
4444 raise ldap.NO_SUCH_OBJECT()
4545 dn = PosixData[0][0]
Index: trunk/tools/subversion/user-management/add-ldap-group
@@ -34,7 +34,7 @@
3535 try:
3636 groupname = args[0]
3737
38 - dn = 'cn=' + groupname + ',ou=group,' + base
 38+ dn = 'cn=' + groupname + ',ou=groups,' + base
3939 cn = groupname
4040 objectClasses = ['posixGroup', 'groupOfNames', 'top']
4141 if options.gidNumber:
Index: trunk/tools/subversion/user-management/ldaplist
@@ -30,7 +30,7 @@
3131
3232 base = ldapSupportLib.getBase()
3333
34 - objectbasedns = {"base":base, "passwd":"ou=people,"+base, "group":"ou=group,"+base, "netgroup":"ou=netgroup,"+base, "hosts":"ou=hosts,"+base, "automount":base, "auto_*":"nisMapName=auto_AUTO,"+base, "uids":"ou=uids,"+base}
 34+ objectbasedns = {"base":base, "passwd":"ou=people,"+base, "group":"ou=groups,"+base, "netgroup":"ou=netgroup,"+base, "hosts":"ou=hosts,"+base, "automount":base, "auto_*":"nisMapName=auto_AUTO,"+base, "uids":"ou=uids,"+base}
3535 objectdefaulttypes = {"base":"none", "passwd":"uid", "group":"cn", "netgroup":"cn", "hosts":"cn", "automount":"nisMapName", "auto_*":"cn", "uids":"cn"}
3636 objectobjectclasses = {"base":"none", "passwd":"posixaccount", "group":"posixgroup", "netgroup":"nisNetGroup", "hosts":"iphost", "automount":"nisMap", "auto_*":"nisObject", "uids":"inetOrgPerson"}
3737

Status & tagging log