metze/samba/wip.git
10 years agoWAF: use libsystemd-daemon only if linking actually succeeds
Alexander Bokovoy [Thu, 5 Jun 2014 05:15:13 +0000 (08:15 +0300)]
WAF: use libsystemd-daemon only if linking actually succeeds

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Thu Jun  5 17:16:22 CEST 2014 on sn-devel-104

10 years agoAdd YouCompleteMe config.
Andreas Schneider [Wed, 2 Apr 2014 07:01:41 +0000 (09:01 +0200)]
Add YouCompleteMe config.

This is a config file for a VIM code completion engine:
http://valloric.github.io/YouCompleteMe/

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Thu Jun  5 13:18:56 CEST 2014 on sn-devel-104

10 years agos3:vfs_afsacl fix compiler warnings
Christian Ambach [Sat, 24 May 2014 22:35:09 +0000 (00:35 +0200)]
s3:vfs_afsacl fix compiler warnings

Signed-off-by: Christian Ambach <ambi@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Christian Ambach <ambi@samba.org>
Autobuild-Date(master): Wed Jun  4 22:34:51 CEST 2014 on sn-devel-104

10 years agovfs_afsacl: remove unused includes
Christian Ambach [Wed, 14 May 2014 13:39:44 +0000 (15:39 +0200)]
vfs_afsacl: remove unused includes

* auth.h might cause collisions with the Heimdal headers
* we should not include afs/afs.h directly, see
https://bugs.launchpad.net/ubuntu/+source/openafs/+bug/1319336
http://rt.central.org/rt/Ticket/Display.html?id=131737

Signed-off-by: Christian Ambach <ambi@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agowaf: fixup build with fake kaserver enabled
Christian Ambach [Wed, 23 Apr 2014 15:03:47 +0000 (17:03 +0200)]
waf: fixup build with fake kaserver enabled

Signed-off-by: Christian Ambach <ambi@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agowaf: add --with-fake-kaserver option
Christian Ambach [Tue, 15 Apr 2014 22:36:25 +0000 (00:36 +0200)]
waf: add --with-fake-kaserver option

This option was not added during the transition from autoconf
to waf.
Bring it back so that the code can be used again.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=9916
Signed-off-by: Christian Ambach <ambi@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agos3:lib/afs move afs_settoken.c to common lib dir
Christian Ambach [Mon, 14 Apr 2014 20:35:21 +0000 (22:35 +0200)]
s3:lib/afs move afs_settoken.c to common lib dir

Signed-off-by: Christian Ambach <ambi@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agos3:lib/afs move afs.c to common lib dir
Christian Ambach [Mon, 14 Apr 2014 20:11:12 +0000 (22:11 +0200)]
s3:lib/afs move afs.c to common lib dir

some of the code in afs.c is needed by wbinfo that lives in the toplevel
nsswitch directory, so move the afs.c file to a new top-level lib/afs
directory. Use the name afs_funcs to avoid collisions with the afs.h
header from OpenAFS

Signed-off-by: Christian Ambach <ambi@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agos3-winbind: Use strlcpy to avoid log entry.
Andreas Schneider [Wed, 12 Feb 2014 12:26:02 +0000 (13:26 +0100)]
s3-winbind: Use strlcpy to avoid log entry.

The full_name from Windows can be longer than 255 chars which results in
a warning on log level 0 that we have a string overflow. This will avoid
the warning. However we should fix this sooner or later on the protocol
level to have no limit.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Wed Jun  4 16:49:11 CEST 2014 on sn-devel-104

10 years agodocs: Update Roadmap
Andrew Bartlett [Tue, 3 Jun 2014 08:10:47 +0000 (20:10 +1200)]
docs: Update Roadmap

Change-Id: I336f0c23759ea48fdb2bc3349d8fe19849645fb5
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Autobuild-User(master): David Disseldorp <ddiss@samba.org>
Autobuild-Date(master): Wed Jun  4 13:33:05 CEST 2014 on sn-devel-104

10 years agos3-rpc_server: Use C99 types in rpc_pipes.h
Andrew Bartlett [Thu, 8 May 2014 00:16:24 +0000 (12:16 +1200)]
s3-rpc_server: Use C99 types in rpc_pipes.h

Change-Id: Ic282f02f421870ff8a8623005979f8a034902d88
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Jun  4 05:48:29 CEST 2014 on sn-devel-104

10 years agos4-messaging: Make header guard less generic
Andrew Bartlett [Tue, 6 May 2014 01:38:44 +0000 (13:38 +1200)]
s4-messaging: Make header guard less generic

