svn commit: samba r24859 - in branches/SAMBA_4_0/webapps/install: .
abartlet at samba.org
abartlet at samba.org
Fri Aug 31 23:15:04 GMT 2007
Author: abartlet
Date: 2007-08-31 23:15:03 +0000 (Fri, 31 Aug 2007)
New Revision: 24859
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24859
Log:
Merge from SAMBA_4_0_RELEASE:
Make the SWAT-based Vampire work again (needs override for default
smb.conf values).
Andrew Bartlett
Modified:
branches/SAMBA_4_0/webapps/install/vampire.esp
Changeset:
Modified: branches/SAMBA_4_0/webapps/install/vampire.esp
===================================================================
--- branches/SAMBA_4_0/webapps/install/vampire.esp 2007-08-31 23:13:18 UTC (rev 24858)
+++ branches/SAMBA_4_0/webapps/install/vampire.esp 2007-08-31 23:15:03 UTC (rev 24859)
@@ -51,7 +51,11 @@
}
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();
More information about the samba-cvs
mailing list