sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-02 20:59:09 +03:00
Code Activity

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

Browse Source 
(Remove unneeded "upper"s)
This commit is contained in:
Matthias Dieter Wallnöfer
2009-10-12 19:21:55 +02:00
parent 8b67e1ab70
commit 9000b7bb94
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source4/scripting/python/samba/provision.py
View File

@ -429,7 +429,7 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=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")
@ -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))
dnsdomain = dnsdomain.lower()
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()
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)
if hostname.upper() == realm.upper():
if hostname.upper() == realm:
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: