From f58a74aabab3d5c0d1185ac2f77a5f54feb781e9 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 31 Aug 2005 02:39:57 +0000
Subject: r9816: Work on testsuite for upgrade Add 'paths' object to provision
 code. (This used to be commit 488d737fb0ebbc2535d0ec17c14f0dc1eaf2a578)

---
 swat/install/provision.esp |  2 +-
 swat/install/samba3.esp    | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'swat/install')

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);
 
-- 
cgit