diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-09-15 10:02:04 -0700 | 
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-09-15 10:02:04 -0700 | 
| commit | efe9f952504a5a3114cada5f0caed315c4bc654d (patch) | |
| tree | 158ae6f521152da00b0bd008aaef2a84e6656259 /source4/scripting/python | |
| parent | 5464ce6df678a6ce3022f4a30fd9553996cefb69 (diff) | |
| parent | 8fa5e567e76d4edb818d4cd88886918470d78ad1 (diff) | |
| download | samba-efe9f952504a5a3114cada5f0caed315c4bc654d.tar.gz samba-efe9f952504a5a3114cada5f0caed315c4bc654d.tar.bz2 samba-efe9f952504a5a3114cada5f0caed315c4bc654d.zip | |
Merge branch 'master' of /home/tridge/samba/git/combined
Diffstat (limited to 'source4/scripting/python')
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 9 | 
1 files changed, 9 insertions, 0 deletions
| diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index e21a3cbee1..8f7859c215 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -421,6 +421,15 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None,      if not valid_netbios_name(domain):          raise InvalidNetbiosName(domain) +    if netbiosname.upper() == realm.upper(): +        raise Exception("realm %s must not be equal to netbios domain name %s", realm, netbiosname) +         +    if hostname.upper() == realm.upper(): +        raise Exception("realm %s must not be equal to hostname %s", realm, hostname) +         +    if domain.upper() == realm.upper(): +        raise Exception("realm %s must not be equal to domain name %s", realm, domain) +      if rootdn is None:         rootdn = domaindn | 
