PEP8: fix E131: continuation line unaligned for hanging indent

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/python/samba/gp_sec_ext.py b/python/samba/gp_sec_ext.py
index db15c0986dd6e3a6f7e870e2ffddd5021cbf1c53..f22a6ce30dad3804ffd1e16b2c40b89bc3cf9d9d 100644 (file)
--- a/python/samba/gp_sec_ext.py
+++ b/python/samba/gp_sec_ext.py
@@ -71,7 +71,7 @@ class inf_to_ldb(gp_ext_setter):
         old_val = self.ldb.get_minPwdLength()
         self.logger.info(
             'KDC Minimum Password length was changed from %s to %s' \
-             % (old_val, val))
+            % (old_val, val))
         self.gp_db.store(str(self), self.attribute, str(old_val))
         self.ldb.set_minPwdLength(val)
 

diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index 80834054055f3eb9eda2ae6f2d8047bebbfe3759..155a1e2f2e23741c619fc9bf93b67984546e6076 100644 (file)
--- a/python/samba/netcmd/domain.py
+++ b/python/samba/netcmd/domain.py
@@ -1228,7 +1228,7 @@ class cmd_domain_level(Command):
                 m.dn = ldb.Dn(samdb, domain_dn)
                 m["msDS-Behavior-Version"]= ldb.MessageElement(
                     str(new_level_domain), ldb.FLAG_MOD_REPLACE,
-                            "msDS-Behavior-Version")
+                    "msDS-Behavior-Version")
                 samdb.modify(m)
                 # Under partitions
                 m = ldb.Message()
@@ -1236,7 +1236,7 @@ class cmd_domain_level(Command):
                               + ",CN=Partitions,%s" % samdb.get_config_basedn())
                 m["msDS-Behavior-Version"]= ldb.MessageElement(
                     str(new_level_domain), ldb.FLAG_MOD_REPLACE,
-                          "msDS-Behavior-Version")
+                    "msDS-Behavior-Version")
                 try:
                     samdb.modify(m)
                 except ldb.LdbError as e2:
@@ -1268,7 +1268,7 @@ class cmd_domain_level(Command):
                 m.dn = ldb.Dn(samdb, "CN=Partitions,%s" % samdb.get_config_basedn())
                 m["msDS-Behavior-Version"]= ldb.MessageElement(
                     str(new_level_forest), ldb.FLAG_MOD_REPLACE,
-                          "msDS-Behavior-Version")
+                    "msDS-Behavior-Version")
                 samdb.modify(m)
                 msgs.append("Forest function level changed!")
             msgs.append("All changes applied successfully!")

diff --git a/python/samba/tests/netcmd.py b/python/samba/tests/netcmd.py
index 3f1c6425d1a4f04e3ab2a9e633d17b1becdcd5fd..8e2862306b290e29e9035fa448da129947cc4586 100644 (file)
--- a/python/samba/tests/netcmd.py
+++ b/python/samba/tests/netcmd.py
@@ -86,4 +86,4 @@ class CommandTests(NetCmdTestCase):
             return
         self.fail(
             "The following commands do not have a short description set: %r" %
-                missing)
+            missing)

diff --git a/python/samba/tests/samba_tool/ou.py b/python/samba/tests/samba_tool/ou.py
index c646349ffac257082c3543bc73781a3d1414787c..82b90e467a2669f2be5f7f0aec9f0965286f56bd 100644 (file)
--- a/python/samba/tests/samba_tool/ou.py
+++ b/python/samba/tests/samba_tool/ou.py
@@ -88,7 +88,7 @@ class OUCmdTestCase(SambaToolCmdTest):
         for ou in self.ous:
             (result, out, err) = self.runsubcmd(
                 "ou", "create", "OU=%s" % ou["name"],
-                 "--description=%s" % ou["description"])
+                "--description=%s" % ou["description"])
 
             self.assertCmdSuccess(result, out, err)
             self.assertEquals(err, "", "There shouldn't be any error message")
@@ -115,7 +115,7 @@ class OUCmdTestCase(SambaToolCmdTest):
             full_ou_dn = self.samdb.normalize_dn_in_domain("OU=%s" % ou["name"])
             (result, out, err) = self.runsubcmd(
                 "ou", "create", str(full_ou_dn),
-                 "--description=%s" % ou["description"])
+                "--description=%s" % ou["description"])
 
             self.assertCmdSuccess(result, out, err)
             self.assertEquals(err, "", "There shouldn't be any error message")

