From d949736f8dc02eec180723a55f4604b7b3aa83d8 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sat, 16 Jun 2012 15:34:50 +1000 Subject: s4-classicupgrade: Also ask testparm for 'smb passwd file' --- source4/scripting/python/samba/netcmd/domain.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/scripting') diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py index a5d5e473c9..e4b1241229 100644 --- a/source4/scripting/python/samba/netcmd/domain.py +++ b/source4/scripting/python/samba/netcmd/domain.py @@ -907,9 +907,11 @@ class cmd_domain_classicupgrade(Command): paths["state directory"] = dbdir paths["private dir"] = dbdir paths["lock directory"] = dbdir + paths["smb passwd file"] = dbdir + "/smbpasswd" else: paths["state directory"] = get_testparm_var(testparm, smbconf, "state directory") paths["private dir"] = get_testparm_var(testparm, smbconf, "private dir") + paths["smb passwd file"] = get_testparm_var(testparm, smbconf, "smb passwd file") paths["lock directory"] = get_testparm_var(testparm, smbconf, "lock directory") # "testparm" from Samba 3 < 3.4.x is not aware of the parameter # "state directory", instead make use of "lock directory" -- cgit