sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-30 19:42:05 +03:00
Code Activity

s4-loadparm: removed "setup directory" option

Browse Source 
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>
This commit is contained in:
Andrew Tridgell
2011-02-03 17:32:55 +11:00
parent b2a080fb1d
commit b038aca5c8
8 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source4/scripting/python/samba/provision/__init__.py
View File

@ -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