diff options
author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2017-12-13 17:35:29 +1300 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2018-01-13 17:37:07 +0100 |
commit | 315f445a0256b0b63a344286debb6a27053c4d69 (patch) | |
tree | a5f255b5664a6d8d97f096ec4da0d378fc8b1e02 /python | |
parent | d3f4429cd6e8a58926753651c015e683b92995ae (diff) | |
download | samba-315f445a0256b0b63a344286debb6a27053c4d69.tar.gz |
samba_kcc: clarify readonly logging, removing now unused function
The unused function was somewhat misnamed.
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python')
-rw-r--r-- | python/samba/kcc/__init__.py | 6 | ||||
-rw-r--r-- | python/samba/kcc/kcc_utils.py | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/python/samba/kcc/__init__.py b/python/samba/kcc/__init__.py index 3ebdb39d29d..3c31ef6b4b5 100644 --- a/python/samba/kcc/__init__.py +++ b/python/samba/kcc/__init__.py @@ -1095,9 +1095,9 @@ class KCC(object): if self.readonly: # Display any to be deleted or modified repsTo - text = n_rep.dumpstr_reps_to() - if text: - logger.info("REMOVING REPS-TO:\n%s" % text) + for rt in n_rep.rep_repsTo: + if rt.to_be_deleted: + logger.info("REMOVING REPS-TO: %s" % rt) # Peform deletion from our tables but perform # no database modification diff --git a/python/samba/kcc/kcc_utils.py b/python/samba/kcc/kcc_utils.py index 9e6aa5f41f4..785349997f8 100644 --- a/python/samba/kcc/kcc_utils.py +++ b/python/samba/kcc/kcc_utils.py @@ -418,9 +418,6 @@ class NCReplica(NamingContext): def dumpstr_to_be_modified(self): return '\n'.join(str(x) for x in self.rep_repsFrom if x.is_modified()) - def dumpstr_reps_to(self): - return '\n'.join(str(x) for x in self.rep_repsTo if x.to_be_deleted) - def load_fsmo_roles(self, samdb): """Given an NC replica which has been discovered thru the nTDSDSA database object, load the fSMORoleOwner attribute. |