summaryrefslogtreecommitdiff
path: root/webapps/install
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-08-31 23:15:03 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:03:21 -0500
commit48029b35201e099aa7bbbe4390b59cfb7a2c6f69 (patch)
treeb3e45410a0213a6ea52e7f87d5f74e9f5c8c917c /webapps/install
parent7fd416bd3e0d9cf602f441c9d4a1750544cba8e5 (diff)
downloadsamba-48029b35201e099aa7bbbe4390b59cfb7a2c6f69.tar.gz
samba-48029b35201e099aa7bbbe4390b59cfb7a2c6f69.tar.bz2
samba-48029b35201e099aa7bbbe4390b59cfb7a2c6f69.zip
r24859: Merge from SAMBA_4_0_RELEASE:
Make the SWAT-based Vampire work again (needs override for default smb.conf values). Andrew Bartlett (This used to be commit e5cd44a018eae1f49e4408049461693350498326)
Diffstat (limited to 'webapps/install')
-rw-r--r--webapps/install/vampire.esp4
1 files changed, 4 insertions, 0 deletions
diff --git a/webapps/install/vampire.esp b/webapps/install/vampire.esp
index e0c895404c..d5b7a73c53 100644
--- a/webapps/install/vampire.esp
+++ b/webapps/install/vampire.esp
@@ -51,7 +51,11 @@ if (session.authinfo.user_class == "ADMINISTRATOR"
}
if (form['submit'] == "Migrate") {
+ /* overcome an initially blank smb.conf */
lp.set("realm", subobj.REALM);
+ lp.set("workgroup", subobj.DOMAIN);
+ lp.reload();
+
if (subobj.ADMINPASS == "") {
write("<h3>We need the administrator password for the " + subobj.DOMAIN + " domain to proceed. Please try again.</h3>");
f.display();