From 86ed5eb8923e477f3336cbf4a0bedb69b2f3c288 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 21 Jun 2010 21:41:49 +1000 Subject: 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 --- source4/scripting/python/samba/netcmd/domainlevel.py | 10 +++++----- 1 file 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("") -- cgit