diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-11-16 07:41:54 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-11-15 22:28:16 +0000 |
| commit | 6ff009cacca7f62fc1b67270fb2bee4f20906c70 (patch) | |
| tree | 49f4d1fda3b4c4838370cc51999a75d4f9472ac2 | |
| parent | 10a1606baf69addd2d3a079ab007ebb6beffb55d (diff) | |
| download | samba-6ff009cacca7f62fc1b67270fb2bee4f20906c70.tar.gz samba-6ff009cacca7f62fc1b67270fb2bee4f20906c70.tar.bz2 samba-6ff009cacca7f62fc1b67270fb2bee4f20906c70.zip | |
s4-join: not all versions of w2003 have msDS-SupportedEncryptionTypes
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Mon Nov 15 22:28:16 UTC 2010 on sn-devel-104
| -rw-r--r-- | source4/scripting/python/samba/join.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/join.py b/source4/scripting/python/samba/join.py index bdd63db718..45c79549e0 100644 --- a/source4/scripting/python/samba/join.py +++ b/source4/scripting/python/samba/join.py @@ -303,7 +303,7 @@ class dc_join: "samaccountname" : ctx.samname, "userAccountControl" : str(ctx.userAccountControl), "dnshostname" : ctx.dnshostname} - if ctx.behavior_version >= samba.dsdb.DS_DOMAIN_FUNCTION_2003: + if ctx.behavior_version >= samba.dsdb.DS_DOMAIN_FUNCTION_2008: rec['msDS-SupportedEncryptionTypes'] = str(samba.dsdb.ENC_ALL_TYPES) if ctx.managedby: rec["managedby"] = ctx.managedby @@ -335,8 +335,10 @@ class dc_join: "systemFlags" : str(samba.dsdb.SYSTEM_FLAG_DISALLOW_MOVE_ON_DELETE), "dMDLocation" : ctx.schema_dn} - if ctx.behavior_version >= samba.dsdb.DS_DOMAIN_FUNCTION_2003: + if ctx.behavior_version >= samba.dsdb.DS_DOMAIN_FUNCTION_2008: rec["msDS-Behavior-Version"] = str(ctx.behavior_version) + + if ctx.behavior_version >= samba.dsdb.DS_DOMAIN_FUNCTION_2003: rec["msDS-HasDomainNCs"] = ctx.base_dn if ctx.RODC: |