diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-02-09 14:13:58 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-02-09 14:13:58 +1100 |
| commit | a5acc6654ba5a7d2dcf7ae1e4cbb727a29fe5521 (patch) | |
| tree | bc204af36200a4481d2f9fc158471267d47d4454 /source4/setup/provision.py | |
| parent | d08eabdf91cade7f034468811d6228e75c69c1b5 (diff) | |
| parent | fa2eb3447361457557d84ed8afd0757638410584 (diff) | |
| download | samba-a5acc6654ba5a7d2dcf7ae1e4cbb727a29fe5521.tar.gz samba-a5acc6654ba5a7d2dcf7ae1e4cbb727a29fe5521.tar.xz samba-a5acc6654ba5a7d2dcf7ae1e4cbb727a29fe5521.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit 4aff02ecf18d52ae8e64e0c938ac5edf82a6dcef)
Diffstat (limited to 'source4/setup/provision.py')
| -rwxr-xr-x | source4/setup/provision.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source4/setup/provision.py b/source4/setup/provision.py index 9f887e8b3be..033d2491f21 100755 --- a/source4/setup/provision.py +++ b/source4/setup/provision.py @@ -26,9 +26,6 @@ import getopt import optparse import os, sys -# Add path to the library for in-tree use -sys.path.append("scripting/python") - import samba from auth import system_session @@ -130,12 +127,12 @@ lp.set("realm", opts.realm) lp.set("workgroup", opts.domain) lp.set("server role", opts.server_role or "domain controller") - if opts.aci is not None: print "set ACI: %s" % opts.aci -paths = provision_paths_from_lp(lp, opts.realm.lower(), private_dir) -paths.smbconf = sambaopts.get_loadparm_path() +paths = provision_paths_from_lp(lp, opts.realm.lower()) +if sambaopts.get_loadparm_path() is not None: + paths.smbconf = sambaopts.get_loadparm_path() creds = credopts.get_credentials() |