diff --git a/source4/dsdb/tests/python/ldap.py b/source4/dsdb/tests/python/ldap.py
index 76c40df68aa05e6070ccafd2e972285762f41686..1456d6b992329724e40bdc3168537b6730e9f107 100755 (executable)
--- a/source4/dsdb/tests/python/ldap.py
+++ b/source4/dsdb/tests/python/ldap.py
@@ -179,8 +179,8 @@ class BasicTests(samba.tests.TestCase):
         # Objects instanciated using "satisfied" abstract classes (concrete
         # subclasses) are allowed
         self.ldb.add({
-             "dn": "cn=ldaptestuser,cn=users," + self.base_dn,
-             "objectClass": ["top", "leaf", "connectionPoint", "serviceConnectionPoint"] })
+            "dn": "cn=ldaptestuser,cn=users," + self.base_dn,
+            "objectClass": ["top", "leaf", "connectionPoint", "serviceConnectionPoint"] })
 
         delete_force(self.ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
 
@@ -196,9 +196,9 @@ class BasicTests(samba.tests.TestCase):
 
         # Test allowed system flags
         self.ldb.add({
-             "dn": "cn=ldaptestuser,cn=users," + self.base_dn,
-             "objectClass": "person",
-             "systemFlags": str(~(SYSTEM_FLAG_CONFIG_ALLOW_RENAME | SYSTEM_FLAG_CONFIG_ALLOW_MOVE | SYSTEM_FLAG_CONFIG_ALLOW_LIMITED_MOVE)) })
+            "dn": "cn=ldaptestuser,cn=users," + self.base_dn,
+            "objectClass": "person",
+            "systemFlags": str(~(SYSTEM_FLAG_CONFIG_ALLOW_RENAME | SYSTEM_FLAG_CONFIG_ALLOW_MOVE | SYSTEM_FLAG_CONFIG_ALLOW_LIMITED_MOVE)) })
 
         res = ldb.search("cn=ldaptestuser,cn=users," + self.base_dn,
                          scope=SCOPE_BASE, attrs=["systemFlags"])
@@ -208,8 +208,8 @@ class BasicTests(samba.tests.TestCase):
         delete_force(self.ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
 
         self.ldb.add({
-             "dn": "cn=ldaptestuser,cn=users," + self.base_dn,
-             "objectClass": "person" })
+            "dn": "cn=ldaptestuser,cn=users," + self.base_dn,
+            "objectClass": "person" })
 
         # We can remove derivation classes of the structural objectclass
         # but they're going to be readded afterwards
@@ -417,8 +417,8 @@ class BasicTests(samba.tests.TestCase):
         delete_force(self.ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
 
         self.ldb.add({
-             "dn": "cn=ldaptestuser,cn=users," + self.base_dn,
-             "objectClass": "user" })
+            "dn": "cn=ldaptestuser,cn=users," + self.base_dn,
+            "objectClass": "user" })
 
         # Add a new top-most structural class "container". This does not work
         # since it stands in no direct relation to the current one.
@@ -573,7 +573,7 @@ class BasicTests(samba.tests.TestCase):
         try:
             self.ldb.add({
                 "dn": "cn=ldaptestgroup,cn=thisdoesnotexist123,"
-                   + self.base_dn,
+                + self.base_dn,
                 "objectclass": "group"})
             self.fail()
         except LdbError as e24:
@@ -611,8 +611,8 @@ class BasicTests(samba.tests.TestCase):
             self.assertEquals(num, ERR_NO_SUCH_ATTRIBUTE)
 
         self.ldb.add({
-             "dn": "cn=ldaptestgroup,cn=users," + self.base_dn,
-             "objectclass": "group"})
+            "dn": "cn=ldaptestgroup,cn=users," + self.base_dn,
+            "objectclass": "group"})
 
         # modify operation
 
@@ -723,8 +723,8 @@ class BasicTests(samba.tests.TestCase):
             self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
 
         self.ldb.add({
-             "dn": "cn=ldaptestgroup,cn=users," + self.base_dn,
-             "objectclass": "group"})
+            "dn": "cn=ldaptestgroup,cn=users," + self.base_dn,
+            "objectclass": "group"})
 
         m = Message()
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
@@ -904,8 +904,8 @@ class BasicTests(samba.tests.TestCase):
         try:
             ldb.add({
                 "dn": "cn=ldaptestuser,cn=users," + self.base_dn,
-               "objectClass": "person",
-               "sn": "" })
+                "objectClass": "person",
+                "sn": "" })
             self.fail()
         except LdbError as e39:
             (num, _) = e39.args
@@ -923,7 +923,7 @@ class BasicTests(samba.tests.TestCase):
 
         ldb.add({
             "dn": "cn=ldaptestuser,cn=users," + self.base_dn,
-           "objectClass": "person" })
+            "objectClass": "person" })
 
         # Too short (min. 1)
         m = Message()
@@ -1056,8 +1056,8 @@ class BasicTests(samba.tests.TestCase):
             self.assertEquals(num, ERR_UNWILLING_TO_PERFORM)
 
         self.ldb.add({
-             "dn": "cn=ldaptestgroup,cn=users," + self.base_dn,
-             "objectclass": "group"})
+            "dn": "cn=ldaptestgroup,cn=users," + self.base_dn,
+            "objectclass": "group"})
 
         m = Message()
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
@@ -1122,9 +1122,9 @@ class BasicTests(samba.tests.TestCase):
 
         # a wrong "distinguishedName" attribute is obviously tolerated
         self.ldb.add({
-              "dn": "cn=ldaptestgroup,cn=users," + self.base_dn,
-              "objectclass": "group",
-              "distinguishedName": "cn=ldaptest,cn=users," + self.base_dn})
+            "dn": "cn=ldaptestgroup,cn=users," + self.base_dn,
+            "objectclass": "group",
+            "distinguishedName": "cn=ldaptest,cn=users," + self.base_dn})
 
         # proof if the DN has been set correctly
         res = ldb.search("cn=ldaptestgroup,cn=users," + self.base_dn,
@@ -1139,7 +1139,7 @@ class BasicTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["dn"] = MessageElement(
             "cn=ldaptestgroup,cn=users," + self.base_dn, FLAG_MOD_REPLACE,
-          "dn")
+            "dn")
         try:
             ldb.modify(m)
             self.fail()
