KCC: InternalEdge should know its sitelink

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/kcc_utils.py b/python/samba/kcc_utils.py
index d7936a68fdb08491c6978adba5ef60dabdba7f8d..dc14ba50ddcb4716abf5ac435eac4e02e43dcb9e 100644 (file)
--- a/python/samba/kcc_utils.py
+++ b/python/samba/kcc_utils.py
@@ -2233,12 +2233,13 @@ class ReplInfo(object):
         self.schedule = None
 
 class InternalEdge(object):
-    def __init__(self, v1, v2, redred, repl, eType):
+    def __init__(self, v1, v2, redred, repl, eType, site_link):
         self.v1 = v1
         self.v2 = v2
         self.red_red = redred
         self.repl_info = repl
         self.e_type = eType
+        self.site_link = site_link
 
     def __eq__(self, other):
         return not self < other and not other < self

diff --git a/source4/scripting/bin/samba_kcc b/source4/scripting/bin/samba_kcc
index a0859c9941e97434e556d68cd8f38a7f50e2a37d..8111fa596cd7332538645f35c1aa3b14aeeda11f 100755 (executable)
--- a/source4/scripting/bin/samba_kcc
+++ b/source4/scripting/bin/samba_kcc
@@ -2812,7 +2812,7 @@ def add_int_edge(graph, internal_edges, examine, v1, v2):
     if not combine_repl_info(ri, examine.repl_info, ri2):
         return
 
-    newIntEdge = InternalEdge(root1, root2, red_red, ri2, examine.con_type)
+    newIntEdge = InternalEdge(root1, root2, red_red, ri2, examine.con_type, examine.site_link)
     # Order by vertex guid
     #XXX guid comparison using ndr_pack
     if newIntEdge.v1.ndrpacked_guid > newIntEdge.v2.ndrpacked_guid:
@@ -2874,6 +2874,7 @@ def add_out_edge(graph, output_edges, e):
     # This multi-edge is a 'real' edge with no GUID
     ee = MultiEdge()
     ee.directed = False
+    ee.site_link = e.site_link
     ee.vertices.append(v1)
     ee.vertices.append(v2)
     ee.con_type = e.e_type