Attachment 15318 Details for Bug 14046 – This seems to fix the problem

[patch] This seems to fix the problem

fix-windows-join.diff (text/plain), 1.69 KB, created by Tim Beale on 2019-07-23 05:06:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Beale

Created: 2019-07-23 05:06:37 UTC

Size: 1.69 KB

patch

obsolete

>diff --git a/python/samba/join.py b/python/samba/join.py
>index da8dcb0..0fb2a65 100644
>--- a/python/samba/join.py
>+++ b/python/samba/join.py
>@@ -48,6 +48,7 @@ import time
> import re
> import os
> import tempfile
>+from collections import OrderedDict
> from samba.compat import text_type
> from samba.compat import get_string
> from samba.netcmd import CommandError
>@@ -551,11 +552,11 @@ class DCJoinContext(object):
>         '''return the ntdsdsa object to add'''
> 
>         print("Adding %s" % ctx.ntds_dn)
>-        rec = {
>-            "dn": ctx.ntds_dn,
>-            "objectclass": "nTDSDSA",
>-            "systemFlags": str(samba.dsdb.SYSTEM_FLAG_DISALLOW_MOVE_ON_DELETE),
>-            "dMDLocation": ctx.schema_dn}
>+        rec = OrderedDict([
>+            ("dn", ctx.ntds_dn),
>+            ("objectclass", "nTDSDSA"),
>+            ("systemFlags", str(samba.dsdb.SYSTEM_FLAG_DISALLOW_MOVE_ON_DELETE)),
>+            ("dMDLocation", ctx.schema_dn)])
> 
>         nc_list = [ctx.base_dn, ctx.config_dn, ctx.schema_dn]
> 
>@@ -571,12 +572,15 @@ class DCJoinContext(object):
>             rec["options"] = "37"
>         else:
>             rec["objectCategory"] = "CN=NTDS-DSA,%s" % ctx.schema_dn
>+
>+            if ctx.behavior_version >= samba.dsdb.DS_DOMAIN_FUNCTION_2003:
>+                rec["msDS-HasMasterNCs"] = ctx.full_nc_list
>+
>             rec["HasMasterNCs"]      = []
>             for nc in nc_list:
>                 if nc in ctx.full_nc_list:
>                     rec["HasMasterNCs"].append(nc)
>-            if ctx.behavior_version >= samba.dsdb.DS_DOMAIN_FUNCTION_2003:
>-                rec["msDS-HasMasterNCs"] = ctx.full_nc_list
>+
>             rec["options"] = "1"
>             rec["invocationId"] = ndr_pack(ctx.invocation_id)
>

Actions: View

Attachments on bug 14046: 15318 | 15329