@@ -1151,7 +1151,7 @@ class BasicTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["distinguishedName"] = MessageElement(
             "cn=ldaptestuser,cn=users," + self.base_dn, FLAG_MOD_ADD,
-          "distinguishedName")
+            "distinguishedName")
 
         try:
             ldb.modify(m)
@@ -1164,7 +1164,7 @@ class BasicTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["distinguishedName"] = MessageElement(
             "cn=ldaptestuser,cn=users," + self.base_dn, FLAG_MOD_REPLACE,
-          "distinguishedName")
+            "distinguishedName")
 
         try:
             ldb.modify(m)
@@ -1177,7 +1177,7 @@ class BasicTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["distinguishedName"] = MessageElement(
             "cn=ldaptestuser,cn=users," + self.base_dn, FLAG_MOD_DELETE,
-          "distinguishedName")
+            "distinguishedName")
 
         try:
             ldb.modify(m)
@@ -1220,8 +1220,8 @@ class BasicTests(samba.tests.TestCase):
         # empty RDN
         try:
             self.ldb.add({
-                 "dn": "=,cn=users," + self.base_dn,
-                 "objectclass": "group"})
+                "dn": "=,cn=users," + self.base_dn,
+                "objectclass": "group"})
             self.fail()
         except LdbError as e61:
             (num, _) = e61.args
@@ -1230,8 +1230,8 @@ class BasicTests(samba.tests.TestCase):
         # empty RDN name
         try:
             self.ldb.add({
-                 "dn": "=ldaptestgroup,cn=users," + self.base_dn,
-                 "objectclass": "group"})
+                "dn": "=ldaptestgroup,cn=users," + self.base_dn,
+                "objectclass": "group"})
             self.fail()
         except LdbError as e62:
             (num, _) = e62.args
@@ -1240,8 +1240,8 @@ class BasicTests(samba.tests.TestCase):
         # empty RDN value
         try:
             self.ldb.add({
-                 "dn": "cn=,cn=users," + self.base_dn,
-                 "objectclass": "group"})
+                "dn": "cn=,cn=users," + self.base_dn,
+                "objectclass": "group"})
             self.fail()
         except LdbError as e63:
             (num, _) = e63.args
@@ -1250,8 +1250,8 @@ class BasicTests(samba.tests.TestCase):
         # a wrong RDN candidate
         try:
             self.ldb.add({
-                 "dn": "description=xyz,cn=users," + self.base_dn,
-                 "objectclass": "group"})
+                "dn": "description=xyz,cn=users," + self.base_dn,
+                "objectclass": "group"})
             self.fail()
         except LdbError as e64:
             (num, _) = e64.args
@@ -1261,9 +1261,9 @@ class BasicTests(samba.tests.TestCase):
 
         # a wrong "name" attribute is obviously tolerated
         self.ldb.add({
-             "dn": "cn=ldaptestgroup,cn=users," + self.base_dn,
-             "objectclass": "group",
-             "name": "ldaptestgroupx"})
+            "dn": "cn=ldaptestgroup,cn=users," + self.base_dn,
+            "objectclass": "group",
+            "name": "ldaptestgroupx"})
 
         # proof if the name has been set correctly
         res = ldb.search("cn=ldaptestgroup,cn=users," + self.base_dn,
@@ -1417,8 +1417,8 @@ objectClass: container
             self.assertEquals(num, ERR_NO_SUCH_OBJECT)
 
         self.ldb.add({
-             "dn": "cn=ldaptestuser2,cn=users," + self.base_dn,
-             "objectclass": "user" })
+            "dn": "cn=ldaptestuser2,cn=users," + self.base_dn,
+            "objectclass": "user" })
 
         ldb.rename("cn=ldaptestuser2,cn=users," + self.base_dn, "cn=ldaptestuser2,cn=users," + self.base_dn)
         ldb.rename("cn=ldaptestuser2,cn=users," + self.base_dn, "cn=ldaptestuser3,cn=users," + self.base_dn)
@@ -1523,14 +1523,14 @@ objectClass: container
     def test_rename_twice(self):
         """Tests the rename operation twice - this corresponds to a past bug"""
         self.ldb.add({
-             "dn": "cn=ldaptestuser5,cn=users," + self.base_dn,
-             "objectclass": "user" })
+            "dn": "cn=ldaptestuser5,cn=users," + self.base_dn,
+            "objectclass": "user" })
 
         ldb.rename("cn=ldaptestuser5,cn=users," + self.base_dn, "cn=ldaptestUSER5,cn=users," + self.base_dn)
         delete_force(self.ldb, "cn=ldaptestuser5,cn=users," + self.base_dn)
         self.ldb.add({
-             "dn": "cn=ldaptestuser5,cn=users," + self.base_dn,
-             "objectclass": "user" })
+            "dn": "cn=ldaptestuser5,cn=users," + self.base_dn,
+            "objectclass": "user" })
         ldb.rename("cn=ldaptestuser5,cn=Users," + self.base_dn, "cn=ldaptestUSER5,cn=users," + self.base_dn)
         res = ldb.search(expression="cn=ldaptestuser5")
         self.assertEquals(len(res), 1, "Wrong number of hits for cn=ldaptestuser5")

