summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/scripting/python/samba/netcmd/group.py6
-rw-r--r--source4/scripting/python/samba/samdb.py117
2 files changed, 63 insertions, 60 deletions
diff --git a/source4/scripting/python/samba/netcmd/group.py b/source4/scripting/python/samba/netcmd/group.py
index 3d85a17390..41506bb205 100644
--- a/source4/scripting/python/samba/netcmd/group.py
+++ b/source4/scripting/python/samba/netcmd/group.py
@@ -70,7 +70,7 @@ class cmd_group_add(Command):
versionopts=None, H=None, groupou=None, group_scope=None,
group_type=None, description=None, mail_address=None, notes=None):
- if cmp((group_type or "Security"), "Security") == 0:
+ if (group_type or "Security") == "Security":
gtype = security_group.get(group_scope, GTYPE_SECURITY_GLOBAL_GROUP)
else:
gtype = distribution_group.get(group_scope, GTYPE_DISTRIBUTION_GLOBAL_GROUP)
@@ -87,6 +87,7 @@ class cmd_group_add(Command):
raise CommandError('Failed to create group "%s" : %s' % (
groupname, msg))
+
class cmd_group_delete(Command):
"""Delete a group"""
@@ -117,6 +118,7 @@ class cmd_group_delete(Command):
raise CommandError('Failed to remove group "%s": %s' % (
groupname , msg))
+
class cmd_group_add_members(Command):
"""Add (comma-separated list of) group members"""
@@ -148,6 +150,7 @@ class cmd_group_add_members(Command):
raise CommandError('Failed to add members "%s" to group "%s": %s' % (
listofmembers, groupname , msg))
+
class cmd_group_remove_members(Command):
"""Remove (comma-separated list of) group members"""
@@ -179,6 +182,7 @@ class cmd_group_remove_members(Command):
raise CommandError('Failed to remove members "%s" from group "%s": %s' % (
listofmembers, groupname , msg))
+
class cmd_group(SuperCommand):
"""Group management"""
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index 1ae4bb0eda..3e29f04ed3 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -123,30 +123,29 @@ pwdLastSet: 0
:param notes: Notes of the new group
"""
- self.transaction_start()
- try:
- group_dn = "CN=%s,%s,%s" % (groupname, (groupou or "CN=Users"), self.domain_dn())
+ group_dn = "CN=%s,%s,%s" % (groupname, (groupou or "CN=Users"), self.domain_dn())
- # The new user record. Note the reliance on the SAMLDB module which
- # fills in the default informations
- ldbmessage = {"dn": group_dn,
- "sAMAccountName": groupname,
- "objectClass": "group"}
+ # The new user record. Note the reliance on the SAMLDB module which
+ # fills in the default informations
+ ldbmessage = {"dn": group_dn,
+ "sAMAccountName": groupname,
+ "objectClass": "group"}
- if grouptype is not None:
- ldbmessage["groupType"] = "%d" % ((grouptype)-2**32)
+ if grouptype is not None:
+ ldbmessage["groupType"] = "%d" % ((grouptype)-2**32)
- if description is not None:
- ldbmessage["description"] = description
+ if description is not None:
+ ldbmessage["description"] = description
- if mailaddress is not None:
- ldbmessage["mail"] = mailaddress
+ if mailaddress is not None:
+ ldbmessage["mail"] = mailaddress
- if notes is not None:
- ldbmessage["info"] = notes
+ if notes is not None:
+ ldbmessage["info"] = notes
+ self.transaction_start()
+ try:
self.add(ldbmessage)
-
except:
self.transaction_cancel()
raise
@@ -207,7 +206,7 @@ changetype: modify
for member in groupmembers:
targetmember = self.search(base=self.domain_dn(), scope=ldb.SCOPE_SUBTREE,
- expression="(sAMAccountName=%s)" % member, attrs=[])
+ expression="(|(sAMAccountName=%s)(CN=%s))" % (member, member), attrs=[])
if len(targetmember) != 1:
continue
@@ -278,65 +277,65 @@ member: %s
if useusernameascn is None and displayname is not "":
cn = displayname
- self.transaction_start()
- try:
- user_dn = "CN=%s,%s,%s" % (cn, (userou or "CN=Users"), self.domain_dn())
+ user_dn = "CN=%s,%s,%s" % (cn, (userou or "CN=Users"), self.domain_dn())
- # The new user record. Note the reliance on the SAMLDB module which
- # fills in the default informations
- ldbmessage = {"dn": user_dn,
- "sAMAccountName": username,
- "objectClass": "user"}
+ # The new user record. Note the reliance on the SAMLDB module which
+ # fills in the default informations
+ ldbmessage = {"dn": user_dn,
+ "sAMAccountName": username,
+ "objectClass": "user"}
- if surname is not None:
- ldbmessage["sn"] = surname
+ if surname is not None:
+ ldbmessage["sn"] = surname
- if givenname is not None:
- ldbmessage["givenName"] = givenname
+ if givenname is not None:
+ ldbmessage["givenName"] = givenname
- if displayname is not "":
- ldbmessage["displayName"] = displayname
- ldbmessage["name"] = displayname
+ if displayname is not "":
+ ldbmessage["displayName"] = displayname
+ ldbmessage["name"] = displayname
- if initials is not None:
- ldbmessage["initials"] = '%s.' % initials
+ if initials is not None:
+ ldbmessage["initials"] = '%s.' % initials
- if profilepath is not None:
- ldbmessage["profilePath"] = profilepath
+ if profilepath is not None:
+ ldbmessage["profilePath"] = profilepath
- if scriptpath is not None:
- ldbmessage["scriptPath"] = scriptpath
+ if scriptpath is not None:
+ ldbmessage["scriptPath"] = scriptpath
- if homedrive is not None:
- ldbmessage["homeDrive"] = homedrive
+ if homedrive is not None:
+ ldbmessage["homeDrive"] = homedrive
- if homedirectory is not None:
- ldbmessage["homeDirectory"] = homedirectory
+ if homedirectory is not None:
+ ldbmessage["homeDirectory"] = homedirectory
- if jobtitle is not None:
- ldbmessage["title"] = jobtitle
+ if jobtitle is not None:
+ ldbmessage["title"] = jobtitle
- if department is not None:
- ldbmessage["department"] = department
+ if department is not None:
+ ldbmessage["department"] = department
- if company is not None:
- ldbmessage["company"] = company
+ if company is not None:
+ ldbmessage["company"] = company
- if description is not None:
- ldbmessage["description"] = description
+ if description is not None:
+ ldbmessage["description"] = description
- if mailaddress is not None:
- ldbmessage["mail"] = mailaddress
+ if mailaddress is not None:
+ ldbmessage["mail"] = mailaddress
- if internetaddress is not None:
- ldbmessage["wWWHomePage"] = internetaddress
+ if internetaddress is not None:
+ ldbmessage["wWWHomePage"] = internetaddress
- if telephonenumber is not None:
- ldbmessage["telephoneNumber"] = telephonenumber
+ if telephonenumber is not None:
+ ldbmessage["telephoneNumber"] = telephonenumber
- if physicaldeliveryoffice is not None:
- ldbmessage["physicalDeliveryOfficeName"] = physicaldeliveryoffice
+ if physicaldeliveryoffice is not None:
+ ldbmessage["physicalDeliveryOfficeName"] = physicaldeliveryoffice
+ self.transaction_start()
+ try:
self.add(ldbmessage)
# Sets the password for it