summaryrefslogtreecommitdiff
path: root/testsuite/build_farm
diff options
context:
space:
mode:
authorDerrell Lipman <derrell@samba.org>2005-03-31 20:28:47 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:25 -0500
commit8de11f06df03e19fe92f44da10a10eab30e118b2 (patch)
tree110af07308ea2c4a2f96497840f45ad9cb0fbd2a /testsuite/build_farm
parentfd52f0eeae34fee8e996d6c906717cee043d7243 (diff)
downloadsamba-8de11f06df03e19fe92f44da10a10eab30e118b2.tar.gz
samba-8de11f06df03e19fe92f44da10a10eab30e118b2.tar.bz2
samba-8de11f06df03e19fe92f44da10a10eab30e118b2.zip
r6155: Fixes bug #1133
Added provision for overloading some global configuration options via the new, per-user file ~/.smb/smb.conf.append which is read after the global config file is read (and only if the global config file was read). This leave the original, BC behavior of ~/.smb/smb.conf which, if found, is read but causes the global config file to not be read. Also fixed a potential seg fault in to lp_dump_one(). (This used to be commit 2c5a6305bd127b1a7e65356c2b3aa5c13cd2bd74)
Diffstat (limited to 'testsuite/build_farm')
0 files changed, 0 insertions, 0 deletions