diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-06-21 20:19:02 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-06-23 20:10:03 +1000 |
| commit | c4482bf53e26c43edccb0871fa5525a590a1026c (patch) | |
| tree | 37364ab94d8501b268a3ebd0bc213782f6066c4c /source4/scripting | |
| parent | 80701e5f29567e4ad75a66eb6c8711f817b361b8 (diff) | |
| download | samba-c4482bf53e26c43edccb0871fa5525a590a1026c.tar.gz samba-c4482bf53e26c43edccb0871fa5525a590a1026c.tar.bz2 samba-c4482bf53e26c43edccb0871fa5525a590a1026c.zip | |
libds:common Remove DS_DC_* domain functionality flags
These are just a subset of the DS_DOMAIN_ functionality flags, are compared and often confused with each other. Just make them one set.
Andrew Bartlett
Diffstat (limited to 'source4/scripting')
| -rw-r--r-- | source4/scripting/python/samba/netcmd/domainlevel.py | 14 | ||||
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 4 |
2 files changed, 7 insertions, 11 deletions
diff --git a/source4/scripting/python/samba/netcmd/domainlevel.py b/source4/scripting/python/samba/netcmd/domainlevel.py index 4278ae5e4a..69e0afb600 100644 --- a/source4/scripting/python/samba/netcmd/domainlevel.py +++ b/source4/scripting/python/samba/netcmd/domainlevel.py @@ -40,10 +40,6 @@ from samba.dsdb import ( DS_DOMAIN_FUNCTION_2003_MIXED, DS_DOMAIN_FUNCTION_2008, DS_DOMAIN_FUNCTION_2008_R2, - DS_DC_FUNCTION_2000, - DS_DC_FUNCTION_2003, - DS_DC_FUNCTION_2008, - DS_DC_FUNCTION_2008_R2, ) class cmd_domainlevel(Command): @@ -119,7 +115,7 @@ class cmd_domainlevel(Command): self.message("\nATTENTION: You run SAMBA 4 on a forest function level lower than Windows 2003 (Native). This isn't supported! Please raise!") if level_domain < DS_DOMAIN_FUNCTION_2003: self.message("\nATTENTION: You run SAMBA 4 on a domain function level lower than Windows 2003 (Native). This isn't supported! Please raise!") - if min_level_dc < DS_DC_FUNCTION_2003: + if min_level_dc < DS_DOMAIN_FUNCTION_2003: self.message("\nATTENTION: You run SAMBA 4 on a lowest function level of a DC lower than Windows 2003. This isn't supported! Please step-up or upgrade the concerning DC(s)!") self.message("") @@ -154,13 +150,13 @@ class cmd_domainlevel(Command): outstr = "higher than 2008 R2" self.message("Domain function level: (Windows) " + outstr) - if min_level_dc == DS_DC_FUNCTION_2000: + if min_level_dc == DS_DOMAIN_FUNCTION_2000: outstr = "2000" - elif min_level_dc == DS_DC_FUNCTION_2003: + elif min_level_dc == DS_DOMAIN_FUNCTION_2003: outstr = "2003" - elif min_level_dc == DS_DC_FUNCTION_2008: + elif min_level_dc == DS_DOMAIN_FUNCTION_2008: outstr = "2008" - elif min_level_dc == DS_DC_FUNCTION_2008_R2: + elif min_level_dc == DS_DOMAIN_FUNCTION_2008_R2: outstr = "2008 R2" else: outstr = "higher than 2008 R2" diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index cfba780baf..1b7cfca64d 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_DC_FUNCTION_2008 +from samba.dsdb import DS_DOMAIN_FUNCTION_2003, DS_DOMAIN_FUNCTION_2008 from samba.dcerpc import security from samba.dcerpc.misc import SEC_CHAN_BDC, SEC_CHAN_WKSTA from samba.idmap import IDmapDB @@ -955,7 +955,7 @@ 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_DC_FUNCTION_2008 + domainControllerFunctionality = DS_DOMAIN_FUNCTION_2008 if dom_for_fun_level is None: dom_for_fun_level = DS_DOMAIN_FUNCTION_2003 |