1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Commit Graph

93183 Commits

Author SHA1 Message Date
Garming Sam
fca80dccf8 selftest: updated docs.py script
The script now checks the parameter defaults against the documentation by using
the output of testparm and samba-tool testparm.

It now also uses the ElementTree xml library.

Change-Id: I2657c8c56a8c8383735e659dc9f636b4c5ab460b
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Fri Jan 31 23:22:09 CET 2014 on sn-devel-104
2014-01-31 23:22:09 +01:00
Andrew Bartlett
2c86758b04 docs: Always declare rule to build parameters.all.xml and do it first
This ensures this file and the rule to generate it can always be found.

Andrew Bartlett

Change-Id: I76d9f4470e2678fc2df4e3a13642737128938f3a
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 21:21:14 +01:00
Andrew Bartlett
464009c01d docs: change default of usershare path to use an entity
Change-Id: Idf9b8b95387f9b31b1cf8d3d548adb8361de0534
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 21:14:16 +01:00
Andrew Bartlett
7d9cb4df44 docs: change default of cache directory to use an entity
Change-Id: I555524324d671a30c8bfb130ba95e745492a50b2
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 21:14:05 +01:00
Andrew Bartlett
f243479ade docs: change default of winbindd privileged socket directory to use an entity
Change-Id: Ia520090dbad50a6d3fc5b7bdc1982cfc15174b16
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 21:13:53 +01:00
Andrew Bartlett
c729ab83f0 docs: change default of samba kcc command to use an entity
Change-Id: I63c10ca0efc83496ffcd720edc00bd711ce53eac
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 21:13:42 +01:00
Andrew Bartlett
7a93e0fa9c docs: change default of ntp signd socket directory to use an entity
Change-Id: Id66dcd5b587c4c355961d8e9d10cdf0d1e17a6ad
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 21:13:31 +01:00
Andrew Bartlett
072b053c00 docs: change default of spn update command to use an entity
Change-Id: I05720c79767311593d93277e2ba82f6bde212518
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 21:13:17 +01:00
Garming Sam
79229f4111 docs: change default in private directory to use an entity
Change-Id: I4d015f2a75d8f404e0db64382b6d71bb9b59b8e3
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 21:12:52 +01:00
Garming Sam
31a48b832d docs: change default in lock directory to use an entity
Change-Id: Ie36185c0c9f439747a855885138093197f60786a
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 21:12:36 +01:00
Garming Sam
d0839f3b0f docs: change default in state directory to use an entity
Change-Id: I955779e117183ea42c86c092df9f6e3fda936f3c
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 21:12:18 +01:00
Garming Sam
9a76eedd0c docs: change default in winbindd socket directory to use an entity
Change-Id: I8b3305f789cf081c5289c9d2653aecd8aa828577
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 21:12:05 +01:00
Garming Sam
308b8b2f10 docs: change default in ncalrpc dir to use an entity
Change-Id: I53e66f778731f44aba9fa2e1e18f157bea9c2974
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 21:11:49 +01:00
Garming Sam
9143987405 docs: change default in smb passwd file to use an entity
Change-Id: Ia81d677657ec0013c9cc7bfaecc2d88faf50f07c
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 21:11:04 +01:00
Garming Sam
e450a980b5 docs: change default in dns update command to use an entity
Change-Id: I911eabd0271d0b3cdd15b5232a837ca3289997ae
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 21:10:48 +01:00
Garming Sam
44026cf32e docs: change default in pid directory to use an entity
Change-Id: I4e4d5c7e1a82aa0788423efe2cba2e828f127346
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 21:07:48 +01:00
Andrew Bartlett
53522ac994 docs: Allow smb.conf.5 to still be generated outside the waf build
This will be needed once we start to use the XML entities for the
configure-dependent paths.

Change-Id: I2b64f02bb365cc099178b63b2b24bdb239dbb7c1
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 21:07:36 +01:00
Garming Sam
57ba012c10 docs: define and include entities for the docs
This allows for dynamic default settings to be generated.

