KCC: kcc.my_site_guid was not really used
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Wed, 25 Mar 2015 04:47:13 +0000 (17:47 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 29 May 2015 04:58:27 +0000 (06:58 +0200)
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
source4/scripting/bin/samba_kcc

index 27abb4338b00a797f53f2eb32b56b3888891d8de..7f22013d323221d864fa88667a8f5066dd3f1c80 100755 (executable)
@@ -93,7 +93,6 @@ class KCC(object):
         self.my_dsa = None  # My dsa object
 
         self.my_site_dnstr = None
-        self.my_site_guid = None
         self.my_site = None
 
         self.samdb = None
@@ -167,7 +166,6 @@ class KCC(object):
         site.load_site(self.samdb)
 
         self.site_table[str(site.site_guid)] = site
-        self.my_site_guid = site.site_guid
         self.my_site = site
 
     def load_all_sites(self):
@@ -2368,7 +2366,7 @@ class KCC(object):
         logger.debug("intrasite(): enter")
 
         # Test whether local site has topology disabled
-        mysite = self.site_table[str(self.my_site_guid)]
+        mysite = self.my_site
         if mysite.is_intrasite_topology_disabled():
             return