summaryrefslogtreecommitdiff
path: root/source4/setup
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-17 23:16:12 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:51:23 +0100
commit57b8a8fd42f5d89f439fd9d0781bd8f561a84131 (patch)
tree618faeb3402cfd7c7d01e03f12f1ebdb1f4df1c5 /source4/setup
parentc619f86efc4f502f7127a1fd2ac165dd970658f9 (diff)
downloadsamba-57b8a8fd42f5d89f439fd9d0781bd8f561a84131.tar.gz
samba-57b8a8fd42f5d89f439fd9d0781bd8f561a84131.tar.bz2
samba-57b8a8fd42f5d89f439fd9d0781bd8f561a84131.zip
r26517: Add functions for setting and getting parameters on a LoadParm.
Pass loadparm context along to Ldb contexts. Other minor Python improvements. (This used to be commit 7a15b486bae8fb774058b2d94cc12b7b01ee6ac0)
Diffstat (limited to 'source4/setup')
-rwxr-xr-xsource4/setup/provision.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/setup/provision.py b/source4/setup/provision.py
index 5a92ac7e8e..d00cb15ebd 100755
--- a/source4/setup/provision.py
+++ b/source4/setup/provision.py
@@ -115,11 +115,11 @@ if opts.realm is None or opts.domain is None or opts.host_name is None:
sys.exit(1)
# cope with an initially blank smb.conf
-lp = param.ParamFile()
-lp.read(opts.configfile)
-lp.set_string("realm", opts.realm)
-lp.set_string("workgroup", opts.domain)
-lp.set_string("server role", opts.server_role)
+lp = param.LoadParm()
+lp.load(opts.configfile)
+lp.set("realm", opts.realm)
+lp.set("workgroup", opts.domain)
+lp.set("server role", opts.server_role)
subobj = provision_guess(lp)
subobj.domain_guid = opts.domain_guid
@@ -162,7 +162,7 @@ if opts.ldap_base:
message("Please install the LDIF located in %s, %s and into your LDAP server, and re-run with --ldap-backend=ldap://my.ldap.server" % (paths.ldap_basedn_ldif, paths.ldap_config_basedn_ldif, paths.ldap_schema_basedn_ldif))
elif opts.partitions_only:
provision_become_dc(setup_dir, subobj, message, False,
- paths, system_session(), creds)
+ paths, lp, system_session(), creds)
else:
provision(lp, setup_dir, subobj, message, opts.blank, paths,
system_session(), creds, opts.ldap_backend)