Change-Id: If8b93d233fb941bc7e3073ccf4b5ec0b0a231bd9
Pair-programmed-with: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 21:07:05 +01:00
Garming Sam
0e552e03ae docs: adjust the defaults for list parameters to include commas to match testparm output
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Fri Jan 31 12:57:34 CET 2014 on sn-devel-104
2014-01-31 12:57:34 +01:00
Garming Sam
9893cf6c62 s3-param: Remove compilation conditional for setting directory name cache size.
BROKEN_DIRECTORY_HANDLING was originally added in f1041f98ce
however, it was never set.

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 08:06:54 +01:00
Garming Sam
3351acb517 lib/param: change server max protocol to be consistent with s3 and docs
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 08:06:54 +01:00
Garming Sam
0c2dae1d3d lib/param: change min wins ttl default to be consistent with docs
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 08:06:53 +01:00
Andrew Bartlett
0d961e43ed lib/param: Fix default of printjob username to match s3
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 08:06:53 +01:00
Andrew Bartlett
9d92e43db7 lib/param: Fix default of logon path to match s3
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 08:06:52 +01:00
Andrew Bartlett
158ce93f4f lib/param: Fix default of logon home to match s3
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 08:06:52 +01:00
Andrew Bartlett
48997559a5 lib/param: Fix default of smb passwd file to match s3
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 08:06:51 +01:00
Andrew Bartlett
6db0015379 lib/param: Fix default of panic action to match s3
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 08:06:51 +01:00
Andrew Bartlett
eabecdadaa lib/param: Fix default of usershare path to match docs
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 08:06:42 +01:00
Andrew Bartlett
275397574b docs: change hard-coded default of nsupdate command to match lib/param
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 08:05:53 +01:00
Garming Sam
6a650868f4 lib/param: change name resolve order to include lmhosts as per the docs
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 08:05:52 +01:00
Andrew Bartlett
fc77a69461 s4-resolve: Add lmhosts support into the source4 name resolve code
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 08:05:52 +01:00
Garming Sam
8427c797ce lib/param: set default for -valid parameter
This parameter isn't used in any of the lib/param code and is being added for consistency

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 08:05:51 +01:00
Garming Sam
2152c77e38 param: Rename variable used for lp__server_role server_role
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 08:05:51 +01:00
Garming Sam
7ebd3bb3f1 param: Rename variable used for lp__security security
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 08:05:50 +01:00
Garming Sam
09b8816b8f param: fixup security default to AUTO to permit server role = domain member
When this is set to AUTO, it behaves as security = user unless server role = domain member has been set.

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 08:05:50 +01:00
Garming Sam
3e073f1c92 lib/param: fix a comment for lpcfg_printername
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 08:05:49 +01:00
Garming Sam
f296e6e768 param: Rename variable used for lp__printername szPrintername
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 08:05:49 +01:00
Garming Sam
19d7ed8de9 param: remove static functions in param_functions.c
Only two functions are static and their presence doesn't really gain much, besides impeding auto-generation

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 08:05:48 +01:00
Garming Sam
413e0b6872 param: Complete the removal of the "open files database hash size" parameter
This parameter was originally set for removal in 2007 in 28210588ed

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-31 08:05:47 +01:00
Amitay Isaacs
35eb6cb521 ctdb-doc: Fix usage string for ctdb readkey/writekey
Signed-off-by: Amitay Isaacs <amitay@gmail.com>

Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Fri Jan 31 07:52:46 CET 2014 on sn-devel-104
2014-01-31 07:52:46 +01:00
Amitay Isaacs
1566790e5a ctdb-daemon: Return negative status only if there are known errors
If event script does not exist or does not have execute permissions, then
return negative errno to distinguish from the exit errors of event script.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
2014-01-31 15:57:49 +11:00
Martin Schwenke
b112a3317c ctdb/tests/eventscripts: Avoid errors on broken pipe
ctdb_get_my_public_addresses() attempts to echo things and this causes
an error if head has taken the first line and the pipe is closed.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Fri Jan 31 05:30:38 CET 2014 on sn-devel-104
2014-01-31 05:30:37 +01:00
Martin Schwenke
1640f36d58 ctdb/tests/eventscripts: Improve ip command stub secondary handling
It should support primary and secondaries per network instead of per
interface.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
2014-01-31 13:36:28 +11:00
Martin Schwenke
e5778cc172 ctdb/daemon: reloadips must register state of asynchronous controls
Otherwise ctdb_client_async_wait() is a no-op.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
2014-01-31 13:36:04 +11:00
Michael Brown
05c1fe5055 s4:tls_tstream: allow mode of SSL keyfile to be 0400, not only 0600
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10392

Signed-off-by: Michael Brown <michael@netdirect.ca>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Fri Jan 31 01:27:03 CET 2014 on sn-devel-104
2014-01-31 01:27:03 +01:00
Volker Lendecke
afdb715d21 build: Build idmap_ad by default
Most other idmap modules are built by default. I don't see a reason why
idmap_ad should be special here.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
2014-01-30 23:33:47 +01:00
Michael Adam
9fb943819c selftets: durable-open.reopen4 succeeds now.
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Jan 30 23:32:13 CET 2014 on sn-devel-104
2014-01-30 23:32:13 +01:00
Michael Adam
af360ede0e s4:torture:smb2: fix durable-open.reopen4
We currently don't support durable handles with delete-on-close:
with delete-on-close, we close a durable handle with delete-on-close
set upon disconnect.

This patch adapts the test to behave accordingly,
i.e. don't use delete-on-close...

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
2014-01-30 12:26:45 -08:00
Stefan Metzmacher
0b23345676 s3:smbd: skip empty records in smbXsrv_open_cleanup()
This should avoid scary ndr_pull errors, if there's
a cleanup race.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Thu Jan 30 18:49:37 CET 2014 on sn-devel-104
2014-01-30 18:49:37 +01:00
Michael Adam
6b2d67a345 smbd:smb2: fix durable reconnect: set fsp->fnum from the smbXsrv_open->local_id
Originally, fsp->fnum was left at the INVALID fnum value.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
2014-01-30 16:57:06 +01:00