Michael Adam [Tue, 9 Sep 2014 21:22:50 +0000 (23:22 +0200)]
s3:torture:msg: use lp_load()-wrapper lp_load_global()
Signed-off-by: Michael Adam <obnox@samba.org>
Michael Adam [Wed, 6 Aug 2014 14:23:40 +0000 (16:23 +0200)]
WIP: s3:param: add _lp_save_defaults() - get this out of lp_load_ex()
Michael Adam [Wed, 6 Aug 2014 14:20:42 +0000 (16:20 +0200)]
s3:param: in lp_load_initial_only(), make sure to save defaults.
This is the initial loading of the config in the daemons (and some tools).
So we should save the defaults here. This should especially take into account
some dynamic defaults like log file and maybe some changed values
handed in via the command line.
Signed-off-by: Michael Adam <obnox@samba.org>
Michael Adam [Wed, 6 Aug 2014 14:20:12 +0000 (16:20 +0200)]
TMP source3/lib/popt_common.c: some tmp debug
Michael Adam [Wed, 6 Aug 2014 14:19:25 +0000 (16:19 +0200)]
TMP: reload config every 5 seconds intead of every 3 minutes
Michael Adam [Wed, 6 Aug 2014 14:19:01 +0000 (16:19 +0200)]
TMP: debug: crazy debugging
Michael Adam [Wed, 30 Jul 2014 14:21:57 +0000 (16:21 +0200)]
param: improve precision in lpcfg_file_list_changed by using exsists info.
This eliminates some rather unlikely cases where the file
exists with timestamp 0 first and is then removed, or visa versa.
Signed-off-by: Michael Adam <obnox@samba.org>
Michael Adam [Wed, 30 Jul 2014 14:19:12 +0000 (16:19 +0200)]
s3:param: improve precision in lp_file_list_changed by using exsists info.
This eliminates some rather unlikely cases where the file
exists with timestamp 0 first and is then removed, or visa versa.
Signed-off-by: Michael Adam <obnox@samba.org>
Michael Adam [Wed, 30 Jul 2014 12:58:53 +0000 (14:58 +0200)]
param: introduce an exists flag in the files_list to add precision.
Be able to distinguish between non-existent files and
files with timestamp 0.
Signed-off-by: Michael Adam <obnox@samba.org>
Michael Adam [Wed, 30 Jul 2014 12:57:50 +0000 (14:57 +0200)]
param: improve a debug message in lpcfg_file_list_changed()
Signed-off-by: Michael Adam <obnox@samba.org>
Michael Adam [Wed, 30 Jul 2014 12:55:37 +0000 (14:55 +0200)]
s3:param: improve a debug message in lp_file_list_changed()
Signed-off-by: Michael Adam <obnox@samba.org>
Michael Adam [Wed, 30 Jul 2014 10:21:32 +0000 (12:21 +0200)]
param: also trigger a config reload when a source file has been removed.
Third part of fixing reload triggers and also an additional part
of an effective revert of
87ea010ae14b2dc9a3e5b9d64ca9e63ec9de91f8,
including lib/param.
Signed-off-by: Michael Adam <obnox@samba.org>
Michael Adam [Wed, 30 Jul 2014 10:17:53 +0000 (12:17 +0200)]
s3:parm: also trigger a config reload when a source file has been removed.
Second part of fixing reload triggers and also the second part
of an effective revert of
87ea010ae14b2dc9a3e5b9d64ca9e63ec9de91f8.
Signed-off-by: Michael Adam <obnox@samba.org>
Michael Adam [Tue, 29 Jul 2014 21:35:53 +0000 (23:35 +0200)]
param: When updating an entry in the file_list, always correctly update the mtime.
When a file was read before and now has been removed or has 0 time stamp,
then add_to_file_list() currently does not change the time stamp in the list.
As a consequence, it can not be detected by a running smbd when a config file
is removed. I.e. removal (or setting mtime to 0) of a config file will not
trigger a reload of the whole config.
As a first step in fixing this, always store the time stamp in the file_list.
Note that this is the first step of an effective revert of
87ea010ae14b2dc9a3e5b9d64ca9e63ec9de91f8, which I don't understand.
If I don't miss anything, that commit prevents our loadparm system from
detecting that a file was removed or resurrected, and triggering a
config reload based on that fact.
Signed-off-by: Michael Adam <obnox@samba.org>
Michael Adam [Wed, 30 Jul 2014 22:42:01 +0000 (00:42 +0200)]
s4:torture:libnetapi: use lp_load_global() instead of lp_load()
Signed-off-by: Michael Adam <obnox@samba.org>
Michael Adam [Wed, 30 Jul 2014 15:47:32 +0000 (17:47 +0200)]
s3:param: remove "add_ipc" parameter from lp_load_with_registry_shares().
This is not called from the server (which loads registry shares lazily),
so add_ipc is always false...
Signed-off-by: Michael Adam <obnox@samba.org>
Michael Adam [Wed, 30 Jul 2014 15:30:22 +0000 (17:30 +0200)]
s3:param: remove "global_only" parameter from lp_load_with_registry_shares().
There is no point in choosing global_only when forcing to load
all shares from registry at the same time...
Signed-off-by: Michael Adam <obnox@samba.org>
Michael Adam [Wed, 30 Jul 2014 15:00:36 +0000 (17:00 +0200)]
s3:auth: use lp_load_with_shares() in auth3_check_password()
Signed-off-by: Michael Adam <obnox@samba.org>
Michael Adam [Wed, 30 Jul 2014 14:59:50 +0000 (16:59 +0200)]
s3:auth: use lp_load_with_shares() in auth3_generate_session_info_pac()
Signed-off-by: Michael Adam <obnox@samba.org>
Michael Adam [Wed, 30 Jul 2014 14:57:06 +0000 (16:57 +0200)]
nsswitch/wins: use lp_load_global() wrapper of lp_load().
Signed-off-by: Michael Adam <obnox@samba.org>
Michael Adam [Wed, 30 Jul 2014 14:53:59 +0000 (16:53 +0200)]
s3:smbd: use lp_load_with_shares() in reload_services().
Signed-off-by: Michael Adam <obnox@samba.org>
Michael Adam [Wed, 30 Jul 2014 14:52:06 +0000 (16:52 +0200)]
s3:param: let lp_load_global_no_reinit() call lp_load() instead of lp_load_ex()
Signed-off-by: Michael Adam <obnox@samba.org>
Michael Adam [Wed, 30 Jul 2014 14:50:48 +0000 (16:50 +0200)]
s3:param: add wrapper lp_load_with_shares().
Most common pattern with shares, including IPC,
but not forcing immediate loading of all registry shares.
Signed-off-by: Michael Adam <obnox@samba.org>
Michael Adam [Wed, 30 Jul 2014 14:47:40 +0000 (16:47 +0200)]
s3:param: let lp_load_global() call lp_load(), not lp_load_ex().
Signed-off-by: Michael Adam <obnox@samba.org>
Michael Adam [Wed, 30 Jul 2014 14:43:05 +0000 (16:43 +0200)]
s3:lsasd: use lp_load() wrapper lp_load_global()
Signed-off-by: Michael Adam <obnox@samba.org>
Michael Adam [Wed, 30 Jul 2014 14:41:22 +0000 (16:41 +0200)]
s3:spoolss: use lp_load() wrapper lp_load_global().
Signed-off-by: Michael Adam <obnox@samba.org>
Volker Lendecke [Wed, 10 Sep 2014 14:13:18 +0000 (16:13 +0200)]
messaging_dgm: Don't expose the messaging_dgm_context
Right now we can only support one messaging_dgm_context per process
anyway, the code has checks for this. I would like to keep it that
way, in the future we will have multiple messaging_context's or
imessaging_context's filtering based upon the dst server_id.
Why this change? messaging_dgm's lockfile contains the
serverid->unique_id. When designing messaging_dgm, I had in mind to
remove the serverid.tdb and replace it with the dgm lockfiles for server
lookup and enumeration. I have a WIP-patchset that gets rid of almost
all users of serverid.tdb. The problem is serverid_exists. Here we don't
have a messaging_context available, and it would be pretty intrusive
to make it so. This problem has plagued us since ctdb was developed,
see for example the comment
/*
* This is a Samba3 hack/optimization. Routines like process_exists need to
* talk to ctdbd, and they don't get handed a messaging context.
*/
in messaging_ctdb.c. This patchset removes this problem in a radical way:
Treat the messaging_dgm context as one globally available structure and
be done with it. The ctdb socket could go the same way in the future.
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Sun Sep 14 16:29:30 CEST 2014 on sn-devel-104
Volker Lendecke [Wed, 10 Sep 2014 08:12:23 +0000 (10:12 +0200)]
messaging_dgm: Avoid a talloc
Not really required, but it removes a NULL check
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Volker Lendecke [Wed, 10 Sep 2014 08:12:23 +0000 (10:12 +0200)]
messaging_dgm: Avoid a talloc
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Volker Lendecke [Wed, 10 Sep 2014 08:00:05 +0000 (10:00 +0200)]
messaging_dgm: messaging_dgm_lockfile_remove does not use tmp_ctx anymore
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Volker Lendecke [Wed, 10 Sep 2014 08:00:05 +0000 (10:00 +0200)]
messaging_dgm: messaging_dgm_lockfile_create does not use tmp_ctx anymore
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Volker Lendecke [Wed, 10 Sep 2014 07:58:00 +0000 (09:58 +0200)]
messaging_dgm: Avoid talloc_tos()
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Volker Lendecke [Tue, 9 Sep 2014 19:46:19 +0000 (21:46 +0200)]
messaging_dgm: Reformatting
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Volker Lendecke [Tue, 9 Sep 2014 19:45:58 +0000 (21:45 +0200)]
messaging_dgm: Remove an unnecessary cast
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
David Disseldorp [Fri, 12 Sep 2014 11:11:00 +0000 (13:11 +0200)]
namecache: fix uninitialised pointer returns
asprintf_strupper_m() doesn't set *strp on error.
Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Volker Lendecke <Volker.Lendecke@SerNet.DE>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Sat Sep 13 03:21:39 CEST 2014 on sn-devel-104
Björn Jacke [Tue, 9 Sep 2014 20:35:08 +0000 (22:35 +0200)]
docs: mention incompatibility between kernel oplocks and streams_xattr
See BUG https://bugzilla.samba.org/show_bug.cgi?id=7537 for details.
Signed-off-by: Bjoern Jacke <bj@sernet.de>
Autobuild-User(master): Björn Jacke <bj@sernet.de>
Autobuild-Date(master): Fri Sep 12 18:29:37 CEST 2014 on sn-devel-104
Volker Lendecke [Fri, 12 Sep 2014 10:11:43 +0000 (10:11 +0000)]
ntvfs: Skip the new smb2.oplock.batch26 test
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Fri Sep 12 14:39:00 CEST 2014 on sn-devel-104
Hemanth Thummala [Thu, 11 Sep 2014 21:15:56 +0000 (14:15 -0700)]
Adding new oplock test 'batch26'.
Signed-off-by: Hemanth Thummala <hemanth.thummala@gmail.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Volker Lendecke [Tue, 9 Sep 2014 10:53:52 +0000 (10:53 +0000)]
s3: smbd: streams - Ensure share mode validation ignores internal opens (op_mid == 0).
Fixes bug 10797 - smbd panic at find_oplock_types
https://bugzilla.samba.org/show_bug.cgi?id=10797
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Amitay Isaacs [Fri, 12 Sep 2014 06:24:09 +0000 (16:24 +1000)]
ctdb-doc: Add reference to new magepage ctdb-statistics
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Fri Sep 12 11:13:56 CEST 2014 on sn-devel-104
Amitay Isaacs [Fri, 12 Sep 2014 04:22:00 +0000 (14:22 +1000)]
ctdb-doc: Add ctdb-statistics manual page
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Amitay Isaacs [Fri, 12 Sep 2014 00:50:27 +0000 (10:50 +1000)]
ctdb-daemon: Decrement pending calls statistics when calls are deferred
Deferred calls should not be treated as pending calls since they are
re-processed from the beginning.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Amitay Isaacs [Fri, 12 Sep 2014 01:25:14 +0000 (11:25 +1000)]
ctdb-tests: Do not expect real-time priority when running local daemons
Local daemons are started mainly for testing and usually not as root.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Amitay Isaacs [Fri, 12 Sep 2014 01:22:36 +0000 (11:22 +1000)]
ctdb-daemon: Make sure ctdb runs with real-time priority
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Martin Schwenke [Wed, 13 Aug 2014 05:01:54 +0000 (15:01 +1000)]
ctdb-locking: Fork lock helper with vfork_with_logging()
Otherwise errors printed by the lock helper get lost.
lock_helper_args() no longer adds the program name to the list of
arguments, since vfork_with_logging() does that. Update the lock
helper to handle the extra log_fd parameter passed by
vfork_with_logging() and send stdout/stderr there.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Wed, 13 Aug 2014 04:46:31 +0000 (14:46 +1000)]
ctdb-locking: Add argc parameter to lock_helper_args()
To make this sane, also add an argv parameter and change the return
type to bool. Anticipating a subsequent change, make the type of argv
match what is needed by vfork_with_logging() and cast it when passing
to execv(). This also means changing the type of the name member of
struct db_namelist.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Volker Lendecke [Thu, 11 Sep 2014 11:33:42 +0000 (11:33 +0000)]
media_harmony: Fix a crash bug
Now that the dust has settled, fix a crash bug that was hidden behind
the warnings...
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Simo Sorce <idra@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Fri Sep 12 02:45:40 CEST 2014 on sn-devel-104
Volker Lendecke [Thu, 11 Sep 2014 11:22:52 +0000 (11:22 +0000)]
media_harmony: Fix warnings
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Simo Sorce <idra@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Jeremy Allison [Thu, 11 Sep 2014 17:03:01 +0000 (10:03 -0700)]
s3: smbd - open logic fix.
As we atomically create using O_CREAT|O_EXCL,
then if new_file_created is true, then
file_existed *MUST* have been false (even
if the file was previously detected as being
there.
We use the variable file_existed again in logic
below this statement, so we must set file_existed = false,
if new_file_created returns are true from open_file().
Based on a fix from Michael Adam.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10809
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Thu Sep 11 22:29:22 CEST 2014 on sn-devel-104
Amitay Isaacs [Wed, 10 Sep 2014 08:14:24 +0000 (18:14 +1000)]
ctdb-locking: Set real-time priority for lock helpers
To avoid lock helper starvation when userspace robust mutexes are
enabled.
Commit
6f072f85a138f595494dbec137bcf23d1e666acc removed reset_scheduler(),
to avoid resetting scheduler priority. However, that is not sufficient
because of commit
1be8564e553ce044426dbe7b3987edf514832940, which sets
SCHED_RESET_ON_FORK flag. With SCHED_RESET_ON_FORK, all CTDB child
processes will automatically have normal scheduling priority.
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 Sep 11 11:31:10 CEST 2014 on sn-devel-104
Amitay Isaacs [Tue, 9 Sep 2014 09:01:55 +0000 (19:01 +1000)]
ctdb-daemon: Increment pending calls statistics correctly
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Andrew Bartlett [Tue, 2 Sep 2014 02:38:11 +0000 (14:38 +1200)]
torture: Provide enough space for test EA name in raw.eas test
The issue is that previously bad_ea_name[5] was the last element on
the array, and so when we later did a strlen() on it, we read past the
end of the stack array. We need bad_ea_name[5] to be the second-last
element, followed by the \0 placed there by the strlcpy().
Found by AddressSanitizer
Change-Id: I871c08200aa2591c612dfa44da92b83132f83d88
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Kamen Mazdrashki <kamenim@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Thu Sep 11 08:50:16 CEST 2014 on sn-devel-104
Martin Schwenke [Wed, 10 Sep 2014 03:57:58 +0000 (13:57 +1000)]
ctdb-build: Remove unnecessary lib/util include path from tests
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): Thu Sep 11 06:22:33 CEST 2014 on sn-devel-104
Martin Schwenke [Wed, 10 Sep 2014 03:57:12 +0000 (13:57 +1000)]
ctdb-util: Clean up dependencies
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Fri, 5 Sep 2014 06:09:34 +0000 (16:09 +1000)]
ctdb-includes: Remove some unnecessary declarations
To accommodate removing file_lines_load() from here, drop the #ifdef
around the declaration in util.h.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Ralph Boehme [Mon, 8 Sep 2014 18:53:44 +0000 (20:53 +0200)]
vfs_acl_common: dacl size must be updated
Signed-off-by: Ralph Boehme <rb@sernet.de>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Simo Sorce <idra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Sep 11 03:54:42 CEST 2014 on sn-devel-104
Jeremy Allison [Mon, 8 Sep 2014 23:16:24 +0000 (16:16 -0700)]
s3: smbd: Ensure we don't call qsort() with a size of -1.
Based on a patch idea from Ken Harris <kharris@mathworks.com>
Fixes bug 10798 - crash in source3/smbd/notify.c
https://bugzilla.samba.org/show_bug.cgi?id=10798
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ira Cooper <ira@samba.org>
Michael Adam [Wed, 10 Sep 2014 19:58:04 +0000 (21:58 +0200)]
s3:smbd:open_file: use a more natural check.
As suggested by Jeremy Allison <jra@samba.org>.
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Michael Adam [Tue, 9 Sep 2014 23:03:57 +0000 (01:03 +0200)]
s4:torture:base: slightly more generous timing in the defer_open test
This copes with cases where the server is very busy and
can't provide tortures more tight time scaling..
This is an attepmt to remove the flapping character of this test.
Signed-off-by: Michael Adam <obnox@samba.org>
Revieed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed Sep 10 21:51:42 CEST 2014 on sn-devel-104
Michael Adam [Tue, 9 Sep 2014 22:31:25 +0000 (00:31 +0200)]
s3:smbd: fix a race in open code
The race is when a file vanishes between
existence check and acl check.
In this case, open_file_ncreate() returns
OBJECT_NAME_NOT_FOUND even if the create
was called with disposition OPEN_IF.
But in this case, the file should be created.
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Volker Lendecke [Tue, 9 Sep 2014 10:45:38 +0000 (10:45 +0000)]
smbd: Fix a typo
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Michael Adam [Thu, 21 Aug 2014 08:32:00 +0000 (10:32 +0200)]
s4:torture: fix multi_smb_test child status tracking.
The original code in torture_start_procs() lost status of
child status. So the affected test caseses
(defer_open, ntdeny1, bench-torture, and also direct
torture_start_proxy-user bench-nbench) were not always
able to correctly detect and treat errors in the worker children.
With this patch, torture_create_procs() correctly puts
child result and reason into top level torture_result(),
thereby in particular fixing remaining unexpected errors
in the flapping deferopen test.
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Wed Sep 10 13:15:17 CEST 2014 on sn-devel-104
Michael Adam [Wed, 20 Aug 2014 13:42:27 +0000 (15:42 +0200)]
s4:torture:base: add torture_comments to the loop of the deferopen test.
This is to be able to better tell what went wrong if something
went wrong. This is currently one of the main flapping tests.
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Michael Adam [Wed, 20 Aug 2014 21:46:32 +0000 (23:46 +0200)]
s4:torture:base: move i++ down in loop in run_deferopen()
This is where it belongs, and it prepares
subsequent patches.
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Martin Schwenke [Tue, 9 Sep 2014 02:58:13 +0000 (12:58 +1000)]
ctdb-util: Make tdb_wrap self-sufficient - it doesn't need includes.h
It should use finer grained includes like replace.h and
ctdb_logging.h.
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): Wed Sep 10 04:03:20 CEST 2014 on sn-devel-104
Martin Schwenke [Fri, 15 Aug 2014 06:15:37 +0000 (16:15 +1000)]
ctdb-build: Tests don't include lib/util/*.c, link ctdb-util instead
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Tue, 19 Aug 2014 03:27:33 +0000 (13:27 +1000)]
ctdb-build: Drop lib/util from includes
In is unnecessary and can accidentally cause lib/util/time.h to be
found instead of /usr/include/time.h. The only things depending on it
were bare includes of db_wrap.h and a bare include of dlinklist.h,
which are both gone now.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Fri, 15 Aug 2014 05:46:33 +0000 (15:46 +1000)]
ctdb-util: Rename db_wrap to tdb_wrap and make it a build subsystem
This makes it consistent with Samba, to ease transition.
Update unit test code to link to with tdb_wrap instead of including
db_wrap.c.
There are some potential whitespace fixes in this commit that have
been ignored. CTDB's lib/tdb_wrap will be deleted after the
transition to Samba's lib/tdb_wrap, so there's no point polishing it
too much.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Sun, 17 Aug 2014 04:29:32 +0000 (14:29 +1000)]
ctdb-build: Make ctdb-util a wscript build subsystem
This makes it look similar to samba-util, easing the transition.
Fold ctdb-util-misc into ctdb-util, since Samba doesn't separate them.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Sat, 16 Aug 2014 06:17:02 +0000 (16:17 +1000)]
ctdb-logging: Move variable debug_extra from debug.*
debug_extra is CTDB-specific. Moving it will help with the
transitions to Samba's updated debug.[ch].
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Tue, 9 Sep 2014 03:52:07 +0000 (13:52 +1000)]
ctdb-logging: Factor out ctdb_logging.h from includes.h
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Thu, 4 Sep 2014 01:37:15 +0000 (11:37 +1000)]
ctdb-build: Add extra includes to help recursive utility compilation
Subsequent commits will introduce recursive compilation of utilities.
Unfortunately the include file structure requires some global includes
to be found, so make this work.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Fri, 15 Aug 2014 06:18:05 +0000 (16:18 +1000)]
ctdb-recoverd: Change include of dlinklist.h to contain directory
This makes it consistent with the rest of the code and avoids problems
when some variant of lib/util isn't in the include path.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Fri, 15 Aug 2014 05:53:03 +0000 (15:53 +1000)]
ctdb-tools: Move definition of timeval_delta() to tools/ctdb.c
This function is only used in this file. Samba's lib/util doesn't
have timeval_delta(), so staging a clean transition.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Fri, 15 Aug 2014 05:55:20 +0000 (15:55 +1000)]
ctdb-daemon: Drop the argument to fault_setup()
Samba's version doesn't accept an argument, so this aids a smooth
transition.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Fri, 15 Aug 2014 06:11:45 +0000 (16:11 +1000)]
ctdb-util: Add extra max_size argument to file_lines_load()
This is part of a migration to Samba's lib/util. CTDB always passes 0
(i.e. no max_size) so use a simple assert() to enforce this, rather
than changing a lot of code that will be discarded anyway.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Fri, 15 Aug 2014 06:12:43 +0000 (16:12 +1000)]
ctdb-client: Rename static function server_id_equal()
Otherwise it conflicts with the same function provided by Samba's
lib/util. Using the Samba one drags in too many dependencies, so
rename the CTDB version to avoid a declaration clash when CTDB starts
including samba_util.h.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Sat, 16 Aug 2014 06:43:23 +0000 (16:43 +1000)]
ctdb-util: Remove declaration of non-existent ctdb_fault_setup()
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Wed, 6 Aug 2014 06:36:58 +0000 (16:36 +1000)]
ctdb-common: Move hex_decode_talloc() to the lock helper
This is the only place it is used.
After migrating to Samba's lib/util, the lock helper can be changed to
use strhex_to_data_blob().
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Mon, 25 Aug 2014 04:00:45 +0000 (14:00 +1000)]
ctdb-build: Fix includes for SAMBA_BINARY()s
No need for "..", since the correct thing is generated. Add "include"
and "include/internal" where missing.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Tue, 2 Sep 2014 06:18:01 +0000 (16:18 +1000)]
ctdb-build: Don't try to set lib64 directory automatically in build
Just install into lib/ and let packagers decide on this policy, since
it can vary between distributions. Update our packaging files
accordingly.
A secondary matter is that things are incorrectly installed into
lib64/ when building with 32-bit userspace on a 64-bit kernel. If
this is done then it should depend on the architecture of the
compiler.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Mon, 18 Aug 2014 05:45:29 +0000 (15:45 +1000)]
ctdb-build: Make ctdb-client depend on ctdb-util and ctdb-util-misc
The client code uses both of these, so might as well depend on it.
That way code that depends on ctdb-client transitively get the
dependencies.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Tue, 19 Aug 2014 01:59:03 +0000 (11:59 +1000)]
ctdb-build: Allow configure and Makefile to find waf in tarball
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Thu, 4 Sep 2014 03:33:58 +0000 (13:33 +1000)]
ctdb-common: Add some missing #includes
To avoid warnings when using --enable-developer, which uses
-Wmissing-prototypes.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Thu, 4 Sep 2014 03:31:15 +0000 (13:31 +1000)]
ctdb-daemon: Move some inline declarations to header file
To avoid warnings when using --enable-developer, which uses
-Wmissing-prototypes.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Thu, 4 Sep 2014 03:30:09 +0000 (13:30 +1000)]
ctdb-tests: Add missing declarations caused by #define magic
Some declarations get lost because they basically get #define-d away,
so they need to be repeated after the #undef-s. Also, some functions
are introduced due the #define-s.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Thu, 4 Sep 2014 03:28:34 +0000 (13:28 +1000)]
ctdb-tests: Mark some functions as static
To avoid warnings when using --enable-developer, which uses
-Wmissing-prototypes.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Thu, 4 Sep 2014 02:34:46 +0000 (12:34 +1000)]
ctdb-util: Remove util/strlist.c and references to str_util_*()
They're not used in CTDB.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Thu, 4 Sep 2014 01:21:24 +0000 (11:21 +1000)]
ctdb: Fix some "declarations after code" problems
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Martin Schwenke [Thu, 4 Sep 2014 01:20:28 +0000 (11:20 +1000)]
ctdb-util: Variables should be declared extern in headers
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Karolin Seeger [Mon, 8 Sep 2014 19:34:35 +0000 (21:34 +0200)]
docs-xml: Bump version up to 4.2.
Signed-off-by: Karolin Seeger <kseeger@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Autobuild-User(master): David Disseldorp <ddiss@samba.org>
Autobuild-Date(master): Tue Sep 9 15:33:54 CEST 2014 on sn-devel-104
Karolin Seeger [Mon, 8 Sep 2014 19:27:13 +0000 (21:27 +0200)]
WHATSNEW: Start release notes for Samba 4.2.0rc1.
Signed-off-by: Karolin Seeger <kseeger@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Ralph Boehme [Mon, 8 Sep 2014 10:54:32 +0000 (12:54 +0200)]
s3:smbd: fix a comment typo
Signed-off-by: Ralph Boehme <rb@sernet.de>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Volker Lendecke [Mon, 8 Sep 2014 10:41:19 +0000 (12:41 +0200)]
smbd: Move make_dir_struct() to reply.c
This routine has nothing to do with dptr handling, it is SMB1 marshalling
called only from reply_search().
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Stefan Metzmacher [Mon, 18 Aug 2014 22:15:34 +0000 (00:15 +0200)]
s3:smbd: close the connection if the client doesn't start with a SMB1 Negprot or old messaging call.
The case where the client starts with a SMB2 Negprot is already handled
in smbd_smb2_request_dispatch().
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10766
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Tue Sep 9 13:02:21 CEST 2014 on sn-devel-104
Michael Adam [Thu, 4 Sep 2014 10:45:48 +0000 (12:45 +0200)]
Revert "buildtools: Rename perl vendorarch configure option."
This reverts commit
04685ff4eed9535769d6a5feee7353f1796a4389.
We are reverting buildtools/wafadmin/Tools/perl.py back to upstream state.
Everything special is now in buildtools/wafsamba/samba_perl.py.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Tue Sep 9 03:07:20 CEST 2014 on sn-devel-104
Michael Adam [Thu, 4 Sep 2014 10:45:40 +0000 (12:45 +0200)]
Revert "buildtools: Add perl vendorlib configure option."
This reverts commit
48f0183dbeddd7bdf333a40fe0d3e1c7e7fe00f2.
We are reverting buildtools/wafadmin/Tools/perl.py back to upstream state.
Everything special is now in buildtools/wafsamba/samba_perl.py.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Michael Adam [Thu, 4 Sep 2014 10:45:32 +0000 (12:45 +0200)]
Revert "wafsamba: If perl can't provide defaults, define them."
This reverts commit
0ba276ebad57d75a769e22414f94acbe8c177d97.
We are reverting buildtools/wafadmin/Tools/perl.py back to upstream state.
Everything special is now in buildtools/wafsamba/samba_perl.py.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Michael Adam [Thu, 4 Sep 2014 10:45:21 +0000 (12:45 +0200)]
Revert "wafsamba: Fail with error message if perl doesn't provide valid dirs."
This reverts commit
2637890ef42a238093f0f3cbdda0d621d5f9b2e2.
We are reverting buildtools/wafadmin/Tools/perl.py back to upstream state.
Everything special is now in buildtools/wafsamba/samba_perl.py.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Stefan Metzmacher [Tue, 26 Aug 2014 19:33:05 +0000 (21:33 +0200)]
pidl/wscript: remove --with-perl-* options
These are not needed anymore as we have useful defaults now.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>