summaryrefslogtreecommitdiff
path: root/swat/install
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-20 10:07:48 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:29:48 -0500
commit2f5f01567b4c30cd764843a1ca0c7ab6d9bc0882 (patch)
tree52876d17edf8162d20c8da7c1761cd0fbb0e0db1 /swat/install
parent238a7e2f4c46f5bb586bcef36f39e1bf6749c2c1 (diff)
downloadsamba-2f5f01567b4c30cd764843a1ca0c7ab6d9bc0882.tar.gz
samba-2f5f01567b4c30cd764843a1ca0c7ab6d9bc0882.tar.bz2
samba-2f5f01567b4c30cd764843a1ca0c7ab6d9bc0882.zip
r8643: - make lp_configfile() work again
- get rid of redundeny dyn_CONFIGFILE argument to lp_load() - fixed provisioning to work with completely pristine install, creating an initial smb.conf is none is present - added lp.set() and lp.reload() to loadparm ejs object interface (This used to be commit c2691ef7126ddcee5f95970b78759b40a049d0a7)
Diffstat (limited to 'swat/install')
-rw-r--r--swat/install/provision.esp13
1 files changed, 12 insertions, 1 deletions
diff --git a/swat/install/provision.esp b/swat/install/provision.esp
index 5c0aa4e77e..3eb7ba720d 100644
--- a/swat/install/provision.esp
+++ b/swat/install/provision.esp
@@ -8,7 +8,15 @@
<%
var f = FormObj("Provisioning", 9, 2);
-var i, subobj = provision_guess();
+var i;
+var lp = loadparm_init();
+
+if (lp.get("realm") == "") {
+ lp.set("realm", lp.get("workgroup") + ".example.com");
+}
+
+
+var subobj = provision_guess();
f.element[0].label = "Realm";
f.element[0].name = "REALM";
@@ -44,6 +52,9 @@ if (form['submit'] == "Provision") {
for (i=0;i<f.element.length;i++) {
f.element[i].value = subobj[f.element[i].name];
}
+
+lp.set("realm", subobj.REALM);
+
if (form['submit'] == "Provision") {
provision(subobj, writefln);
} else {