Change-Id: I659bbb317e69aee6632db8bce3c4bdb5f9ad3d8d
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
10 years agowinbind: Fix template homedir to match source3
Andrew Bartlett [Fri, 28 Mar 2014 03:32:06 +0000 (16:32 +1300)]
winbind: Fix template homedir to match source3

Fix provided by Andy Igoshin <ai@vsu.ru>

BUG: https://bugzilla.samba.org/show_bug.cgi?id=10324

Andrew Bartlett

Change-Id: Ie94d207fed91e9dfd85ee3c3339c376b25ac5fa4
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
10 years agomake winbindd work in "samba4" member server modes
Andrew Bartlett [Wed, 9 Apr 2014 03:54:07 +0000 (15:54 +1200)]
make winbindd work in "samba4" member server modes

These modes are useful for testing aspects of the code like the rpc proxy.

Andrew Bartlett

Change-Id: I87b3ac0df299dd176599f824f8815880470c6401
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
10 years agos3-param: Add lp_dnsdomain() for use by winbindd
Andrew Bartlett [Fri, 16 May 2014 08:04:21 +0000 (20:04 +1200)]
s3-param: Add lp_dnsdomain() for use by winbindd

Change-Id: I987aa533ebe11c93b9e836fafc7b19c81bf600a5
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
10 years agowinbindd: Use rpc_pipe_open_interface() so that winbindd uses the correct rpc servers
Andrew Bartlett [Mon, 28 Apr 2014 09:07:59 +0000 (21:07 +1200)]
winbindd: Use rpc_pipe_open_interface() so that winbindd uses the correct rpc servers

This means that in the AD DC, we use the AD DC servers, while in the classic DC or file server we continue
to use the built-in SAMR and LSA servers.

Andrew Bartlett

Change-Id: I63b1443f5665016f7fcbed35907ec29d4424ab18
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
10 years agos3-rpc_server: Give log messages on failure
Andrew Bartlett [Mon, 28 Apr 2014 21:08:25 +0000 (09:08 +1200)]
s3-rpc_server: Give log messages on failure

Change-Id: I240d58fdf71bbab42d1ffb63bb52b9650fd4bd85
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
10 years agowinbindd: Remove pointless if statement
Andrew Bartlett [Mon, 28 Apr 2014 09:03:40 +0000 (21:03 +1200)]
winbindd: Remove pointless if statement

