diff options
author | Joe Guo <joeg@catalyst.net.nz> | 2018-07-30 18:21:11 +1200 |
---|---|---|
committer | Douglas Bagnall <dbagnall@samba.org> | 2018-08-24 07:49:30 +0200 |
commit | fd6b2086cbf03d8dd0b46160f345bf7cc5551aeb (patch) | |
tree | 101163cf6456ed94237bf4210a39965384494c45 /python/samba/dbchecker.py | |
parent | 211c9a5f85bffbb012b4567bad265c9339588fbf (diff) | |
download | samba-fd6b2086cbf03d8dd0b46160f345bf7cc5551aeb.tar.gz |
PEP8: fix E303: too many blank lines (2)
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>
Diffstat (limited to 'python/samba/dbchecker.py')
-rw-r--r-- | python/samba/dbchecker.py | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py index aad0fecdcdf..158698907b9 100644 --- a/python/samba/dbchecker.py +++ b/python/samba/dbchecker.py @@ -1232,7 +1232,6 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) is_deleted = 'isDeleted' in obj and obj['isDeleted'][0].upper() == 'TRUE' target_is_deleted = 'isDeleted' in res[0] and res[0]['isDeleted'][0].upper() == 'TRUE' - if is_deleted and not obj.dn in self.deleted_objects_containers and linkID: # A fully deleted object should not have any linked # attributes. (MS-ADTS 3.1.1.5.5.1.1 Tombstone @@ -1406,10 +1405,8 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) attrname, syntax_oid) diff_count += 1 - return error_count - def get_originating_time(self, val, attid): '''Read metadata properties and return the originating time for a given attributeId. @@ -1449,7 +1446,6 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) return (set_att, list_attid, wrong_attids) - def fix_metadata(self, obj, attr): '''re-write replPropertyMetaData elements for a single attribute for a object. This is used to fix missing replPropertyMetaData elements''' @@ -1676,7 +1672,6 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) self.report("Fixed attribute '%s' of '%s'\n" % (sd_attr, dn)) self.samdb.set_session_info(self.system_session_info) - def has_replmetadata_zero_invocationid(self, dn, repl_meta_data): repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob, str(repl_meta_data)) @@ -1697,7 +1692,6 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) return found - def err_replmetadata_zero_invocationid(self, dn, attr, repl_meta_data): repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob, str(repl_meta_data)) @@ -1735,7 +1729,6 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) "Failed to fix attribute %s" % attr): self.report("Fixed attribute '%s' of '%s'\n" % (attr, dn)) - def err_replmetadata_unknown_attid(self, dn, attr, repl_meta_data): repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob, str(repl_meta_data)) @@ -1748,7 +1741,6 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) self.report('ERROR: attributeID 0X%0X is not known in our schema, not fixing %s on %s\n' % (o.attid, attr, dn)) return - def err_replmetadata_incorrect_attid(self, dn, attr, repl_meta_data, wrong_attids): repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob, str(repl_meta_data)) @@ -1844,7 +1836,6 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) "Failed to fix attribute %s" % attr): self.report("Fixed attribute '%s' of '%s'\n" % (attr, dn)) - def is_deleted_deleted_objects(self, obj): faulty = False if "description" not in obj: @@ -2041,7 +2032,6 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) # NCs deleted_objects_dn = None - object_rdn_attr = None object_rdn_val = None name_val = None @@ -2385,11 +2375,9 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) self.samdb.transaction_commit() - elif not self.samdb.am_rodc(): self.report("No RID Set found for this server: %s, and we are not the RID Master (so can not self-allocate)" % dn) - # Check some details of our own RID Set if dn == self.rid_set_dn: res = self.samdb.search(base=self.rid_set_dn, scope=ldb.SCOPE_BASE, @@ -2465,7 +2453,6 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) else: next_free_rid += 1 - return error_count ################################################################ @@ -2503,11 +2490,9 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) self.report("Changed dsServiceName to GUID form") return error_count - ############################################### # re-index the database - def reindex_database(self): '''re-index the whole database''' m = ldb.Message() |