diff --git a/source4/dsdb/tests/python/sam.py b/source4/dsdb/tests/python/sam.py
index a74328ee6f17b17ab9d093ddb3caec255957d55c..e6c93c5c7e60ba4b6908671c0cd8416e1355c125 100755 (executable)
--- a/source4/dsdb/tests/python/sam.py
+++ b/source4/dsdb/tests/python/sam.py
@@ -431,7 +431,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["member"] = MessageElement(
             "cn=ldaptestuser3,cn=users," + self.base_dn,
-          FLAG_MOD_ADD, "member")
+            FLAG_MOD_ADD, "member")
         try:
             ldb.modify(m)
             self.fail()
@@ -504,8 +504,8 @@ class SamTests(samba.tests.TestCase):
         try:
             ldb.add({
                 "dn": "cn=ldaptestuser2,cn=users," + self.base_dn,
-              "objectclass": "user",
-              "primaryGroupID": "0"})
+                "objectclass": "user",
+                "primaryGroupID": "0"})
             self.fail()
         except LdbError as e23:
             (num, _) = e23.args
@@ -1009,7 +1009,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["groupType"] = MessageElement(
             str(GTYPE_SECURITY_GLOBAL_GROUP),
-          FLAG_MOD_REPLACE, "groupType")
+            FLAG_MOD_REPLACE, "groupType")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestgroup,cn=users," + self.base_dn,
@@ -1025,7 +1025,7 @@ class SamTests(samba.tests.TestCase):
             m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
             m["groupType"] = MessageElement(
                 str(GTYPE_SECURITY_DOMAIN_LOCAL_GROUP),
-              FLAG_MOD_REPLACE, "groupType")
+                FLAG_MOD_REPLACE, "groupType")
             ldb.modify(m)
             self.fail()
         except LdbError as e40:
@@ -1038,7 +1038,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["groupType"] = MessageElement(
             str(GTYPE_SECURITY_UNIVERSAL_GROUP),
-          FLAG_MOD_REPLACE, "groupType")
+            FLAG_MOD_REPLACE, "groupType")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestgroup,cn=users," + self.base_dn,
@@ -1053,7 +1053,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["groupType"] = MessageElement(
             str(GTYPE_SECURITY_GLOBAL_GROUP),
-          FLAG_MOD_REPLACE, "groupType")
+            FLAG_MOD_REPLACE, "groupType")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestgroup,cn=users," + self.base_dn,
@@ -1068,7 +1068,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["groupType"] = MessageElement(
             str(GTYPE_SECURITY_UNIVERSAL_GROUP),
-          FLAG_MOD_REPLACE, "groupType")
+            FLAG_MOD_REPLACE, "groupType")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestgroup,cn=users," + self.base_dn,
@@ -1083,7 +1083,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["groupType"] = MessageElement(
             str(GTYPE_SECURITY_DOMAIN_LOCAL_GROUP),
-          FLAG_MOD_REPLACE, "groupType")
+            FLAG_MOD_REPLACE, "groupType")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestgroup,cn=users," + self.base_dn,
@@ -1099,7 +1099,7 @@ class SamTests(samba.tests.TestCase):
             m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
             m["groupType"] = MessageElement(
                 str(GTYPE_SECURITY_GLOBAL_GROUP),
-              FLAG_MOD_REPLACE, "groupType")
+                FLAG_MOD_REPLACE, "groupType")
             ldb.modify(m)
             self.fail()
         except LdbError as e41:
@@ -1113,7 +1113,7 @@ class SamTests(samba.tests.TestCase):
             m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
             m["groupType"] = MessageElement(
                 str(GTYPE_SECURITY_BUILTIN_LOCAL_GROUP),
-              FLAG_MOD_REPLACE, "groupType")
+                FLAG_MOD_REPLACE, "groupType")
             ldb.modify(m)
             self.fail()
         except LdbError as e42:
@@ -1129,7 +1129,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["groupType"] = MessageElement(
             str(GTYPE_SECURITY_UNIVERSAL_GROUP),
-          FLAG_MOD_REPLACE, "groupType")
+            FLAG_MOD_REPLACE, "groupType")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestgroup,cn=users," + self.base_dn,
@@ -1145,7 +1145,7 @@ class SamTests(samba.tests.TestCase):
             m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
             m["groupType"] = MessageElement(
                 str(GTYPE_SECURITY_BUILTIN_LOCAL_GROUP),
-              FLAG_MOD_REPLACE, "groupType")
+                FLAG_MOD_REPLACE, "groupType")
             ldb.modify(m)
             self.fail()
         except LdbError as e43:
@@ -1158,7 +1158,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["groupType"] = MessageElement(
             str(GTYPE_SECURITY_GLOBAL_GROUP),
-          FLAG_MOD_REPLACE, "groupType")
+            FLAG_MOD_REPLACE, "groupType")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestgroup,cn=users," + self.base_dn,
@@ -1174,7 +1174,7 @@ class SamTests(samba.tests.TestCase):
             m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
             m["groupType"] = MessageElement(
                 str(GTYPE_SECURITY_BUILTIN_LOCAL_GROUP),
-              FLAG_MOD_REPLACE, "groupType")
+                FLAG_MOD_REPLACE, "groupType")
             ldb.modify(m)
             self.fail()
         except LdbError as e44:
