From 0ffb4e6f6f1db61bf4f2ec73c1cad5e102787f67 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Fri, 19 Aug 2011 12:30:19 +1000 Subject: python-samba3: Secrets file loaded from private dir, not lib dir Signed-off-by: Andrew Bartlett --- source4/scripting/python/samba/samba3/__init__.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'source4/scripting/python/samba/samba3') diff --git a/source4/scripting/python/samba/samba3/__init__.py b/source4/scripting/python/samba/samba3/__init__.py index f5dde44aa0..385d9331ec 100644 --- a/source4/scripting/python/samba/samba3/__init__.py +++ b/source4/scripting/python/samba/samba3/__init__.py @@ -754,12 +754,18 @@ class Samba3(object): self.libdir = libdir self.lp = ParamFile() self.lp.read(self.smbconfpath) + self.privatedir = self.lp.get("private dir") or libdir def libdir_path(self, path): if path[0] == "/" or path[0] == ".": return path return os.path.join(self.libdir, path) + def privatedir_path(self, path): + if path[0] == "/" or path[0] == ".": + return path + return os.path.join(self.privatedir, path) + def get_conf(self): return self.lp @@ -789,7 +795,7 @@ class Samba3(object): return Registry(self.libdir_path("registry.tdb")) def get_secrets_db(self): - return SecretsDatabase(self.libdir_path("secrets.tdb")) + return SecretsDatabase(self.privatedir_path("secrets.tdb")) def get_shareinfo_db(self): return ShareInfoDatabase(self.libdir_path("share_info.tdb")) -- cgit