diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-02-10 13:56:24 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-02-10 16:18:21 +1100 |
| commit | f299fe565ae5dba76ffc708da9a47405d61b0af9 (patch) | |
| tree | efb288c761ffa7efc1f2103197b54f3133977375 /source4/scripting/python | |
| parent | f8778ba8f4c234648230dba0249cd189fcd0d4d1 (diff) | |
| download | samba-f299fe565ae5dba76ffc708da9a47405d61b0af9.tar.gz samba-f299fe565ae5dba76ffc708da9a47405d61b0af9.tar.bz2 samba-f299fe565ae5dba76ffc708da9a47405d61b0af9.zip | |
s4:provision Just 'do the right thing' with empty smb.conf files
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
Diffstat (limited to 'source4/scripting/python')
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 58c172fc0f..b02d94d227 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -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) |