Change-Id: I7d2646078f6e7ba596b92da7d37c285d10ad38c0
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
10 years agowinbindd: explain that this check protects the AD DC machine account password (for...
Andrew Bartlett [Sun, 18 May 2014 23:08:00 +0000 (11:08 +1200)]
winbindd: explain that this check protects the AD DC machine account password (for now at least)

Change-Id: I2e2eb2e7fc4a12f27025f42e4cc41560311ce6c8
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
10 years agodsdb: Do not give an error is metadata.tdb does not yet exist
Andrew Bartlett [Fri, 23 May 2014 04:41:33 +0000 (16:41 +1200)]
dsdb: Do not give an error is metadata.tdb does not yet exist

Change-Id: I88ee188c776364fd66da388ce01fc9288aa2ded0
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
10 years agoselftest: Add knownfail entries for wbinfo --user-info tests only on the failing...
Andrew Bartlett [Mon, 19 May 2014 21:23:33 +0000 (09:23 +1200)]
selftest: Add knownfail entries for wbinfo --user-info tests only on the failing environments

This is better than skipping on every environment in the test

Andrew Bartlett

Change-Id: Ib4b114059d8f8bb05a9bdc2eca0f71310fc5a3bc
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
10 years agoselftest: move all winbind test rules to one place
Andrew Bartlett [Mon, 19 May 2014 05:32:56 +0000 (17:32 +1200)]
selftest: move all winbind test rules to one place

We now run wbinfo_simple additionally against plugin_s4_dc and dc

This also extends many of the tests to run against more environments,
hence the additional knownfail entries.

For winbind.wbclient, the fl2003dc environment has been selected not
to run with password history so as to allow the winindd.wbinfo test to
complete (once switched to running winbindd).

Andrew Bartlett

Change-Id: I475fd9937e515796b5e47c042a8bfa85f76441ca
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
10 years agoselftest: enable winbind enum users/groups in s4 environments
Andrew Bartlett [Mon, 19 May 2014 23:16:07 +0000 (11:16 +1200)]
selftest: enable winbind enum users/groups in s4 environments

Change-Id: I5a9218294580670048636645315a9cf217618e58
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
10 years agoselftest: Make test_wbinfo.sh work with s3-winbindd
Andrew Bartlett [Mon, 12 May 2014 05:10:14 +0000 (17:10 +1200)]
selftest: Make test_wbinfo.sh work with s3-winbindd

Change-Id: I41ed850b6424eac3fb8b6603d5b87c66bb77dd51
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
10 years agolibwbclient-tests: No longer hardcoded password and test domain
Andrew Bartlett [Mon, 12 May 2014 02:29:27 +0000 (14:29 +1200)]
libwbclient-tests: No longer hardcoded password and test domain

The password is made more complex, and the test domain is made to
use the command line options.

Andrew Bartlett

Change-Id: Ia1ec24a9fc393e7f7b210f845bcf32dbc933d48f
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
10 years agoselftest: Run samba4.blackbox.wbinfo against plugin_s4_dc
Andrew Bartlett [Wed, 9 Apr 2014 03:37:33 +0000 (15:37 +1200)]
selftest: Run samba4.blackbox.wbinfo against plugin_s4_dc

Change-Id: I5580de814d5fe000d352f3c78743837d26f9422d
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
10 years agoselftest: Set winbind separator = /
Andrew Bartlett [Mon, 31 Mar 2014 07:47:18 +0000 (20:47 +1300)]
selftest: Set winbind separator = /

This avoids a pile of shell-script escape pain, and fixes some tests.

Andrew Bartlett

Change-Id: Ie1d0e32ab484a5b0ddbc4073831fe6de27e38e92
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
10 years agoselftest: Ensure winbindd is fully operating before running tests
Andrew Bartlett [Fri, 23 May 2014 21:44:58 +0000 (09:44 +1200)]
selftest: Ensure winbindd is fully operating before running tests

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
10 years agoselftest: consitently use the name s4member
Andrew Bartlett [Sat, 24 May 2014 10:47:30 +0000 (22:47 +1200)]
selftest: consitently use the name s4member

This avoids a conflict with the Samba3.pm defined member environment, and so spurious
failures in make test for the member environment dependent on test ordering.

Andrew Bartlett

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
10 years agodocs: Remove out of date Kerberos and security chapter
Andrew Bartlett [Tue, 3 Jun 2014 08:20:08 +0000 (20:20 +1200)]
docs: Remove out of date Kerberos and security chapter

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Jun  3 21:24:45 CEST 2014 on sn-devel-104

10 years agodocs: Multiple passdb backend support has been removed
Andrew Bartlett [Tue, 3 Jun 2014 08:20:07 +0000 (20:20 +1200)]
docs: Multiple passdb backend support has been removed

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agodocs: Remove most references to Samba-3 and change to just Samba
Andrew Bartlett [Tue, 3 Jun 2014 08:20:06 +0000 (20:20 +1200)]
docs: Remove most references to Samba-3 and change to just Samba

References are kept where the version number makes sense in the context.

Andrew Bartlett

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agodocs: Samba is now GPLv3
Andrew Bartlett [Tue, 3 Jun 2014 08:20:05 +0000 (20:20 +1200)]
docs: Samba is now GPLv3

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agodocs: Remove references to SWAT (now removed)
Andrew Bartlett [Tue, 3 Jun 2014 08:20:04 +0000 (20:20 +1200)]
docs: Remove references to SWAT (now removed)

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agomessaging3: Fix a talloc_tos memleak
Volker Lendecke [Mon, 2 Jun 2014 20:48:56 +0000 (22:48 +0200)]
messaging3: Fix a talloc_tos memleak

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agos3:messaging: protect use of msg_control with HAVE_STRUCT_MSGHDR_MSG_CONTROL
Michael Adam [Sat, 31 May 2014 10:16:08 +0000 (12:16 +0200)]
s3:messaging: protect use of msg_control with HAVE_STRUCT_MSGHDR_MSG_CONTROL

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Tue Jun  3 01:14:17 CEST 2014 on sn-devel-104

10 years agobuild: rename HAVE_MSGHDR_MSG_ACCTRIGHTS to HAVE_STRUCT_MSGHDR_MSG_ACCTRIGHTS
Michael Adam [Sat, 31 May 2014 10:05:50 +0000 (12:05 +0200)]
build: rename HAVE_MSGHDR_MSG_ACCTRIGHTS to HAVE_STRUCT_MSGHDR_MSG_ACCTRIGHTS

for consistency.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
10 years agobuild: rename HAVE_MSGHDR_MSG_CONTROL to HAVE_STRUCT_MSGHDR_MSG_CONTROL
Michael Adam [Sat, 31 May 2014 10:04:05 +0000 (12:04 +0200)]
build: rename HAVE_MSGHDR_MSG_CONTROL to HAVE_STRUCT_MSGHDR_MSG_CONTROL

So that we are consistent with the socket_wrapper define.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
10 years agovfs:aio_fork: simplify checking of MSG_CONTROL and MSG_ACCTRIGHTS
Michael Adam [Sat, 31 May 2014 09:58:01 +0000 (11:58 +0200)]
vfs:aio_fork: simplify checking of MSG_CONTROL and MSG_ACCTRIGHTS

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
10 years agos3:smb2_server: call smbd_smb2_flush_send_queue() directly
Stefan Metzmacher [Fri, 23 May 2014 10:30:21 +0000 (12:30 +0200)]
s3:smb2_server: call smbd_smb2_flush_send_queue() directly

This avoids recursion into smbd_smb2_io_handler(),
which avoids confusion when analysing out put of
performance analysing tools, e.g. callgrind.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Sat May 31 04:25:36 CEST 2014 on sn-devel-104

10 years agos3:smb2_server: fix invalid TALLOC_FREE(iov) in smbd_smb2_inbuf_parse_compound()
Stefan Metzmacher [Fri, 23 May 2014 10:21:57 +0000 (12:21 +0200)]
s3:smb2_server: fix invalid TALLOC_FREE(iov) in smbd_smb2_inbuf_parse_compound()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agomessaging3: Enforce just one messaging context
Volker Lendecke [Tue, 18 Feb 2014 19:51:23 +0000 (20:51 +0100)]
messaging3: Enforce just one messaging context

The current messaging implementation is based on a tdb indexed by server_id. If
we have more than one messaging context in a process, messages might not arrive
at the right context and be dropped, depending on which signal handler is
triggered first.

This is the same patch as bd55fdb lifted to messaging.c

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agomessaging3: Make messaging_context private
Volker Lendecke [Thu, 29 May 2014 14:44:55 +0000 (16:44 +0200)]
messaging3: Make messaging_context private

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agomessaging3: Add and use messaging_tevent_context()
Volker Lendecke [Thu, 29 May 2014 14:44:32 +0000 (16:44 +0200)]
messaging3: Add and use messaging_tevent_context()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agomessaging3: Introduce messaging_local_backend()
Volker Lendecke [Thu, 29 May 2014 13:01:03 +0000 (15:01 +0200)]
messaging3: Introduce messaging_local_backend()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agomessaging3: The backend send_fn doesn't need a messaging_context
Volker Lendecke [Thu, 29 May 2014 12:51:37 +0000 (14:51 +0200)]
messaging3: The backend send_fn doesn't need a messaging_context

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agoimessaging: Fix a comment
Volker Lendecke [Thu, 29 May 2014 11:10:45 +0000 (13:10 +0200)]
imessaging: Fix a comment

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agoFix several talloc stack frames not freed
Samuel Cabrero [Wed, 28 May 2014 15:57:31 +0000 (17:57 +0200)]
Fix several talloc stack frames not freed

Signed-off-by: Samuel Cabrero <scabrero@zentyal.com>
Reviewed-by: Kamen Mazdrashki <kamenim@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Kamen Mazdrashki <kamenim@samba.org>
Autobuild-Date(master): Fri May 30 15:29:29 CEST 2014 on sn-devel-104

10 years agos3:messaging: change unix_dgram_recv_handler() to use recvmsg, not recv
Michael Adam [Tue, 13 May 2014 10:42:32 +0000 (12:42 +0200)]
s3:messaging: change unix_dgram_recv_handler() to use recvmsg, not recv

This is in preparation of adding fd-passing to messaging.

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): Fri May 30 02:28:15 CEST 2014 on sn-devel-104

