s4:domainlevel - fixed another error

The second "nTMixedDomain" attribute (under Partitions/Domain-DN) is only a
copy of the one under the directory root object. Therefore there doesn't exist
the "Windows 2000 Mixed" forest level.

diff --git a/source4/setup/domainlevel b/source4/setup/domainlevel
index 9386d199ac514fdb5f19d0dfd923df215fbac786..b49150ff2dafad65a3c92fdc2790e1577bb9ed19 100755 (executable)
--- a/source4/setup/domainlevel
+++ b/source4/setup/domainlevel
@@ -41,7 +41,7 @@ credopts = options.CredentialsOptions(parser)
 parser.add_option_group(credopts)
 parser.add_option("--quiet", help="Be quiet", action="store_true")
 parser.add_option("--forest",
-  help="The forest function level (2000 | 2003 | 2008 | 2008_R2). We don't support mixed/interim (NT4 DC support) levels.", type=str)
+  help="The forest function level (2000 | 2003 | 2008 | 2008_R2). We don't support the 2003 with mixed domains (NT4 DC support) level.", type=str)
 parser.add_option("--domain",
   help="The domain function level (2000 | 2003 | 2008 | 2008_R2). We don't support mixed/interim (NT4 DC support) levels.", type=str)
 opts, args = parser.parse_args()
@@ -69,48 +69,40 @@ res_forest = samdb.search("CN=Partitions,CN=Configuration," + domain_dn,
   scope=ldb.SCOPE_BASE, attrs=["msDS-Behavior-Version"])
 assert(len(res_forest) == 1)
 
-res_forest_mixed = samdb.search("CN=" + lp.get("workgroup") +
-  ",CN=Partitions,CN=Configuration," + domain_dn,
-  scope=ldb.SCOPE_BASE, attrs=["nTMixedDomain"])
-assert(len(res_forest_mixed) == 1)
-
 res_domain = samdb.search(domain_dn, scope=ldb.SCOPE_BASE,
   attrs=["msDS-Behavior-Version", "nTMixedDomain"])
 assert(len(res_domain) == 1)
 
 try:
        level_forest = int(res_forest[0]["msDS-Behavior-Version"][0])
-       level_forest_mixed = int(res_forest_mixed[0]["nTMixedDomain"][0])
        level_domain = int(res_domain[0]["msDS-Behavior-Version"][0])
        level_domain_mixed = int(res_domain[0]["nTMixedDomain"][0])
 
        if level_forest < 0 or level_domain < 0:
                print "ERROR: Domain and/or forest functional level(s) is/are invalid. Correct them or reprovision!"
                sys.exit(1)
-       if level_forest > level_domain or (level_forest_mixed < level_domain_mixed):
+       if level_forest > level_domain:
                print "ERROR: Forest function level is higher than the domain level(s). That can't be. Correct this or reprovision!"
                sys.exit(1)
 except:
-       print "ERROR: Could not retrieve the actual domain and forest level!"
+       print "ERROR: Could not retrieve the actual domain and/or forest level!"
        if args[0] == "show":
                print "So the levels can't be displayed!"
        sys.exit(1)
 
 if args[0] == "show":
        message("Domain and forest function level for domain '" + domain_dn + "'")
-       if (level_forest == DS_DOMAIN_FUNCTION_2000 and level_forest_mixed != 0) or level_forest == DS_DOMAIN_FUNCTION_2003_MIXED:
-               message("\nATTENTION: You run SAMBA 4 on a mixed/interim (NT4 DC support) forest level. This isn't supported! Please raise!")
+       if level_forest == DS_DOMAIN_FUNCTION_2003_MIXED:
+               message("\nATTENTION: You run SAMBA 4 on the 2003 with mixed domains (NT4 DC support) forest level. This isn't supported! Please raise!")
        if (level_domain == DS_DOMAIN_FUNCTION_2000 and level_domain_mixed != 0) or level_domain == DS_DOMAIN_FUNCTION_2003_MIXED:
                message("\nATTENTION: You run SAMBA 4 on a mixed/interim (NT4 DC support) domain level. This isn't supported! Please raise!")
 
        message("")
 
-       if level_forest == DS_DOMAIN_FUNCTION_2000 and level_forest_mixed != 0:
-               outstr = "2000 mixed (NT4 DC support)"
-       elif level_forest == DS_DOMAIN_FUNCTION_2000 and level_forest_mixed == 0:
+       if level_forest == DS_DOMAIN_FUNCTION_2000:
                outstr = "2000"
        elif level_forest == DS_DOMAIN_FUNCTION_2003_MIXED:
-               outstr = "2003 interim (NT4 DC support)"
+               outstr = "2003 with mixed domains/interim (NT4 DC support)"
        elif level_forest == DS_DOMAIN_FUNCTION_2003:
                outstr = "2003"
        elif level_forest == DS_DOMAIN_FUNCTION_2008:
@@ -126,7 +118,7 @@ if args[0] == "show":
        elif level_domain == DS_DOMAIN_FUNCTION_2000 and level_domain_mixed == 0:
                outstr = "2000"
        elif level_domain == DS_DOMAIN_FUNCTION_2003_MIXED:
-               outstr = "2003 interim (NT4 DC support)"
+               outstr = "2003 with mixed domains/interim (NT4 DC support)"
        elif level_domain == DS_DOMAIN_FUNCTION_2003:
                outstr = "2003"
        elif level_domain == DS_DOMAIN_FUNCTION_2008:
@@ -193,7 +185,7 @@ elif args[0] == "raise":
                        print "ERROR: Wrong argument '" + arg + "'!"
                        sys.exit(1)
 
-               if new_level_forest <= level_forest and level_forest_mixed == 0:
+               if new_level_forest <= level_forest:
                        print "ERROR: Forest function level can't be smaller equal to the actual one!"
                        sys.exit(1)
 
@@ -201,15 +193,6 @@ elif args[0] == "raise":
                        print "ERROR: Forest function level can't be higher than the domain function level(s). Please raise it/them first!"
                        sys.exit(1)
 
-               # Deactivate mixed/interim forest support
-               if level_forest_mixed != 0:
-                       m = ldb.Message()
-                       m.dn = ldb.Dn(samdb, "CN=" + lp.get("workgroup")
-                         + ",CN=Partitions,CN=Configuration," + domain_dn)
-                       m["nTMixedDomain"] = ldb.MessageElement("0",
-                         ldb.FLAG_MOD_REPLACE, "nTMixedDomain")
-                       samdb.modify(m)
-
                m = ldb.Message()
                m.dn = ldb.Dn(samdb, "CN=Partitions,CN=Configuration,"
                  + domain_dn)