sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

provision: Fix order for error formatting.

Browse Source
This commit is contained in:
Jelmer Vernooij 2012-02-26 22:09:44 +01:00
parent e27e519bb8
commit 3bfccdfbc8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source4/scripting/python/samba/provision/__init__.py
View File

@ -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