From 48029b35201e099aa7bbbe4390b59cfb7a2c6f69 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 31 Aug 2007 23:15:03 +0000
Subject: 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)
---
 webapps/install/vampire.esp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'webapps')

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