sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-15 16:59:09 +03:00
Code Activity

python-samba3: Secrets file loaded from private dir, not lib dir

Browse Source 
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Amitay Isaacs
2011-08-19 12:30:19 +10:00
committed by Andrew Bartlett
parent dadaca01d2
commit 0ffb4e6f6f
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source4/scripting/python/samba/samba3/__init__.py
View File

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

2
source4/scripting/python/samba/upgrade.py
View File

@ -535,7 +535,7 @@ def upgrade_from_samba3(samba3, logger, session_info, smbconf, targetdir):
# We must close the direct pytdb database before the C code loads it
secrets_db.close()
passdb.set_secrets_dir(samba3.libdir)
passdb.set_secrets_dir(samba3.privatedir)
# Get domain sid
try: