diff options
Diffstat (limited to 'source4/scripting/python')
| -rw-r--r-- | source4/scripting/python/samba/provision/__init__.py | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py index f9def76710..df00fc09ad 100644 --- a/source4/scripting/python/samba/provision/__init__.py +++ b/source4/scripting/python/samba/provision/__init__.py @@ -526,7 +526,7 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None,          raise ProvisioningError("guess_names: 'realm=%s' in %s must match chosen realm '%s'!  Please remove the smb.conf file and let provision generate it" % (lp.get("realm").upper(), realm, lp.configfile))      if lp.get("server role").lower() != serverrole: -        raise ProvisioningError("guess_names: 'server role=%s' in %s must match chosen server role '%s'!  Please remove the smb.conf file and let provision generate it" % (lp.get("server role"), serverrole, lp.configfile)) +        raise ProvisioningError("guess_names: 'server role=%s' in %s must match chosen server role '%s'!  Please remove the smb.conf file and let provision generate it" % (lp.get("server role"), lp.configfile, serverrole))      if serverrole == "domain controller":          if domain is None: @@ -566,7 +566,7 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None,          schemadn = "CN=Schema," + configdn      if sitename is None: -        sitename=DEFAULTSITE +        sitename = DEFAULTSITE      names = ProvisionNames()      names.rootdn = rootdn | 
