sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-25 06:04:04 +03:00
Code

KCC: ignore the bridges_required option

Browse Source 
At least until we have SiteLinkBridges to test against.

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-05-13 13:58:15 +12:00 committed by Andrew Bartlett
parent 430b0896f2
commit dcf582ae31
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
python/samba/kcc/debug.py
View File

@ -26,6 +26,7 @@ import traceback
logger = logging.getLogger("samba_kcc")
logger.addHandler(logging.StreamHandler(sys.stdout))
DEBUG = logger.debug
WARN = logger.warning
#colours for prettier logs

21
python/samba/kcc/graph.py
View File

@ -26,7 +26,7 @@ from samba.kcc.graph_utils import write_dot_file, verify_and_dot, verify_graph
from samba.ndr import ndr_pack
from samba.dcerpc import misc
from samba.kcc.debug import DEBUG, DEBUG_FN
from samba.kcc.debug import DEBUG, DEBUG_FN, WARN
MAX_DWORD = 2 ** 32 - 1
@ -665,8 +665,8 @@ def setup_graph(part, site_table, transport_guid, sitelink_table,
:param site_table: a mapping of guids to sites (KCC.site_table)
:param transport_guid: the GUID of the IP transport
:param sitelink_table: a mapping of dnstrs to sitelinks
:param bridges_required: boolean
:param bridges_required: boolean, asking in vain for something to do
with site link bridges
:return: a new IntersiteGraph
"""
guid_to_vertex = {}
@ -689,19 +689,12 @@ def setup_graph(part, site_table, transport_guid, sitelink_table,
connected_vertices.update(new_edge.vertices)
g.edges.add(new_edge)
# If 'Bridge all site links' is enabled and Win2k3 bridges required
# is not set
# NTDSTRANSPORT_OPT_BRIDGES_REQUIRED 0x00000002
# No documentation for this however, ntdsapi.h appears to have:
# NTDSSETTINGS_OPT_W2K3_BRIDGES_REQUIRED = 0x00001000
# XXX we are ignoring the bridges_required option and indeed the
# whole concept of SiteLinkBridge objects.
if bridges_required:
g.edge_set.add(create_auto_edge_set(g, transport_guid))
else:
# TODO get all site link bridges
for site_link_bridge in []:
g.edge_set.add(create_edge_set(g, transport_guid,
site_link_bridge))
WARN("Samba KCC ignores the bridges required option")
g.edge_set.add(create_auto_edge_set(g, transport_guid))
g.connected_vertices = connected_vertices
return g