diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-06-16 15:34:50 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-06-16 08:18:10 +0200 |
| commit | d949736f8dc02eec180723a55f4604b7b3aa83d8 (patch) | |
| tree | 4370c9651cd8d3b0cc3ac93e7bf57718103f9d55 | |
| parent | a0a2f7999e20ab64dcbfca8299dbf0adfba0dea3 (diff) | |
| download | samba-d949736f8dc02eec180723a55f4604b7b3aa83d8.tar.gz samba-d949736f8dc02eec180723a55f4604b7b3aa83d8.tar.bz2 samba-d949736f8dc02eec180723a55f4604b7b3aa83d8.zip | |
s4-classicupgrade: Also ask testparm for 'smb passwd file'
| -rw-r--r-- | source4/scripting/python/samba/netcmd/domain.py | 2 |
1 files changed, 2 insertions, 0 deletions
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" |