sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-30 19:42:05 +03:00
Code Activity

KCC: keep track of IP transport for dsa.new_connection()

Browse Source 
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>
This commit is contained in:
Douglas Bagnall
2015-06-10 16:38:29 +12:00
committed by Andrew Bartlett
parent 059e2838c8
commit 5f60c4bf33
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
python/samba/kcc/__init__.py
View File

@ -2207,7 +2207,7 @@ class KCC(object):
# points to us that satisfies the KCC criteria
if tnode.dsa_dnstr == dc_local.dsa_dnstr:
tnode.add_connections_from_edges(dc_local)
tnode.add_connections_from_edges(dc_local, self.ip_transport)
if self.verify or do_dot_files:
dot_edges = []

4
python/samba/kcc/kcc_utils.py
View File

@ -1723,7 +1723,7 @@ class GraphNode(object):
for connect in dsa.connect_table.values():
self.add_edge_from(connect.from_dnstr)
def add_connections_from_edges(self, dsa):
def add_connections_from_edges(self, dsa, transport):
"""For each edge directed to this graph node, ensure there
is a corresponding nTDSConnection object in the dsa.
"""
@ -1760,7 +1760,7 @@ class GraphNode(object):
flags = (dsdb.SYSTEM_FLAG_CONFIG_ALLOW_RENAME |
dsdb.SYSTEM_FLAG_CONFIG_ALLOW_MOVE)
dsa.new_connection(opt, flags, None, edge_dnstr, None)
dsa.new_connection(opt, flags, transport, edge_dnstr, None)
def has_sufficient_edges(self):
'''Return True if we have met the maximum "from edges" criteria'''