diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-06-21 21:40:15 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-06-23 20:10:06 +1000 |
| commit | d0f52ddac23a0b1af3718627af00469ae13ab762 (patch) | |
| tree | 9af2c5993f1ffe865ab51a8dd5bf648027d506e6 | |
| parent | b26125b7d3242895038065ddece32554436ba474 (diff) | |
| download | samba-d0f52ddac23a0b1af3718627af00469ae13ab762.tar.gz samba-d0f52ddac23a0b1af3718627af00469ae13ab762.tar.bz2 samba-d0f52ddac23a0b1af3718627af00469ae13ab762.zip | |
s4:provision Raise default max functional level to 2008R2
We don't support many of the extra features, but that applies across many
other parts of AD. Allow the admin to join a 2008R2 domain if he or she wants.
This also makes it possible to test 2008R2 domain code in 'make test'
Andrew Bartlett
| -rw-r--r-- | source4/libnet/libnet_become_dc.c | 4 | ||||
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c index 25a216524e..833f5d3bd6 100644 --- a/source4/libnet/libnet_become_dc.c +++ b/source4/libnet/libnet_become_dc.c @@ -739,9 +739,9 @@ struct libnet_BecomeDC_state { static int32_t get_dc_function_level(struct loadparm_context *lp_ctx) { - /* per default we are (Windows) 2008 compatible */ + /* per default we are (Windows) 2008 R2 compatible */ return lp_parm_int(lp_ctx, NULL, "ads", "dc function level", - DS_DOMAIN_FUNCTION_2008); + DS_DOMAIN_FUNCTION_2008_R2); } static void becomeDC_recv_cldap(struct tevent_req *req); diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 5bd2d0bcc2..a3ff891e5d 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -43,7 +43,7 @@ from samba.auth import system_session, admin_session import samba from samba import version, Ldb, substitute_var, valid_netbios_name from samba import check_all_substituted, read_and_sub_file, setup_file -from samba.dsdb import DS_DOMAIN_FUNCTION_2003, DS_DOMAIN_FUNCTION_2008 +from samba.dsdb import DS_DOMAIN_FUNCTION_2003, DS_DOMAIN_FUNCTION_2008_R2 from samba.dcerpc import security from samba.dcerpc.misc import SEC_CHAN_BDC, SEC_CHAN_WKSTA from samba.idmap import IDmapDB @@ -955,13 +955,13 @@ def setup_samdb(path, setup_path, session_info, provision_backend, lp, names, # ATTENTION: Do NOT change these default values without discussion with the # team and/or release manager. They have a big impact on the whole program! - domainControllerFunctionality = DS_DOMAIN_FUNCTION_2008 + domainControllerFunctionality = DS_DOMAIN_FUNCTION_2008_R2 if dom_for_fun_level is None: dom_for_fun_level = DS_DOMAIN_FUNCTION_2003 if dom_for_fun_level > domainControllerFunctionality: - raise ProvisioningError("You want to run SAMBA 4 on a domain and forest function level which itself is higher than its actual DC function level (2008). This won't work!") + raise ProvisioningError("You want to run SAMBA 4 on a domain and forest function level which itself is higher than its actual DC function level (2008_R2). This won't work!") domainFunctionality = dom_for_fun_level forestFunctionality = dom_for_fun_level |