s4:provision.py - simplify the "realm" variable handling a bit

(Remove unneeded "upper"s)

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 509f13d980748f94341ac9ac446883c75e2215c2..bf2e22046a927125da45ba779b06a006f1621475 100644 (file)
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -429,7 +429,7 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None,
     hostname = hostname.lower()
 
     if dnsdomain is None:
     hostname = hostname.lower()
 
     if dnsdomain is None:

-        dnsdomain = lp.get("realm")
+        dnsdomain = lp.get("realm").lower()

 
     if serverrole is None:
         serverrole = lp.get("server role")
 
     if serverrole is None:
         serverrole = lp.get("server role")


@@ -441,8 +441,6 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None,
         raise Exception("realm '%s' in %s must match chosen realm '%s'" %
                         (lp.get("realm"), lp.configfile, realm))
     
         raise Exception("realm '%s' in %s must match chosen realm '%s'" %
                         (lp.get("realm"), lp.configfile, realm))
     

-    dnsdomain = dnsdomain.lower()
-

     if serverrole == "domain controller":
         if domain is None:
             domain = lp.get("workgroup")
     if serverrole == "domain controller":
         if domain is None:
             domain = lp.get("workgroup")


@@ -458,16 +456,17 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None,
         
     assert domain is not None
     domain = domain.upper()
         
     assert domain is not None
     domain = domain.upper()

+

     if not valid_netbios_name(domain):
         raise InvalidNetbiosName(domain)
         
     if not valid_netbios_name(domain):
         raise InvalidNetbiosName(domain)
         

-    if netbiosname.upper() == realm.upper():
+    if netbiosname.upper() == realm:

         raise Exception("realm %s must not be equal to netbios domain name %s", realm, netbiosname)
         
         raise Exception("realm %s must not be equal to netbios domain name %s", realm, netbiosname)
         

-    if hostname.upper() == realm.upper():
+    if hostname.upper() == realm:

         raise Exception("realm %s must not be equal to hostname %s", realm, hostname)
         
         raise Exception("realm %s must not be equal to hostname %s", realm, hostname)
         

-    if domain.upper() == realm.upper():
+    if domain.upper() == realm:

         raise Exception("realm %s must not be equal to domain name %s", realm, domain)
 
     if rootdn is None:
         raise Exception("realm %s must not be equal to domain name %s", realm, domain)
 
     if rootdn is None: