From 0c202e403f72ccb1c7081197e83094498fa390b0 Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Sun, 13 Sep 2009 12:37:41 +0200 Subject: s4/domain behaviour flags: Fix them up in various locations Additional notes: - Bump the level to Windows Server 2008 R2 (we should support always the latest version - if we provision ourself) - In "descriptor.c" the check for the "domainFunctionality" level shouldn't be needed: ACL owner groups (not owner user) are supported since Windows 2000 Server (first AD edition) - I took the argument from: http://support.microsoft.com/kb/329194 --- source4/scripting/python/samba/provision.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'source4/scripting/python') diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 8fef50ca37..cbb747b64f 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -42,8 +42,9 @@ import ldb import shutil from credentials import Credentials, DONT_USE_KERBEROS from auth import system_session, admin_session -from samba import version, Ldb, substitute_var, valid_netbios_name, check_all_substituted, \ - DS_BEHAVIOR_WIN2008 +from samba import version, Ldb, substitute_var, valid_netbios_name +from samba import check_all_substituted +from samba import DS_DOMAIN_FUNCTION_2008_R2, DS_DC_FUNCTION_2008_R2 from samba.samdb import SamDB from samba.idmap import IDmapDB from samba.dcerpc import security @@ -834,9 +835,9 @@ def setup_samdb(path, setup_path, session_info, credentials, lp, :note: This will wipe the main SAM database file! """ - domainFunctionality = DS_BEHAVIOR_WIN2008 - forestFunctionality = DS_BEHAVIOR_WIN2008 - domainControllerFunctionality = DS_BEHAVIOR_WIN2008 + domainFunctionality = DS_DOMAIN_FUNCTION_2008_R2 + forestFunctionality = DS_DOMAIN_FUNCTION_2008_R2 + domainControllerFunctionality = DS_DC_FUNCTION_2008_R2 # Also wipes the database setup_samdb_partitions(path, setup_path, message=message, lp=lp, -- cgit