@@ -1189,7 +1189,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["groupType"] = MessageElement(
             str(GTYPE_DISTRIBUTION_GLOBAL_GROUP),
-          FLAG_MOD_REPLACE, "groupType")
+            FLAG_MOD_REPLACE, "groupType")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestgroup,cn=users," + self.base_dn,
@@ -1205,7 +1205,7 @@ class SamTests(samba.tests.TestCase):
             m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
             m["groupType"] = MessageElement(
                 str(GTYPE_DISTRIBUTION_DOMAIN_LOCAL_GROUP),
-              FLAG_MOD_REPLACE, "groupType")
+                FLAG_MOD_REPLACE, "groupType")
             ldb.modify(m)
             self.fail()
         except LdbError as e45:
@@ -1218,7 +1218,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["groupType"] = MessageElement(
             str(GTYPE_DISTRIBUTION_UNIVERSAL_GROUP),
-          FLAG_MOD_REPLACE, "groupType")
+            FLAG_MOD_REPLACE, "groupType")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestgroup,cn=users," + self.base_dn,
@@ -1233,7 +1233,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["groupType"] = MessageElement(
             str(GTYPE_DISTRIBUTION_GLOBAL_GROUP),
-          FLAG_MOD_REPLACE, "groupType")
+            FLAG_MOD_REPLACE, "groupType")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestgroup,cn=users," + self.base_dn,
@@ -1248,7 +1248,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["groupType"] = MessageElement(
             str(GTYPE_DISTRIBUTION_UNIVERSAL_GROUP),
-          FLAG_MOD_REPLACE, "groupType")
+            FLAG_MOD_REPLACE, "groupType")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestgroup,cn=users," + self.base_dn,
@@ -1263,7 +1263,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["groupType"] = MessageElement(
             str(GTYPE_DISTRIBUTION_DOMAIN_LOCAL_GROUP),
-          FLAG_MOD_REPLACE, "groupType")
+            FLAG_MOD_REPLACE, "groupType")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestgroup,cn=users," + self.base_dn,
@@ -1279,7 +1279,7 @@ class SamTests(samba.tests.TestCase):
             m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
             m["groupType"] = MessageElement(
                 str(GTYPE_DISTRIBUTION_GLOBAL_GROUP),
-              FLAG_MOD_REPLACE, "groupType")
+                FLAG_MOD_REPLACE, "groupType")
             ldb.modify(m)
             self.fail()
         except LdbError as e46:
@@ -1293,7 +1293,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["member"] = MessageElement(
             "cn=ldaptestuser3,cn=users," + self.base_dn,
-          FLAG_MOD_ADD, "member")
+            FLAG_MOD_ADD, "member")
         try:
             ldb.modify(m)
             self.fail()
@@ -1306,7 +1306,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["groupType"] = MessageElement(
             str(GTYPE_DISTRIBUTION_UNIVERSAL_GROUP),
-          FLAG_MOD_REPLACE, "groupType")
+            FLAG_MOD_REPLACE, "groupType")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestgroup,cn=users," + self.base_dn,
@@ -1321,7 +1321,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["groupType"] = MessageElement(
             str(GTYPE_DISTRIBUTION_GLOBAL_GROUP),
-          FLAG_MOD_REPLACE, "groupType")
+            FLAG_MOD_REPLACE, "groupType")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestgroup,cn=users," + self.base_dn,
@@ -1339,7 +1339,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["groupType"] = MessageElement(
             str(GTYPE_SECURITY_GLOBAL_GROUP),
-          FLAG_MOD_REPLACE, "groupType")
+            FLAG_MOD_REPLACE, "groupType")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestgroup,cn=users," + self.base_dn,
@@ -1355,7 +1355,7 @@ class SamTests(samba.tests.TestCase):
             m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
             m["groupType"] = MessageElement(
                 str(GTYPE_DISTRIBUTION_DOMAIN_LOCAL_GROUP),
-              FLAG_MOD_REPLACE, "groupType")
+                FLAG_MOD_REPLACE, "groupType")
             ldb.modify(m)
             self.fail()
         except LdbError as e48:
@@ -1368,7 +1368,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["groupType"] = MessageElement(
             str(GTYPE_DISTRIBUTION_UNIVERSAL_GROUP),
-          FLAG_MOD_REPLACE, "groupType")
+            FLAG_MOD_REPLACE, "groupType")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestgroup,cn=users," + self.base_dn,
@@ -1383,7 +1383,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["groupType"] = MessageElement(
             str(GTYPE_SECURITY_GLOBAL_GROUP),
-          FLAG_MOD_REPLACE, "groupType")
+            FLAG_MOD_REPLACE, "groupType")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestgroup,cn=users," + self.base_dn,
@@ -1398,7 +1398,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["groupType"] = MessageElement(
             str(GTYPE_SECURITY_UNIVERSAL_GROUP),
-          FLAG_MOD_REPLACE, "groupType")
+            FLAG_MOD_REPLACE, "groupType")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestgroup,cn=users," + self.base_dn,
@@ -1413,7 +1413,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["groupType"] = MessageElement(
             str(GTYPE_DISTRIBUTION_DOMAIN_LOCAL_GROUP),
-          FLAG_MOD_REPLACE, "groupType")
+            FLAG_MOD_REPLACE, "groupType")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestgroup,cn=users," + self.base_dn,
@@ -1429,7 +1429,7 @@ class SamTests(samba.tests.TestCase):
             m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
             m["groupType"] = MessageElement(
                 str(GTYPE_DISTRIBUTION_GLOBAL_GROUP),
-              FLAG_MOD_REPLACE, "groupType")
+                FLAG_MOD_REPLACE, "groupType")
             ldb.modify(m)
             self.fail()
         except LdbError as e49:
@@ -1442,7 +1442,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["groupType"] = MessageElement(
             str(GTYPE_SECURITY_UNIVERSAL_GROUP),
-          FLAG_MOD_REPLACE, "groupType")
+            FLAG_MOD_REPLACE, "groupType")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestgroup,cn=users," + self.base_dn,
@@ -1457,7 +1457,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
         m["groupType"] = MessageElement(
             str(GTYPE_SECURITY_GLOBAL_GROUP),
-          FLAG_MOD_REPLACE, "groupType")
+            FLAG_MOD_REPLACE, "groupType")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestgroup,cn=users," + self.base_dn,
@@ -2016,7 +2016,7 @@ class SamTests(samba.tests.TestCase):
             m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
             m["userAccountControl"] = MessageElement(
                 str(UF_NORMAL_ACCOUNT),
-              FLAG_MOD_REPLACE, "userAccountControl")
+                FLAG_MOD_REPLACE, "userAccountControl")
             ldb.modify(m)
         except LdbError as e65:
             (num, _) = e65.args
@@ -2026,7 +2026,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
         m["userAccountControl"] = MessageElement(
             str(UF_NORMAL_ACCOUNT | UF_PASSWD_NOTREQD),
-          FLAG_MOD_REPLACE, "userAccountControl")
+            FLAG_MOD_REPLACE, "userAccountControl")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestuser,cn=users," + self.base_dn,
@@ -2041,7 +2041,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
         m["userAccountControl"] = MessageElement(
             str(UF_ACCOUNTDISABLE),
-          FLAG_MOD_REPLACE, "userAccountControl")
+            FLAG_MOD_REPLACE, "userAccountControl")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestuser,cn=users," + self.base_dn,
@@ -2063,7 +2063,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
         m["userAccountControl"] = MessageElement(
             str(UF_LOCKOUT | UF_PASSWORD_EXPIRED),
-          FLAG_MOD_REPLACE, "userAccountControl")
+            FLAG_MOD_REPLACE, "userAccountControl")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestuser,cn=users," + self.base_dn,
@@ -2082,7 +2082,7 @@ class SamTests(samba.tests.TestCase):
             m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
             m["userAccountControl"] = MessageElement(
                 str(UF_TEMP_DUPLICATE_ACCOUNT),
-              FLAG_MOD_REPLACE, "userAccountControl")
+                FLAG_MOD_REPLACE, "userAccountControl")
             ldb.modify(m)
             self.fail()
         except LdbError as e66:
@@ -2094,7 +2094,7 @@ class SamTests(samba.tests.TestCase):
             m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
             m["userAccountControl"] = MessageElement(
                 str(UF_SERVER_TRUST_ACCOUNT),
-              FLAG_MOD_REPLACE, "userAccountControl")
+                FLAG_MOD_REPLACE, "userAccountControl")
             ldb.modify(m)
             self.fail()
         except LdbError as e67:
@@ -2105,7 +2105,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
         m["userAccountControl"] = MessageElement(
             str(UF_WORKSTATION_TRUST_ACCOUNT),
-          FLAG_MOD_REPLACE, "userAccountControl")
+            FLAG_MOD_REPLACE, "userAccountControl")
         ldb.modify(m)
 
         try:
@@ -2113,7 +2113,7 @@ class SamTests(samba.tests.TestCase):
             m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
             m["userAccountControl"] = MessageElement(
                 str(UF_WORKSTATION_TRUST_ACCOUNT | UF_PARTIAL_SECRETS_ACCOUNT),
-              FLAG_MOD_REPLACE, "userAccountControl")
+                FLAG_MOD_REPLACE, "userAccountControl")
             ldb.modify(m)
             self.fail()
         except LdbError as e68:
@@ -2130,7 +2130,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
         m["userAccountControl"] = MessageElement(
             str(UF_NORMAL_ACCOUNT | UF_PASSWD_NOTREQD),
-          FLAG_MOD_REPLACE, "userAccountControl")
+            FLAG_MOD_REPLACE, "userAccountControl")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestuser,cn=users," + self.base_dn,
@@ -2144,7 +2144,7 @@ class SamTests(samba.tests.TestCase):
             m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
             m["userAccountControl"] = MessageElement(
                 str(UF_INTERDOMAIN_TRUST_ACCOUNT),
-              FLAG_MOD_REPLACE, "userAccountControl")
+                FLAG_MOD_REPLACE, "userAccountControl")
             ldb.modify(m)
             self.fail()
         except LdbError as e69:
@@ -2293,7 +2293,7 @@ class SamTests(samba.tests.TestCase):
             m.dn = Dn(ldb, "cn=ldaptestcomputer,cn=computers," + self.base_dn)
             m["userAccountControl"] = MessageElement(
                 str(UF_NORMAL_ACCOUNT),
-              FLAG_MOD_REPLACE, "userAccountControl")
+                FLAG_MOD_REPLACE, "userAccountControl")
             ldb.modify(m)
         except LdbError as e74:
             (num, _) = e74.args
@@ -2303,7 +2303,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestcomputer,cn=computers," + self.base_dn)
         m["userAccountControl"] = MessageElement(
             str(UF_NORMAL_ACCOUNT | UF_PASSWD_NOTREQD),
-          FLAG_MOD_REPLACE, "userAccountControl")
+            FLAG_MOD_REPLACE, "userAccountControl")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestcomputer,cn=computers," + self.base_dn,
@@ -2318,7 +2318,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestcomputer,cn=computers," + self.base_dn)
         m["userAccountControl"] = MessageElement(
             str(UF_ACCOUNTDISABLE),
-          FLAG_MOD_REPLACE, "userAccountControl")
+            FLAG_MOD_REPLACE, "userAccountControl")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestcomputer,cn=computers," + self.base_dn,
@@ -2340,7 +2340,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestcomputer,cn=computers," + self.base_dn)
         m["userAccountControl"] = MessageElement(
             str(UF_LOCKOUT | UF_PASSWORD_EXPIRED),
-          FLAG_MOD_REPLACE, "userAccountControl")
+            FLAG_MOD_REPLACE, "userAccountControl")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestcomputer,cn=computers," + self.base_dn,
@@ -2359,7 +2359,7 @@ class SamTests(samba.tests.TestCase):
             m.dn = Dn(ldb, "cn=ldaptestcomputer,cn=computers," + self.base_dn)
             m["userAccountControl"] = MessageElement(
                 str(UF_TEMP_DUPLICATE_ACCOUNT),
-              FLAG_MOD_REPLACE, "userAccountControl")
+                FLAG_MOD_REPLACE, "userAccountControl")
             ldb.modify(m)
             self.fail()
         except LdbError as e75:
@@ -2370,7 +2370,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestcomputer,cn=computers," + self.base_dn)
         m["userAccountControl"] = MessageElement(
             str(UF_SERVER_TRUST_ACCOUNT),
-          FLAG_MOD_REPLACE, "userAccountControl")
+            FLAG_MOD_REPLACE, "userAccountControl")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestcomputer,cn=computers," + self.base_dn,
@@ -2383,7 +2383,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestcomputer,cn=computers," + self.base_dn)
         m["userAccountControl"] = MessageElement(
             str(UF_NORMAL_ACCOUNT | UF_PASSWD_NOTREQD),
-          FLAG_MOD_REPLACE, "userAccountControl")
+            FLAG_MOD_REPLACE, "userAccountControl")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestcomputer,cn=computers," + self.base_dn,
@@ -2396,7 +2396,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestcomputer,cn=computers," + self.base_dn)
         m["userAccountControl"] = MessageElement(
             str(UF_WORKSTATION_TRUST_ACCOUNT),
-          FLAG_MOD_REPLACE, "userAccountControl")
+            FLAG_MOD_REPLACE, "userAccountControl")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestcomputer,cn=computers," + self.base_dn,
@@ -2409,7 +2409,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestcomputer,cn=computers," + self.base_dn)
         m["userAccountControl"] = MessageElement(
             str(UF_NORMAL_ACCOUNT | UF_PASSWD_NOTREQD),
-          FLAG_MOD_REPLACE, "userAccountControl")
+            FLAG_MOD_REPLACE, "userAccountControl")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestcomputer,cn=computers," + self.base_dn,
@@ -2422,7 +2422,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestcomputer,cn=computers," + self.base_dn)
         m["userAccountControl"] = MessageElement(
             str(UF_SERVER_TRUST_ACCOUNT),
-          FLAG_MOD_REPLACE, "userAccountControl")
+            FLAG_MOD_REPLACE, "userAccountControl")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestcomputer,cn=computers," + self.base_dn,
@@ -2435,7 +2435,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestcomputer,cn=computers," + self.base_dn)
         m["userAccountControl"] = MessageElement(
             str(UF_WORKSTATION_TRUST_ACCOUNT),
-          FLAG_MOD_REPLACE, "userAccountControl")
+            FLAG_MOD_REPLACE, "userAccountControl")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestcomputer,cn=computers," + self.base_dn,
@@ -2449,7 +2449,7 @@ class SamTests(samba.tests.TestCase):
             m.dn = Dn(ldb, "cn=ldaptestcomputer,cn=computers," + self.base_dn)
             m["userAccountControl"] = MessageElement(
                 str(UF_INTERDOMAIN_TRUST_ACCOUNT),
-              FLAG_MOD_REPLACE, "userAccountControl")
+                FLAG_MOD_REPLACE, "userAccountControl")
             ldb.modify(m)
             self.fail()
         except LdbError as e76:
