s4-classicupgrade: Also ask testparm for 'smb passwd file'
authorAndrew Bartlett <abartlet@samba.org>
Sat, 16 Jun 2012 05:34:50 +0000 (15:34 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 16 Jun 2012 06:18:10 +0000 (08:18 +0200)
source4/scripting/python/samba/netcmd/domain.py

index a5d5e473c99a7002f36f1c1a7140e26dfe3ba73c..e4b1241229a5cede1120d9dc40651afe3b1c9a85 100644 (file)
@@ -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"