diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-03-05 12:24:35 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-03-05 12:24:35 +1100 |
| commit | 41760c18bdab20d526d32568531bdf7c88272879 (patch) | |
| tree | b2f421919501a3061afe40f0cb0980f86f448ea8 /source4/scripting/python/samba/provision.py | |
| parent | 8249383efb2037bb234dd040ebe151329cc4feb9 (diff) | |
| parent | c8ea9d1f13096cd7f51e5972915a61ca65b56ac3 (diff) | |
| download | samba-41760c18bdab20d526d32568531bdf7c88272879.tar.gz samba-41760c18bdab20d526d32568531bdf7c88272879.tar.xz samba-41760c18bdab20d526d32568531bdf7c88272879.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema
Diffstat (limited to 'source4/scripting/python/samba/provision.py')
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 1ac0e4553e..8029565399 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -53,7 +53,7 @@ def find_setup_dir(): """Find the setup directory used by provision.""" dirname = os.path.dirname(__file__) if "/site-packages/" in dirname: - prefix = dirname[:dirname.index("/site-packages/")] + prefix = "/".join(dirname[:dirname.index("/site-packages/")].split("/")[:-2]) for suffix in ["share/setup", "share/samba/setup", "setup"]: ret = os.path.join(prefix, suffix) if os.path.isdir(ret): @@ -1132,7 +1132,8 @@ def provision(setup_dir, message, session_info, message("NetBIOS Domain: %s" % names.domain) message("DNS Domain: %s" % names.dnsdomain) message("DOMAIN SID: %s" % str(domainsid)) - message("Admin password: %s" % adminpass) + if samdb_fill == FILL_FULL: + message("Admin password: %s" % adminpass) result = ProvisionResult() result.domaindn = domaindn @@ -1365,7 +1366,7 @@ def provision_backend(setup_dir=None, message=None, "MMRDN": names.domaindn, "LDAPSERVER" : url, "MMR_PASSWORD": mmr_pass }) - # olc = yes? + # olc = yes? olc_config_pass = "" olc_config_acl = "" olc_syncrepl_config = "" |