@@ -2488,7 +2488,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestuser2,cn=users," + self.base_dn)
         m["userAccountControl"] = MessageElement(
             str(UF_NORMAL_ACCOUNT | UF_PASSWD_NOTREQD),
-          FLAG_MOD_REPLACE, "userAccountControl")
+            FLAG_MOD_REPLACE, "userAccountControl")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestuser2,cn=users," + self.base_dn,
@@ -2522,7 +2522,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestcomputer,cn=computers," + self.base_dn)
         m["userAccountControl"] = MessageElement(
             str(UF_WORKSTATION_TRUST_ACCOUNT),
-          FLAG_MOD_REPLACE, "userAccountControl")
+            FLAG_MOD_REPLACE, "userAccountControl")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestcomputer,cn=computers," + self.base_dn,
@@ -2600,7 +2600,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
         m["userAccountControl"] = MessageElement(
             str(UF_NORMAL_ACCOUNT|UF_SMARTCARD_REQUIRED),
-          FLAG_MOD_REPLACE, "userAccountControl")
+            FLAG_MOD_REPLACE, "userAccountControl")
         ldb.modify(m)
 
         res = ldb.search("cn=ldaptestuser,cn=users," + self.base_dn,
@@ -2702,7 +2702,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
         m["userAccountControl"] = MessageElement(
             str(UF_NORMAL_ACCOUNT|UF_ACCOUNTDISABLE|UF_SMARTCARD_REQUIRED),
-          FLAG_MOD_REPLACE, "userAccountControl")
+            FLAG_MOD_REPLACE, "userAccountControl")
         ldb.modify(m)
 
         res = ldb.search("cn=ldaptestuser,cn=users," + self.base_dn,
@@ -2749,7 +2749,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
         m["userAccountControl"] = MessageElement(
             str(UF_NORMAL_ACCOUNT|UF_SMARTCARD_REQUIRED),
-          FLAG_MOD_REPLACE, "userAccountControl")
+            FLAG_MOD_REPLACE, "userAccountControl")
         ldb.modify(m)
 
         res = ldb.search("cn=ldaptestuser,cn=users," + self.base_dn,
@@ -2850,7 +2850,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
         m["userAccountControl"] = MessageElement(
             str(UF_NORMAL_ACCOUNT|UF_SMARTCARD_REQUIRED),
-          FLAG_MOD_REPLACE, "userAccountControl")
+            FLAG_MOD_REPLACE, "userAccountControl")
         ldb.modify(m)
 
         res = ldb.search("cn=ldaptestuser,cn=users," + self.base_dn,
@@ -2980,7 +2980,7 @@ class SamTests(samba.tests.TestCase):
         m.dn = Dn(ldb, "cn=ldaptestcomputer,cn=computers," + self.base_dn)
         m["userAccountControl"] = MessageElement(
             str(UF_WORKSTATION_TRUST_ACCOUNT | UF_PARTIAL_SECRETS_ACCOUNT),
-          FLAG_MOD_REPLACE, "userAccountControl")
+            FLAG_MOD_REPLACE, "userAccountControl")
         ldb.modify(m)
 
         res1 = ldb.search("cn=ldaptestcomputer,cn=computers," + self.base_dn,

diff --git a/source4/dsdb/tests/python/urgent_replication.py b/source4/dsdb/tests/python/urgent_replication.py
index a36f069cc48bbd02f2c125401e951e837af8db95..893c35eca2295e07fb112a0500a93392371a0d4d 100755 (executable)
--- a/source4/dsdb/tests/python/urgent_replication.py
+++ b/source4/dsdb/tests/python/urgent_replication.py
@@ -80,7 +80,7 @@ class UrgentReplicationTests(samba.tests.TestCase):
         """Test if the urgent replication is activated when handling a nTDSDSA object."""
         self.ldb.add({
             "dn": "cn=test server,cn=Servers,cn=Default-First-Site-Name,cn=Sites,%s" %
-                self.ldb.get_config_basedn(),
+            self.ldb.get_config_basedn(),
             "objectclass":"server",
             "cn":"test server",
             "name":"test server",
@@ -117,15 +117,15 @@ systemFlags: 33554432""", ["relax:0"])
     def test_crossRef_object(self):
         """Test if the urgent replication is activated when handling a crossRef object."""
         self.ldb.add({
-                      "dn": "CN=test crossRef,CN=Partitions,CN=Configuration,"+ self.base_dn,
-                      "objectClass": "crossRef",
-                      "cn": "test crossRef",
-                      "dnsRoot": self.get_loadparm().get("realm").lower(),
-                      "instanceType": "4",
-                      "nCName": self.base_dn,
-                      "showInAdvancedViewOnly": "TRUE",
-                      "name": "test crossRef",
-                      "systemFlags": "1"}, ["relax:0"])
+            "dn": "CN=test crossRef,CN=Partitions,CN=Configuration,"+ self.base_dn,
+            "objectClass": "crossRef",
+            "cn": "test crossRef",
+            "dnsRoot": self.get_loadparm().get("realm").lower(),
+            "instanceType": "4",
+            "nCName": self.base_dn,
+            "showInAdvancedViewOnly": "TRUE",
+            "name": "test crossRef",
+            "systemFlags": "1"}, ["relax:0"])
 
         # urgent replication should be enabled when creating
         res = self.ldb.load_partition_usn("cn=Configuration," + self.base_dn)