summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-03 17:32:55 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-07 13:22:00 +1100
commitb038aca5c869ba98f123f7107c3a6906c5f6bbdd (patch)
tree0e8e14d3122de670f595e323bce01040170ab243 /source4/scripting
parentb2a080fb1d9a726ad30ff7b745e7b77615ba1002 (diff)
downloadsamba-b038aca5c869ba98f123f7107c3a6906c5f6bbdd.tar.gz
samba-b038aca5c869ba98f123f7107c3a6906c5f6bbdd.tar.bz2
samba-b038aca5c869ba98f123f7107c3a6906c5f6bbdd.zip
s4-loadparm: removed "setup directory" option
the correct setup directory is known at both build time and install time using dyn_SETUPDIR, so we no longer have any need to override it Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/python/samba/provision/__init__.py8
1 files changed, 0 insertions, 8 deletions
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index 341f822cf2..d5d272d3a8 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -624,13 +624,6 @@ def make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole,
else:
sid_generator_line = "sid generator = " + sid_generator
- used_setup_dir = setup_path("")
- default_setup_dir = lp.get("setup directory")
- setupdir_line = ""
- if used_setup_dir != default_setup_dir:
- setupdir_line = "setup directory = %s" % used_setup_dir
- lp.set("setup directory", used_setup_dir)
-
sysvol = os.path.join(lp.get("lock dir"), "sysvol")
netlogon = os.path.join(sysvol, realm.lower(), "scripts")
@@ -642,7 +635,6 @@ def make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole,
"SERVERROLE": serverrole,
"NETLOGONPATH": netlogon,
"SYSVOLPATH": sysvol,
- "SETUPDIRECTORY_LINE": setupdir_line,
"SIDGENERATOR_LINE": sid_generator_line,
"PRIVATEDIR_LINE": privatedir_line,
"LOCKDIR_LINE": lockdir_line