summaryrefslogtreecommitdiff
path: root/swat
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-08-31 02:39:57 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:35:04 -0500
commitf58a74aabab3d5c0d1185ac2f77a5f54feb781e9 (patch)
tree79d531450d96f07da379fdd72fb40d1221570627 /swat
parent40f85ace04abad7460d0f0afe9211c4280482c6c (diff)
downloadsamba-f58a74aabab3d5c0d1185ac2f77a5f54feb781e9.tar.gz
samba-f58a74aabab3d5c0d1185ac2f77a5f54feb781e9.tar.bz2
samba-f58a74aabab3d5c0d1185ac2f77a5f54feb781e9.zip
r9816: Work on testsuite for upgrade
Add 'paths' object to provision code. (This used to be commit 488d737fb0ebbc2535d0ec17c14f0dc1eaf2a578)
Diffstat (limited to 'swat')
-rw-r--r--swat/install/provision.esp2
-rw-r--r--swat/install/samba3.esp10
2 files changed, 9 insertions, 3 deletions
diff --git a/swat/install/provision.esp b/swat/install/provision.esp
index 714b498b22..de823ddcde 100644
--- a/swat/install/provision.esp
+++ b/swat/install/provision.esp
@@ -59,7 +59,7 @@ if (form['submit'] == "Provision") {
write("<h3>You must choose an administrator password. Please try again.</h3>");
f.display();
} else {
- provision(subobj, writefln, false);
+ provision(subobj, writefln, false, provision_default_paths(subobj));
}
} else {
f.display();
diff --git a/swat/install/samba3.esp b/swat/install/samba3.esp
index 729dcc74fd..5228ca6f86 100644
--- a/swat/install/samba3.esp
+++ b/swat/install/samba3.esp
@@ -53,8 +53,14 @@ if (form['submit'] == "Import") {
for (r in form) {
subobj[r] = form[r];
}
- provision(subobj, writefln, true);
- upgrade(subobj, samba3, writefln);
+ var paths = provision_default_paths(subobj);
+
+ provision(subobj, writefln, true, paths);
+ upgrade(subobj, samba3, writefln, paths);
+
+ writefln("Reloading smb.conf\n");
+ var lp = loadparm_init();
+ lp.reload();
} else {
var f = FormObj("Import from Samba3", 0, 2);