1
0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00

93341 Commits

Author SHA1 Message Date
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
Michael Adam
e93f052e37 docs: remove extra spaces in synopsis of dbwrap_tool
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
2014-01-30 16:57:06 +01:00
Michael Adam
1e3b352f79 docs: document new --non-persistent option to dbwrap_tool
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
2014-01-30 16:57:06 +01:00
Michael Adam
c3f93271ef dbwrap_tool: add option "--non-persistent" and force excatly one of "--[non-]persistent"
We want to force users of dbwrap_tool to explicitly specify
persistent or non-persistent. Otherwise, one could easily
by accident wipe a whole database that is actually persistent
but not currently opened by a samba process, just by openeing
the DB with the default non-persistent mode...

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
2014-01-30 16:57:06 +01:00
Michael Adam
6f748fef65 docs: remove short form "-p" of --persistent from dbwrap_tool manpage
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
2014-01-30 16:57:06 +01:00
Michael Adam
6dd1008c4e dbwrap_tool: remove the short form "-p" of "--persistent"
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
2014-01-30 16:57:06 +01:00
Michael Adam
f42d380ead s3:brlock: fix a comment typo
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Thu Jan 30 13:25:22 CET 2014 on sn-devel-104
2014-01-30 13:25:22 +01:00
Srikrishan Malik
164ee000df ctdb-eventscripts: Do not mark node unhealthy if no fs is available
Signed-off-by: Srikrishan Malik <srimalik@in.ibm.com>
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Thu Jan 30 11:18:19 CET 2014 on sn-devel-104
2014-01-30 11:18:19 +01:00
Andrew Bartlett
c2b8d31b13 param: Do not check defaults_saved in is_default
We only call is_default if defaults_saved == true, so this static variable
reference is not required.

Andrew Bartlett

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): Thu Jan 30 03:31:29 CET 2014 on sn-devel-104
2014-01-30 03:31:29 +01:00
Andrew Bartlett
54f380744a lib/param: Do not check defaults_saved in is_default
We only call is_default if defaults_saved == true, so this static variable
reference is not required.

Andrew Bartlett

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-30 01:24:24 +01:00
Andrew Bartlett
ebb04f4037 param: Remove unused lp_is_default (once used by SWAT)
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-30 01:21:49 +01:00
Andrew Bartlett
02d60cd028 param: Remove unused lp_next_parameter (once used by SWAT)
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-30 01:21:26 +01:00
Andrew Bartlett
0f119aa9c1 lib/param: Remove unused lpcfg_next_parameter (once used by SWAT)
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-30 01:21:11 +01:00
Garming Sam
c813e91171 param: remove unused bPreferredMaster from s3 loadparm in LOADPARM_EXTRA_GLOBALS
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-30 01:20:55 +01:00
Andrew Bartlett
b13a160666 lib/param: Make and use lpcfg_equal_parameter in common
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-30 01:18:24 +01:00
Andrew Bartlett
7eecd7c776 lib/param: Make and use common lpcfg_map_parameter
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-30 01:16:54 +01:00
Andrew Bartlett
d2782aceb3 s3-param: Use lpcfg_dump_a_parameter in dump_a_parameter
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-30 01:13:51 +01:00
Andrew Bartlett
0d506d26fc s3-param: Make dump_a_parameter use lp_paramater() rather than an open-coded loop
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-30 00:46:14 +01:00
Andrew Bartlett
36c88ca9c1 lib/param: Make lpcfg_print_parameter() common
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-30 00:42:08 +01:00
Garming Sam
5c2aac0f8e param: pad permissions to 3 digits and update docs to be consistent
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-30 00:40:22 +01:00
Andrew Bartlett
c7790d63e8 lib/param: Fix copy_service to handle BOOLREV
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): Wed Jan 29 11:11:11 CET 2014 on sn-devel-104
2014-01-29 11:11:11 +01:00
Andrew Bartlett
7ddb58dcd9 docs: Remove unused parameters.global.xml and parameters.service.xml
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-29 09:16:23 +01:00
Andrew Bartlett
12aed897ec docs: Remove find_missing_manpages replaced by docs.py and dependent on a Makefile.in file
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2014-01-29 09:16:07 +01:00
Garming Sam
b04b4fba5b param: don't ignore some parameters when performing map_parameter
Only the -valid parameter is currently affected by this. There doesn't seem to be any reason why you shouldn't
be able to simply map the parameter and there are already existing checks, in dump_a_service for instance, where it
checks for the prefix anyways.

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-29 09:12:22 +01:00
Garming Sam
c18096b7b3 lib/param: fix copy service to include the case for P_CHAR
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-29 09:11:48 +01:00
Garming Sam
1d68b5b0bb docs: remove the file prefix from included path names
This allows the inbuilt python xml modules to perform the include.

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-29 09:11:25 +01:00
Garming Sam
02379369ef docs: update XInclude year to conform with current standard
This allows the inbuilt python XML parser to handle these includes.

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-29 09:11:18 +01:00
Garming Sam
21a94c0237 param: remove unnecessary checks in dump a parameter
In dump_a_parameter we now allow dumping of a parameter by alias name,
and so this check is not required.

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-29 09:11:08 +01:00
Garming Sam
58d3ad7612 param: fix an offset bug in lpcfg_set_cmdline
Previously, it was possible to compare offsets between
loadparm_service and loadparm_global.  This meant in some cases
incorrectly skipping certain parameters.

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-29 09:10:54 +01:00
Volker Lendecke
58865d96f1 pthreadpool: Fix a comment, "quit"->"shutdown"
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>

