1
0
mirror of https://github.com/samba-team/samba.git synced 2025-11-21 12:23:50 +03:00

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 commit is contained in:
Andrew Tridgell
2005-07-20 10:07:48 +00:00
committed by Gerald (Jerry) Carter
parent 760cc6bea5
commit c2691ef712
18 changed files with 104 additions and 33 deletions

View File

@@ -169,7 +169,7 @@ function setup_ldb(ldif, dbname, subobj)
function setup_file(template, fname, subobj)
{
var lp = loadparm_init();
var f = lp.get("private dir") + "/" + fname;
var f = fname;
var src = lp.get("setup directory") + "/" + template;
sys.unlink(f);
@@ -187,6 +187,9 @@ function setup_file(template, fname, subobj)
function provision(subobj, message)
{
var data = "";
var lp = loadparm_init();
var sys = sys_init();
var smbconf = lp.get("config file");
/*
some options need to be upper/lower case
@@ -204,6 +207,13 @@ function provision(subobj, message)
provision_next_usn = 1;
/* only install a new smb.conf if there isn't one there already */
var st = sys.stat(smbconf);
if (st == undefined) {
message("Setting up smb.conf\n");
setup_file("provision.smb.conf", smbconf, subobj);
lp.reload();
}
message("Setting up hklm.ldb\n");
setup_ldb("hklm.ldif", "hklm.ldb", subobj);
message("Setting up sam.ldb\n");
@@ -213,7 +223,9 @@ function provision(subobj, message)
message("Setting up secrets.ldb\n");
setup_ldb("secrets.ldif", "secrets.ldb", subobj);
message("Setting up DNS zone file\n");
setup_file("provision.zone", subobj.DNSDOMAIN + ".zone", subobj);
setup_file("provision.zone",
lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".zone",
subobj);
}
/*
@@ -229,6 +241,11 @@ function provision_guess()
subobj.REALM = lp.get("realm");
subobj.DOMAIN = lp.get("workgroup");
subobj.HOSTNAME = hostname();
assert(subobj.REALM);
assert(subobj.DOMAIN);
assert(subobj.HOSTNAME);
subobj.HOSTIP = hostip();
subobj.DOMAINGUID = randguid();
subobj.DOMAINSID = randsid();