From: Matthieu Patou Date: Mon, 8 Feb 2010 12:36:07 +0000 (+0300) Subject: provision: Fix an error with eadb when using not default install dir and running... X-Git-Tag: samba-3.6.0pre1~5453 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1c29231511376f4379909401f723b1ea9c538ea;p=thirdparty%2Fsamba.git provision: Fix an error with eadb when using not default install dir and running as a non root user Signed-off-by: Matthias Dieter Wallnöfer --- diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 86f1d9cb070..27e5287457b 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -465,7 +465,11 @@ def make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole, if os.path.exists(smbconf): default_lp.load(smbconf) if eadb: - posixeadb_line = "posix:eadb = " + os.path.abspath(os.path.join(os.path.join(targetdir, "private"),"eadb.tdb")) + if targetdir is not None: + privdir = os.path.join(targetdir, "private") + else: + privdir = default_lp.get("private dir") + posixeadb_line = "posix:eadb = " + os.path.abspath(os.path.join(privdir,"eadb.tdb")) else: posixeadb_line = ""