sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-07 12:59:08 +03:00
Code Activity

s4:provision Just 'do the right thing' with empty smb.conf files

Browse Source 
For some reason, JHT keeps on creating an empty smb.conf file,
expecting it to be the same as a non-existant one.  It is easier to
just realise what he meant.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett
2010-02-10 13:56:24 +11:00
parent f8778ba8f4
commit f299fe565a
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source4/scripting/python/samba/provision.py
View File

@ -1172,9 +1172,17 @@ def provision(setup_dir, message, session_info,
smbconf = param.default_path()
# only install a new smb.conf if there isn't one there already
if not os.path.exists(smbconf):
if os.path.exists(smbconf):
# JHT calls me up often enough with weird errors, because he
# uses an empty smb.conf. --abartlet
data = open(smbconf, 'r').read()
data = data.lstrip()
if data is None or data == "":
make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole,
targetdir, sid_generator, useeadb)
else:
make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole,
targetdir, sid_generator,useeadb)
targetdir, sid_generator, useeadb)
lp = param.LoadParm()
lp.load(smbconf)