From b038aca5c869ba98f123f7107c3a6906c5f6bbdd Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 3 Feb 2011 17:32:55 +1100 Subject: 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 --- source4/scripting/python/samba/provision/__init__.py | 8 -------- 1 file changed, 8 deletions(-) (limited to 'source4/scripting') 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 -- cgit