git.samba.org
/
nivanova
/
samba-autobuild
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e9620c5
)
s4-samba.samdb: Fix leading indention and trailing ';'
author
Kamen Mazdrashki
<kamenim@samba.org>
Tue, 28 Sep 2010 22:35:51 +0000
(
01:35
+0300)
committer
Kamen Mazdrashki
<kamenim@samba.org>
Sat, 2 Oct 2010 22:24:55 +0000
(
01:24
+0300)
source4/scripting/python/samba/samdb.py
patch
|
blob
|
history
diff --git
a/source4/scripting/python/samba/samdb.py
b/source4/scripting/python/samba/samdb.py
index bbc52a9ebda2190b701658b458c8ed455aebdc22..f6b9b0e010a1dc74817ea73e411e55726ab2389f 100644
(file)
--- a/
source4/scripting/python/samba/samdb.py
+++ b/
source4/scripting/python/samba/samdb.py
@@
-165,7
+165,7
@@
pwdLastSet: 0
if len(targetgroup) == 0:
raise Exception('Unable to find group "%s"' % groupname)
assert(len(targetgroup) == 1)
if len(targetgroup) == 0:
raise Exception('Unable to find group "%s"' % groupname)
assert(len(targetgroup) == 1)
- self.delete(targetgroup[0].dn)
;
+ self.delete(targetgroup[0].dn)
except:
self.transaction_cancel()
raise
except:
self.transaction_cancel()
raise
@@
-204,22
+204,22
@@
changetype: modify
expression="(|(sAMAccountName=%s)(CN=%s))" % (member, member), attrs=[])
if len(targetmember) != 1:
expression="(|(sAMAccountName=%s)(CN=%s))" % (member, member), attrs=[])
if len(targetmember) != 1:
- continue
+
continue
if add_members_operation is True and (targetgroup[0].get('member') is None or str(targetmember[0].dn) not in targetgroup[0]['member']):
if add_members_operation is True and (targetgroup[0].get('member') is None or str(targetmember[0].dn) not in targetgroup[0]['member']):
- modified = True
- addtargettogroup += """add: member
+
modified = True
+
addtargettogroup += """add: member
member: %s
""" % (str(targetmember[0].dn))
elif add_members_operation is False and (targetgroup[0].get('member') is not None and str(targetmember[0].dn) in targetgroup[0]['member']):
member: %s
""" % (str(targetmember[0].dn))
elif add_members_operation is False and (targetgroup[0].get('member') is not None and str(targetmember[0].dn) in targetgroup[0]['member']):
- modified = True
- addtargettogroup += """delete: member
+
modified = True
+
addtargettogroup += """delete: member
member: %s
""" % (str(targetmember[0].dn))
if modified is True:
member: %s
""" % (str(targetmember[0].dn))
if modified is True:
- self.modify_ldif(addtargettogroup)
+
self.modify_ldif(addtargettogroup)
except:
self.transaction_cancel()
except:
self.transaction_cancel()
@@
-258,7
+258,7
@@
member: %s
:param physicaldeliveryoffice: Office location of the new user
"""
:param physicaldeliveryoffice: Office location of the new user
"""
- displayname = ""
;
+ displayname = ""
if givenname is not None:
displayname += givenname
if givenname is not None:
displayname += givenname
@@
-277,8
+277,8
@@
member: %s
# The new user record. Note the reliance on the SAMLDB module which
# fills in the default informations
ldbmessage = {"dn": user_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"}
+
"sAMAccountName": username,
+
"objectClass": "user"}
if surname is not None:
ldbmessage["sn"] = surname
if surname is not None:
ldbmessage["sn"] = surname