10 years agos3:messaging: change messaging_backend to use iovec instead of data blob in send_fn
Michael Adam [Tue, 13 May 2014 09:55:37 +0000 (11:55 +0200)]
s3:messaging: change messaging_backend to use iovec instead of data blob in send_fn

This also changes the layering

messaging_send_iov -> messaging_send_buf -> messaging_send

to

messaging_send_buf -> messaging_send -> messaging_send_iov

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agoctdb-tools-ctdb: Make natgwlist and lvsmaster more resilient
Martin Schwenke [Fri, 23 May 2014 11:58:55 +0000 (21:58 +1000)]
ctdb-tools-ctdb: Make natgwlist and lvsmaster more resilient

Recent changes have caused these commands to attempt to get
capabilities from all nodes before doing further filtering.  This
means that capabilities are unnecessarily fetched from nodes that are
unlikely to be the master.  If such a node does not answer the control
then many nodes can fail to calculate the master node.  In the case of
natgwlist this will cause "monitor" events to fail resulting in
unhealthy nodes.

Restore the behaviour where capabilities are only fetched for a node
that will be the master if it has the desired flags.

Although this masks a problem where a connected node is not replying,
it can help to avoid an outage in some cases.

Add supporting tests and infrastructure.  Infrastructure just lets a
timeout be faked - just for ctdb_ctrl_getcapabilities_stub() so far.
First test checks that this infrastructure works if the first node
times out in natgwlist.  Second test checks the case worked around by
the above fix - that is, no failure when a node with PNN beyond the
NATGW master can time out.

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 May 29 05:59:37 CEST 2014 on sn-devel-104