Autobuild-User(master): David Disseldorp <ddiss@samba.org>
Autobuild-Date(master): Tue Jan 28 19:06:40 CET 2014 on sn-devel-104
2014-01-28 19:06:40 +01:00
Garming Sam
28346a6ea8 param: assign default ports in s3 loadparm to match docs and s4
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Tue Jan 28 10:29:57 CET 2014 on sn-devel-104
2014-01-28 10:29:57 +01:00
Andrew Bartlett
826ba5f117 param: Add default for rndc command to s3 loadparm
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
2014-01-28 17:26:45 +13:00
Andrew Bartlett
3afeeb6e31 param: Add default for nsupdate command to s3 loadparm
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
2014-01-28 17:26:45 +13:00
Andrew Bartlett
6b040b2f54 param: Add default for spn update command to s3 loadparm
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
2014-01-28 17:26:45 +13:00
Andrew Bartlett
1571c44a3e param: Add default for dns update command to s3 loadparm
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
2014-01-28 17:26:45 +13:00
Andrew Bartlett
3d80a9765b param: Add default for samba kcc command to s3 loadparm
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
2014-01-28 17:26:44 +13:00
Andrew Bartlett
223bd6ed11 param: Add defaults for tls parameters to s3 loadparm
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
2014-01-28 17:26:44 +13:00
Andrew Bartlett
e6eea24d1f param: Add default for winbindd privileged socket directory to s3 loadparm
(note that this parameter is only used in the source4 winbindd code at this time)

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
2014-01-28 17:26:44 +13:00
Andrew Bartlett
8016404455 param: Add default for ntp signd socket directory to s3 loadparm
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
2014-01-28 17:26:44 +13:00
Garming Sam
5a323f3ace lib/param: change server min 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: Alexander Bokovoy <ab@samba.org>
2014-01-28 17:26:44 +13:00
Garming Sam
846795ec3d lib/param: fix nbt client socket address default setting 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: Alexander Bokovoy <ab@samba.org>
2014-01-28 17:26:44 +13:00
Garming Sam
c760e611fd lib/param: set defaults for a number of previously unset parameters
These defaults are based on the docs which have been checked against source3.

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
2014-01-28 17:26:44 +13:00
Garming Sam
44795c67d1 lib/param: add default for guest account
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
2014-01-28 17:26:44 +13:00