From: Andrej Gessel Date: Mon, 13 Nov 2017 10:07:43 +0000 (+0100) Subject: samba_kcc: do not commit new nTDSConnection, if we are rodc X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=08651a08ac10d472a8b170c2f33496192d7faa66 samba_kcc: do not commit new nTDSConnection, if we are rodc Traceback (most recent call last): /usr/local/samba/sbin/samba_kcc: File "/usr/local/samba/sbin/samba_kcc", line 337, in /usr/local/samba/sbin/samba_kcc: attempt_live_connections=opts.attempt_live_connections) /usr/local/samba/sbin/samba_kcc: File "/usr/local/samba/lib/python2.7/site-packages/samba/kcc/__init__.py", line 2644, in run /usr/local/samba/sbin/samba_kcc: all_connected = self.intersite(ping) /usr/local/samba/sbin/samba_kcc: File "/usr/local/samba/lib/python2.7/site-packages/samba/kcc/__init__.py", line 1883, in intersite /usr/local/samba/sbin/samba_kcc: all_connected = self.create_intersite_connections() /usr/local/samba/sbin/samba_kcc: File "/usr/local/samba/lib/python2.7/site-packages/samba/kcc/__init__.py", line 1817, in create_intersite_connections /usr/local/samba/sbin/samba_kcc: part, True) /usr/local/samba/sbin/samba_kcc: File "/usr/local/samba/lib/python2.7/site-packages/samba/kcc/__init__.py", line 1769, in create_connections /usr/local/samba/sbin/samba_kcc: partial_ok, detect_failed) /usr/local/samba/sbin/samba_kcc: File "/usr/local/samba/lib/python2.7/site-packages/samba/kcc/__init__.py", line 1594, in create_connection /usr/local/samba/sbin/samba_kcc: lbh.commit_connections(self.samdb) /usr/local/samba/sbin/samba_kcc: File "/usr/local/samba/lib/python2.7/site-packages/samba/kcc/kcc_utils.py", line 827, in commit_connections /usr/local/samba/sbin/samba_kcc: connect.commit_added(samdb, ro) /usr/local/samba/sbin/samba_kcc: File "/usr/local/samba/lib/python2.7/site-packages/samba/kcc/kcc_utils.py", line 1123, in commit_added /usr/local/samba/sbin/samba_kcc: (self.dnstr, estr)) /usr/local/samba/sbin/samba_kcc: samba.kcc.kcc_utils.KCCError: Could not add nTDSConnection for (CN=862f0429-c72c-4a81-ae9a-96820bb2f96d,CN=NTDS Settings, CN=BUILDHOST,CN=Servers,CN=Testsite,CN=Sites,CN=Configuration,DC=samdom,DC=com) - (Invalid LDB reply type 1) ../source4/dsdb/kcc/kcc_periodic.c:693: Failed samba_kcc - NT_STATUS_ACCESS_DENIED Signed-off-by: Andrej Gessel Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett Autobuild-User(master): Karolin Seeger Autobuild-Date(master): Sat Jan 13 22:01:49 CET 2018 on sn-devel-144 --- diff --git a/python/samba/kcc/__init__.py b/python/samba/kcc/__init__.py index 273a68fa09f4..6f8be1c4b4f7 100644 --- a/python/samba/kcc/__init__.py +++ b/python/samba/kcc/__init__.py @@ -1501,7 +1501,7 @@ class KCC(object): cn.set_modified(True) # Display any modified connection - if self.readonly: + if self.readonly or ldsa.is_ro(): if cn.to_be_modified: logger.info("TO BE MODIFIED:\n%s" % cn) @@ -1585,11 +1585,11 @@ class KCC(object): rbh.dsa_dnstr, link_sched) # Display any added connection - if self.readonly: + if self.readonly or lbh.is_ro(): if cn.to_be_added: logger.info("TO BE ADDED:\n%s" % cn) - lbh.commit_connections(self.samdb, ro=True) + lbh.commit_connections(self.samdb, ro=True) else: lbh.commit_connections(self.samdb)