10 years agoctdb-ib: Make infiniband transport compile again
Amitay Isaacs [Wed, 28 May 2014 00:40:29 +0000 (10:40 +1000)]
ctdb-ib: Make infiniband transport compile again

Update included header files and fix compilation warnings.

  ib/ibwrapper.c: In function â€˜ibw_stop’:
  ib/ibwrapper.c:1015:17: warning: comparison between â€˜enum ibw_state_ctx’ and â€˜enum ibw_state_conn’ [-Wenum-compare]
     if (ctx->state==IBWC_ERROR || ctx->state==IBWC_CONNECTED) {
                 ^
  ib/ibwrapper.c:1015:43: warning: comparison between â€˜enum ibw_state_ctx’ and â€˜enum ibw_state_conn’ [-Wenum-compare]
     if (ctx->state==IBWC_ERROR || ctx->state==IBWC_CONNECTED) {

The current logic just seems wrong.  The context of this line and the
error checking in ibw_disconnect() suggest that these comparisons
should use p->state rather than ctx->state, so do that.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
10 years agoctdb-pmda: Do not hardcode include paths
Amitay Isaacs [Tue, 27 May 2014 22:09:02 +0000 (08:09 +1000)]
ctdb-pmda: Do not hardcode include paths

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
10 years agolibcli/security: remove sec_ace_equal
David Disseldorp [Wed, 28 May 2014 15:50:52 +0000 (17:50 +0200)]
libcli/security: remove sec_ace_equal

This function is a duplicate of security_ace_equal(), and is no longer
used.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Thu May 29 03:34:38 CEST 2014 on sn-devel-104

10 years agosecdesc: use security_ace_equal instead of sec_ace_equal
David Disseldorp [Wed, 28 May 2014 15:44:43 +0000 (17:44 +0200)]
secdesc: use security_ace_equal instead of sec_ace_equal

Both offer the same functionality, sec_ace_equal() will be removed.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agotorture/attr: use security_ace_equal instead of sec_ace_equal
David Disseldorp [Wed, 28 May 2014 15:44:43 +0000 (17:44 +0200)]
torture/attr: use security_ace_equal instead of sec_ace_equal

Both offer the same functionality, sec_ace_equal() will be removed.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agos3/smbcacls: use security_ace_equal instead of sec_ace_equal
David Disseldorp [Wed, 28 May 2014 15:44:43 +0000 (17:44 +0200)]
s3/smbcacls: use security_ace_equal instead of sec_ace_equal

Both offer the same functionality, sec_ace_equal() will be removed.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agos3/sharesec: use security_ace_equal instead of sec_ace_equal
David Disseldorp [Wed, 28 May 2014 15:44:08 +0000 (17:44 +0200)]
s3/sharesec: use security_ace_equal instead of sec_ace_equal

Both offer the same functionality, sec_ace_equal() will be removed.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agos3/libsmb_xattr: use security_ace_equal instead of sec_ace_equal
David Disseldorp [Wed, 28 May 2014 15:42:08 +0000 (17:42 +0200)]
s3/libsmb_xattr: use security_ace_equal instead of sec_ace_equal

Both offer the same functionality, sec_ace_equal() will be removed.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agolibcli/security: cleanup security_ace_equal()
David Disseldorp [Wed, 28 May 2014 15:13:32 +0000 (17:13 +0200)]
libcli/security: cleanup security_ace_equal()

This change cleans up the white-space damage, and converts the single
line if-then statements to match Samba's coding conventions.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agolibcli/security: remove unused sec_ace_del_sid()
David Disseldorp [Wed, 28 May 2014 15:11:20 +0000 (17:11 +0200)]
libcli/security: remove unused sec_ace_del_sid()

With sec_desc_del_sid() now gone, this can also be removed.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agolibcli/security: remove unused sec_desc_del_sid()
David Disseldorp [Wed, 28 May 2014 14:48:59 +0000 (16:48 +0200)]
libcli/security: remove unused sec_desc_del_sid()

The function is unused, and shares mostly the same behaviour as
security_descriptor_acl_del().

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agolibcli/security: remove dup_sec_acl()
David Disseldorp [Wed, 28 May 2014 13:43:34 +0000 (15:43 +0200)]
libcli/security: remove dup_sec_acl()

With make_sec_desc() converted to use security_acl_dup(), which offers
the same behaviour, this function is no longer needed.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agolibcli/security: clean up and fix make_sec_desc
David Disseldorp [Wed, 28 May 2014 13:25:29 +0000 (15:25 +0200)]
libcli/security: clean up and fix make_sec_desc

It currently leaks memory onto the provided talloc context on error, fix
this.

Use X_acl_dup() functions provided by secuity_descriptor.c, rather than
the redundant secdesc.c calls. Also, use the IDL generated functions to
calculate the security descriptor structure size.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agos3/profiles: improve copy_registry_tree() errors
David Disseldorp [Tue, 27 May 2014 09:04:11 +0000 (11:04 +0200)]
s3/profiles: improve copy_registry_tree() errors

The current error logic doesn't distinguish between a NULL source
security descriptor and ENOMEM.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed May 28 20:18:21 CEST 2014 on sn-devel-104

10 years agolibcli/secdesc: remove dup_sec_desc()
David Disseldorp [Mon, 26 May 2014 14:25:31 +0000 (16:25 +0200)]
libcli/secdesc: remove dup_sec_desc()

With all callers converted to use security_descriptor_copy(), this
function can be removed.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
10 years agolibcli/secdesc: replace dup_sec_desc() usage
David Disseldorp [Mon, 26 May 2014 13:48:34 +0000 (15:48 +0200)]
libcli/secdesc: replace dup_sec_desc() usage

Use security_descriptor_copy() instead, which is also provided by
libcli.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
10 years agolibgpo: replace dup_sec_desc() usage
David Disseldorp [Mon, 26 May 2014 13:48:34 +0000 (15:48 +0200)]
libgpo: replace dup_sec_desc() usage

Use security_descriptor_copy() instead, which is also provided by
libcli.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agos3/rpc_server/lsa: replace dup_sec_desc() usage
David Disseldorp [Mon, 26 May 2014 13:48:34 +0000 (15:48 +0200)]
s3/rpc_server/lsa: replace dup_sec_desc() usage

Use security_descriptor_copy() instead, which is also provided by
libcli.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
10 years agos3/rpc_server/spoolss: replace dup_sec_desc() usage
David Disseldorp [Mon, 26 May 2014 13:48:34 +0000 (15:48 +0200)]
s3/rpc_server/spoolss: replace dup_sec_desc() usage

Use security_descriptor_copy() instead, which is also provided by
libcli.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
10 years agos3/posix_acls: replace dup_sec_desc() usage
David Disseldorp [Mon, 26 May 2014 13:46:52 +0000 (15:46 +0200)]
s3/posix_acls: replace dup_sec_desc() usage

Use security_descriptor_copy() instead, which is also provided by
libcli.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
10 years agos3/net_rpc_printer: replace dup_sec_desc() usage
David Disseldorp [Mon, 26 May 2014 13:46:00 +0000 (15:46 +0200)]
s3/net_rpc_printer: replace dup_sec_desc() usage

Use security_descriptor_copy() instead, which is also provided by
libcli.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
10 years agos3/profiles: replace dup_sec_desc() usage
David Disseldorp [Mon, 26 May 2014 13:41:41 +0000 (15:41 +0200)]
s3/profiles: replace dup_sec_desc() usage

Use security_descriptor_copy() instead, which is also provided by
libcli.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
10 years agos3/rpc_server/spoolss: remove SETUP_SPOOLSS_NOTIFY_DATA_SECDESC
David Disseldorp [Mon, 26 May 2014 13:20:13 +0000 (15:20 +0200)]
s3/rpc_server/spoolss: remove SETUP_SPOOLSS_NOTIFY_DATA_SECDESC

The macro is only used once, and is broken in two ways:
- it relies on an externally defined mem_ctx
- _data->data.sd.sd_size is set zero twice for a NULL sd

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
10 years agosharesec: remove unused security descriptor print fns
David Disseldorp [Mon, 26 May 2014 12:39:41 +0000 (14:39 +0200)]
sharesec: remove unused security descriptor print fns

IDL generated NDR routines are now used, so the old hand rolled
functions can be removed.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
10 years agosharesec: use NDR security descriptor print fns
David Disseldorp [Mon, 26 May 2014 12:38:24 +0000 (14:38 +0200)]
sharesec: use NDR security descriptor print fns

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
10 years agolibcli/sd: remove redundant sec_ace_add_sid()
David Disseldorp [Mon, 26 May 2014 10:34:38 +0000 (12:34 +0200)]
libcli/sd: remove redundant sec_ace_add_sid()

This function adds a new allow-type ACE to an existing ACE list. With
the removal of sec_desc_add_sid(), this is no longer used internally.

The same behaviour can be achieved via the much cleaner
security_ace_create() function.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
10 years agolibcli/sd: remove redundant sec_desc_add_sid()
David Disseldorp [Mon, 26 May 2014 10:23:47 +0000 (12:23 +0200)]
libcli/sd: remove redundant sec_desc_add_sid()

This function adds an ACE to a security descriptor DACL. The same can be
achieved via the more flexible and much cleaner security_ace_create()
and security_descriptor_dacl_add() functions.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
10 years agoctdb-tools-ctdb: scriptstatus should not count disabled scripts
Martin Schwenke [Tue, 6 May 2014 01:08:57 +0000 (11:08 +1000)]
ctdb-tools-ctdb: scriptstatus should not count disabled scripts

script_status->num_scripts is used as the count in this message:

  "%d scripts were executed last %s cycle\n"

However, script_status->num_scripts includes disabled scripts, which
are never actually executed.

Instead, count the number of scripts that aren't disabled and make the
message print that.

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 May 28 02:27:48 CEST 2014 on sn-devel-104

10 years agoRemove obsolete README.packaging4.
Michael Adam [Tue, 27 May 2014 12:30:10 +0000 (14:30 +0200)]
Remove obsolete README.packaging4.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Autobuild-User(master): David Disseldorp <ddiss@samba.org>
Autobuild-Date(master): Tue May 27 19:55:07 CEST 2014 on sn-devel-104

10 years agolibcli: Simplify desc_ace_has_generic()
Volker Lendecke [Tue, 27 May 2014 07:04:38 +0000 (07:04 +0000)]
libcli: Simplify desc_ace_has_generic()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
10 years agolibcli: Simplify desc_expand_generic()
Volker Lendecke [Tue, 27 May 2014 07:03:18 +0000 (07:03 +0000)]
libcli: Simplify desc_expand_generic()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
10 years agolibcli: Avoid an explicit memset call
Volker Lendecke [Mon, 26 May 2014 21:01:38 +0000 (21:01 +0000)]
libcli: Avoid an explicit memset call

On x86 with -O3, this saves surprising 160 bytes .text

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
10 years agolibcli: Avoid a talloc/free
Volker Lendecke [Mon, 26 May 2014 20:57:31 +0000 (20:57 +0000)]
libcli: Avoid a talloc/free

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
10 years agolibcli: Avoid a talloc/free
Volker Lendecke [Mon, 26 May 2014 20:57:31 +0000 (20:57 +0000)]
libcli: Avoid a talloc/free

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
10 years agos3-build: Support building with in-tree CTDB
Amitay Isaacs [Tue, 13 May 2014 15:11:43 +0000 (01:11 +1000)]
s3-build: Support building with in-tree CTDB

If --with-ctdb-dir option is not specified, use CTDB headers from ctdb/
subdirectory in the source tree.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Tue May 27 16:07:13 CEST 2014 on sn-devel-104

10 years agoctdb-build: Move internal include files in a separate directory
Amitay Isaacs [Tue, 13 May 2014 13:13:13 +0000 (23:13 +1000)]
ctdb-build: Move internal include files in a separate directory

This will allow to build clustered samba with built-in ctdb tree rather
than needing to install CTDB first.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Michael Adam <obnox@samba.org>
10 years agoctdb-build: Build ctdb_version.h before compiling files that include it
Amitay Isaacs [Tue, 13 May 2014 15:40:22 +0000 (01:40 +1000)]
ctdb-build: Build ctdb_version.h before compiling files that include it

This will correctly build ctdb_version.h before other targets when
running make -j.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Michael Adam <obnox@samba.org>
10 years agolibcli: Fix a memleak
Volker Lendecke [Mon, 26 May 2014 20:48:05 +0000 (20:48 +0000)]
libcli: Fix a memleak

struct security_ace has a struct dom_sid, not a pointer to it. So we don't have
to talloc it first and then not free it.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Tue May 27 12:54:55 CEST 2014 on sn-devel-104

10 years agomessaging3: Remove a pointless return;
Volker Lendecke [Tue, 13 May 2014 13:02:57 +0000 (15:02 +0200)]
messaging3: Remove a pointless return;

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Tue May 27 04:41:43 CEST 2014 on sn-devel-104

10 years agomessaging3: Fix whitespace
Volker Lendecke [Wed, 14 May 2014 07:31:20 +0000 (09:31 +0200)]
messaging3: Fix whitespace

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
10 years agoserverid: Fix an incompatible pointer assignment
Volker Lendecke [Wed, 14 May 2014 08:13:48 +0000 (10:13 +0200)]
serverid: Fix an incompatible pointer assignment

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
10 years agosmbd: Fix a typo
Volker Lendecke [Fri, 23 May 2014 13:19:05 +0000 (15:19 +0200)]
smbd: Fix a typo

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
10 years agos4-dns: dlz_bind9: improve log message consistency
Arvid Requate [Sun, 18 May 2014 17:16:06 +0000 (19:16 +0200)]
s4-dns: dlz_bind9: improve log message consistency

Change-Id: I0a12c048fd4e667b9aa0777f99c8f8306fc090ea
Signed-off-by: Arvid Requate <requate@univention.de>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Kai Blin <kai@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Mon May 26 05:55:46 CEST 2014 on sn-devel-104

10 years agos4-dns: dlz_bind9: Fix ipv6 updates
Arvid Requate [Sat, 17 May 2014 16:25:01 +0000 (18:25 +0200)]
s4-dns: dlz_bind9: Fix ipv6 updates

b9_record_match needs to consider all allowed representations of IPv6
addresses (RFC 2373), otherwise DNS subtractrdataset operations fail
due to differences in zero padding between bind9 frontend and ndr_pull
of a dnsp_DnssrvRpcRecord structure.

Change-Id: Ic0a1b16008458993dc644646d7f4ae3d3a3c5fed
Signed-off-by: Arvid Requate <requate@univention.de>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Kai Blin <kai@samba.org>
Reviewed-by: Guenter Kukkukk <kukks@samba.org>
10 years agos4:librpc/rpc: allow a shortcut in dcerpc_pipe_connect_ncacn_np_smb[2]_send()
Stefan Metzmacher [Wed, 15 Jan 2014 12:06:20 +0000 (13:06 +0100)]
s4:librpc/rpc: allow a shortcut in dcerpc_pipe_connect_ncacn_np_smb[2]_send()

If the caller provided smbXcli * pointers of an existing connection,
we can use it.

This will be used later in order to allow multiple dcerpc connections
over the same smb connection.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agos4:librpc/rpc: split out continue_smb_open()
Stefan Metzmacher [Wed, 15 Jan 2014 12:03:27 +0000 (13:03 +0100)]
s4:librpc/rpc: split out continue_smb_open()

The smb and smb2 code pathes are the same.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agos4:librpc/rpc: remove pipe_np_smb2_state and use pipe_np_smb_state
Stefan Metzmacher [Wed, 15 Jan 2014 11:58:52 +0000 (12:58 +0100)]
s4:librpc/rpc: remove pipe_np_smb2_state and use pipe_np_smb_state

There's no need for two almost identical structures.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agos4:librpc/rpc: remember some smbXcli_* pointers within struct dcerpc_pipe_connect
Stefan Metzmacher [Wed, 15 Jan 2014 11:56:36 +0000 (12:56 +0100)]
s4:librpc/rpc: remember some smbXcli_* pointers within struct dcerpc_pipe_connect

This will simplify further improvements.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
10 years agos4:librpc/rpc: use DCERPC_REQUEST_TIMEOUT for smb opens
Stefan Metzmacher [Wed, 15 Jan 2014 12:17:42 +0000 (13:17 +0100)]
s4:librpc/rpc: use DCERPC_REQUEST_TIMEOUT for smb opens

There's no need to make the connect timeout dynamic.
We implicitly used SMB_REQUEST_TIMEOUT which is also 60 seconds before.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>