diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-06-21 21:41:49 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-06-23 20:10:07 +1000 |
| commit | 86ed5eb8923e477f3336cbf4a0bedb69b2f3c288 (patch) | |
| tree | f28f87bd18ec23b00b229939b7562bd81e39a3d4 /source4/scripting | |
| parent | d0f52ddac23a0b1af3718627af00469ae13ab762 (diff) | |
| download | samba-86ed5eb8923e477f3336cbf4a0bedb69b2f3c288.tar.gz samba-86ed5eb8923e477f3336cbf4a0bedb69b2f3c288.tar.bz2 samba-86ed5eb8923e477f3336cbf4a0bedb69b2f3c288.zip | |
s4:net Remove warnings for 2000 native mode and Samba4.
We now support 2000 native mode, and so we just need to warn about mixed mode.
Andrew Bartlett
Diffstat (limited to 'source4/scripting')
| -rw-r--r-- | source4/scripting/python/samba/netcmd/domainlevel.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/scripting/python/samba/netcmd/domainlevel.py b/source4/scripting/python/samba/netcmd/domainlevel.py index 69e0afb600..7953ee6d04 100644 --- a/source4/scripting/python/samba/netcmd/domainlevel.py +++ b/source4/scripting/python/samba/netcmd/domainlevel.py @@ -111,11 +111,11 @@ class cmd_domainlevel(Command): if subcommand == "show": self.message("Domain and forest function level for domain '%s'" % domain_dn) - if level_forest < DS_DOMAIN_FUNCTION_2003: - 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_DOMAIN_FUNCTION_2003: + if level_forest == DS_DOMAIN_FUNCTION_2000 and level_domain_mixed != 0: + self.message("\nATTENTION: You run SAMBA 4 on a forest function level lower than Windows 2000 (Native). This isn't supported! Please raise!") + if level_domain == DS_DOMAIN_FUNCTION_2000 and level_domain_mixed != 0: + self.message("\nATTENTION: You run SAMBA 4 on a domain function level lower than Windows 2000 (Native). This isn't supported! Please raise!") + if min_level_dc == DS_DOMAIN_FUNCTION_2000 and level_domain_mixed != 0: 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("") |