s4-provision Add an invalid names check for 'domain == netbiosname'

(This is also invalid)

Andrew Bartlett

diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index 7f1969924a7b0e351f7565d9d80d7a034c3ed515..3e402b2fd5da0b1b147840c0ee5b91216a1db691 100644 (file)
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -515,6 +515,9 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None,
 
         if domaindn is None:
             domaindn = "DC=" + dnsdomain.replace(".", ",DC=")
+
+        if domain == netbiosname:
+            raise ProvisioningError("guess_names: Domain '%s' must not be equal to short host name '%s'!" % (domain, netbiosname))
     else:
         domain = netbiosname
         if domaindn is None:
@@ -525,7 +528,7 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None,
 
     if hostname.upper() == realm:
         raise ProvisioningError("guess_names: Realm '%s' must not be equal to hostname '%s'!" % (realm, hostname))
-    if netbiosname == realm:
+    if netbiosname.upper() == realm:
         raise ProvisioningError("guess_names: Realm '%s' must not be equal to netbios hostname '%s'!" % (realm, netbiosname))
     if domain == realm:
         raise ProvisioningError("guess_names: Realm '%s' must not be equal to short domain name '%s'!" % (realm, domain))