samba.git
5 years agoutils: Add kerberos tracing
Swen Schillig [Wed, 5 Dec 2018 10:44:24 +0000 (11:44 +0100)]
utils: Add kerberos tracing

Replace kerberos context initialization from
raw krb5_init_context() to smb_krb5_init_context_basic()
which is adding common tracing as well.

Signed-off-by: Swen Schillig <swen@linux.ibm.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Christof Schmitt <cs@samba.org>
5 years agopassdb: Add kerberos tracing
Swen Schillig [Wed, 5 Dec 2018 10:41:47 +0000 (11:41 +0100)]
passdb: Add kerberos tracing

Replace kerberos context initialization from
raw krb5_init_context() to smb_krb5_init_context_basic()
which is adding common tracing as well.

Signed-off-by: Swen Schillig <swen@linux.ibm.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Christof Schmitt <cs@samba.org>
5 years agolibrpc: Add kerberos tracing
Swen Schillig [Wed, 5 Dec 2018 10:38:44 +0000 (11:38 +0100)]
librpc: Add kerberos tracing

Replace kerberos context initialization from
raw krb5_init_context() to smb_krb5_init_context_basic()
which is adding common tracing as well.

Signed-off-by: Swen Schillig <swen@linux.ibm.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Christof Schmitt <cs@samba.org>
5 years agolibnet: Add kerberos tracing
Swen Schillig [Wed, 5 Dec 2018 10:35:42 +0000 (11:35 +0100)]
libnet: Add kerberos tracing

Replace kerberos context initialization from
raw krb5_init_context() to smb_krb5_init_context_basic()
which is adding common tracing as well.

Signed-off-by: Swen Schillig <swen@linux.ibm.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Christof Schmitt <cs@samba.org>
5 years agolibads: Add kerberos tracing
Swen Schillig [Wed, 5 Dec 2018 10:16:42 +0000 (11:16 +0100)]
libads: Add kerberos tracing

Replace kerberos context initialization from
raw krb5_init_context() to smb_krb5_init_context_basic()
which is adding common tracing as well.

Signed-off-by: Swen Schillig <swen@linux.ibm.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Christof Schmitt <cs@samba.org>
5 years agoclient: Add kerberos tracing
Swen Schillig [Wed, 5 Dec 2018 10:06:20 +0000 (11:06 +0100)]
client: Add kerberos tracing

Replace kerberos context initialization from
raw krb5_init_context() to smb_krb5_init_context_basic()
which is adding common tracing as well.

Signed-off-by: Swen Schillig <swen@linux.ibm.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Christof Schmitt <cs@samba.org>
5 years agolib: Add kerberos tracing
Swen Schillig [Wed, 5 Dec 2018 10:03:33 +0000 (11:03 +0100)]
lib: Add kerberos tracing

Add krb5 tracing to samba krb5 wrapper.

Signed-off-by: Swen Schillig <swen@linux.ibm.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Christof Schmitt <cs@samba.org>
5 years agoAdd MIT kerberos tracing capability
Swen Schillig [Wed, 5 Dec 2018 09:29:44 +0000 (10:29 +0100)]
Add MIT kerberos tracing capability

HEIMDAL kerberos offers already tracing via a logging facility
through smb_krb5_init_context().
MIT kerberos offers to register a callback via krb5_set_trace_callback
with which tracing information can be routed to a common logging facility.
This is now integrated into smb_krb5_init_context_basic() offering
the same functionality for both kerberos fragrances.

Signed-off-by: Swen Schillig <swen@linux.ibm.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Christof Schmitt <cs@samba.org>
5 years agosamba-tool: don't print backtrace on simple DNS errors
Björn Jacke [Tue, 18 Dec 2018 11:58:53 +0000 (12:58 +0100)]
samba-tool: don't print backtrace on simple DNS errors

samba-tool throws backtraces even for simple DNS error
messages, we should not frighten users for no good reason.

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

Signed-off-by: Bjoern Jacke <bj@sernet.de>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Björn Jacke <bj@sernet.de>
Autobuild-Date(master): Wed Dec 19 20:58:52 CET 2018 on sn-devel-144

5 years agotests/ntlm_auth: Port ntlm_auth_diagnostics tests to python
Samuel Cabrero [Thu, 6 Sep 2018 11:56:53 +0000 (13:56 +0200)]
tests/ntlm_auth: Port ntlm_auth_diagnostics tests to python

Port ntlm_auth_diagnostics bash script tests to python

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Noel Power <npower@samba.org>
Autobuild-Date(master): Wed Dec 19 16:21:32 CET 2018 on sn-devel-144

5 years agoselftest: Remove test_ntlm_auth.py helper
Samuel Cabrero [Thu, 15 Nov 2018 10:17:43 +0000 (11:17 +0100)]
selftest: Remove test_ntlm_auth.py helper

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agotests/ntlm_auth: Port ntlm_auth_krb5 tests to python
Samuel Cabrero [Thu, 6 Sep 2018 10:58:42 +0000 (12:58 +0200)]
tests/ntlm_auth: Port ntlm_auth_krb5 tests to python

Port ntlm_auth_krb5 bash script tests to python

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agotests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth ntlm-server-1 with incorre...
Samuel Cabrero [Fri, 31 Aug 2018 17:28:06 +0000 (19:28 +0200)]
tests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth ntlm-server-1 with incorrect fixed password against winbind

Port ntlm_auth bash script tests to python and remove bash test script

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agotests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth ntlm-server-1 with plainte...
Samuel Cabrero [Fri, 31 Aug 2018 17:27:20 +0000 (19:27 +0200)]
tests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth ntlm-server-1 with plaintext password against winbind but wrong sid

Port ntlm_auth bash script tests to python

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agotests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth ntlm-server-1 with plainte...
Samuel Cabrero [Fri, 31 Aug 2018 17:15:05 +0000 (19:15 +0200)]
tests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth ntlm-server-1 with plaintext password against winbind

Port ntlm_auth bash script tests to python

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agotests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth ntlm-server-1 with incorre...
Samuel Cabrero [Fri, 31 Aug 2018 17:06:18 +0000 (19:06 +0200)]
tests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth ntlm-server-1 with incorrect fixed password

Port ntlm_auth bash script tests to python

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agotests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth ntlm-server-1 with fixed...
Samuel Cabrero [Fri, 31 Aug 2018 16:49:13 +0000 (18:49 +0200)]
tests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth ntlm-server-1 with fixed password

Port ntlm_auth bash script tests to python

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agotests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth plaintext authentication...
Samuel Cabrero [Fri, 31 Aug 2018 16:27:50 +0000 (18:27 +0200)]
tests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth plaintext authentication with failed require-membership-of

Port ntlm_auth bash script tests to python

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agotests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth plaintext authentication...
Samuel Cabrero [Fri, 31 Aug 2018 16:24:56 +0000 (18:24 +0200)]
tests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth plaintext authentication with require-membership-of

Port ntlm_auth bash script tests to python

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agotests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth with NTLMSSP gss-spnego...
Samuel Cabrero [Fri, 31 Aug 2018 16:01:17 +0000 (18:01 +0200)]
tests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth with NTLMSSP gss-spnego-client and gss-spnego server against winbind with failed require-membership-of

Port ntlm_auth bash script tests to python

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agotests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth against winbindd with...
Samuel Cabrero [Fri, 31 Aug 2018 15:53:16 +0000 (17:53 +0200)]
tests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth against winbindd with failed require-membership-of

Port ntlm_auth bash script tests to python

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agotests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth with NTLMSSP gss-spnego...
Samuel Cabrero [Fri, 31 Aug 2018 15:46:59 +0000 (17:46 +0200)]
tests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth with NTLMSSP gss-spnego-client and gss-spnego server against winbind with require-membership-of

Port ntlm_auth bash script tests to python

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agotests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth against winbindd with...
Samuel Cabrero [Fri, 31 Aug 2018 15:41:40 +0000 (17:41 +0200)]
tests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth against winbindd with require-membership-of

Port ntlm_auth bash script tests to python

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Noel Power <noel.power@suse.com>
5 years agotests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth ccached credentials with...
Samuel Cabrero [Fri, 31 Aug 2018 15:07:23 +0000 (17:07 +0200)]
tests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth ccached credentials with NTLMSSP client and gss-spnego server

Port ntlm_auth bash script tests to python

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agotests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth with NTLMSSP gss-spnego...
Samuel Cabrero [Fri, 31 Aug 2018 14:42:05 +0000 (16:42 +0200)]
tests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth with NTLMSSP gss-spnego-client and gss-spnego server against winbind

Port ntlm_auth bash script tests to python

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agotests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth with NTLMSSP gss-spnego...
Samuel Cabrero [Fri, 31 Aug 2018 14:28:37 +0000 (16:28 +0200)]
tests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth with NTLMSSP gss-spnego-client and gss-spnego server

Port ntlm_auth bash script tests to python

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agotests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth with NTLMSSP client and...
Samuel Cabrero [Fri, 31 Aug 2018 14:05:34 +0000 (16:05 +0200)]
tests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth with NTLMSSP client and gss-spnego server

Port ntlm_auth bash script tests to python

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agotests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth against winbindd
Samuel Cabrero [Fri, 31 Aug 2018 12:26:59 +0000 (14:26 +0200)]
tests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth against winbindd

Port ntlm_auth bash script tests to python

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agotests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth and ntlm_auth with specifi...
Samuel Cabrero [Fri, 31 Aug 2018 10:47:11 +0000 (12:47 +0200)]
tests/ntlm_auth: Port ntlm_auth tests to python: ntlm_auth and ntlm_auth with specified domain

Port ntlm_auth bash script tests to python

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agoselftest: Add a new base class for ntlm_auth tests
Samuel Cabrero [Sat, 9 Dec 2017 09:44:15 +0000 (10:44 +0100)]
selftest: Add a new base class for ntlm_auth tests

The class is based on test_ntlm_auth.py script.

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Pair-programmed-by: Andrew Bartlett <abartlet@samba.org>
5 years agoselftest: Create included files during provision
Samuel Cabrero [Fri, 31 Aug 2018 10:44:09 +0000 (12:44 +0200)]
selftest: Create included files during provision

Files included from smb.conf have to exists, otherwise python fails to
load the configuration. Found while trying to run a python test before
samba3.blackbox.smbd_error creates the included file.

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agokrb5_wrap: Fix bit shifting
Andreas Schneider [Wed, 12 Dec 2018 09:10:08 +0000 (10:10 +0100)]
krb5_wrap: Fix bit shifting

lib/krb5_wrap/enctype_convert.c:93:27: runtime error: left shift of 1 by
31 places cannot be represented in type 'int'

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Gary Lockyer <gary@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Wed Dec 19 12:40:40 CET 2018 on sn-devel-144

5 years agolib/util: Count a trailing line that doesn't end in a newline
Martin Schwenke [Fri, 14 Dec 2018 03:43:57 +0000 (14:43 +1100)]
lib/util: Count a trailing line that doesn't end in a newline

If the final line of a file does not contain a newline then it isn't
included in the line count.

Change i to point to the next slot in the array instead of the current
one.  This means that that the current line won't be thrown away if no
newline is seen.

Without changing i to unsigned int, the -O3 --picky -developer build
fails with:

[ 745/4136] Compiling lib/util/util_file.c

==> /builds/samba-team/devel/samba/samba-o3.stderr <==
../../lib/util/util_file.c: In function ‘file_lines_parse’:
../../lib/util/util_file.c:251:8: error: assuming signed overflow does not occur when simplifying conditional to constant [-Werror=strict-overflow]
  while (i > 0 && ret[i-1][0] == 0) {
        ^
cc1: all warnings being treated as errors

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

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Dec 19 08:08:28 CET 2018 on sn-devel-144

5 years agos4 messaging: Add support for smbcontrol sleep
Gary Lockyer [Mon, 10 Dec 2018 22:43:52 +0000 (11:43 +1300)]
s4 messaging: Add support for smbcontrol sleep

Add a sleep command that pauses the target process for the specified
number of seconds

This command is only enabled on developer and self test builds.

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agos3 server: Add support for smbcontrol sleep
Gary Lockyer [Mon, 10 Dec 2018 22:39:23 +0000 (11:39 +1300)]
s3 server: Add support for smbcontrol sleep

Add a sleep command that pauses the target process for the specified number
of seconds

This command is only enabled on self test and developer builds.

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agos3 smbcontrol: Add sleep command
Gary Lockyer [Mon, 3 Dec 2018 20:31:22 +0000 (09:31 +1300)]
s3 smbcontrol: Add sleep command

Add a sleep command that pauses the target process for the specified
number of seconds

This command is only enabled on developer and self test builds.

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agos4 messaging tests: Tests for smbcontrol sleep command
Gary Lockyer [Wed, 5 Dec 2018 01:50:22 +0000 (14:50 +1300)]
s4 messaging tests: Tests for smbcontrol sleep command

Add a sleep command that pauses the target process for the specified
number seconds

This command is only enabled on developer and self test builds.

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agos4 messaging: support smbcontrol inject fault command
Gary Lockyer [Mon, 10 Dec 2018 22:04:25 +0000 (11:04 +1300)]
s4 messaging: support smbcontrol inject fault command

Add support of the smbcontrol inject fault command to the samba daemon.
This is useful for manual testing of process restart etc.

command is only enabled for developer and self test builds

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agos4 messaging tests: Add inject fault command
Gary Lockyer [Mon, 10 Dec 2018 22:01:09 +0000 (11:01 +1300)]
s4 messaging tests: Add inject fault command

Test for processing of the smbcontrol inject fault message in the samba
daemon.

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agos4: Remove double init of kerberos error table
Swen Schillig [Tue, 18 Dec 2018 07:30:24 +0000 (08:30 +0100)]
s4: Remove double init of kerberos error table

The initialization of the kerberos error table
is already performed in smb_krb5_init_context_basic(),
therefore, it can be removed from of its callees.

Signed-off-by: Swen Schillig <swen@linux.ibm.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed Dec 19 04:51:27 CET 2018 on sn-devel-144

5 years agos3-smbd: avoid assuming fsp is always intact after close_file call.
Günther Deschner [Tue, 18 Dec 2018 10:10:04 +0000 (11:10 +0100)]
s3-smbd: avoid assuming fsp is always intact after close_file call.

Instead use the already copied smb_fname directly.

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

Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Autobuild-User(master): Günther Deschner <gd@samba.org>
Autobuild-Date(master): Tue Dec 18 20:11:07 CET 2018 on sn-devel-144

5 years agoctdb-daemon: Modernise debug during record deletion for vacuuming
Martin Schwenke [Wed, 24 Oct 2018 01:29:54 +0000 (12:29 +1100)]
ctdb-daemon: Modernise debug during record deletion for vacuuming

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): Tue Dec 18 10:13:50 CET 2018 on sn-devel-144

5 years agoctdb-daemon Add extra debug during record deletion for vacuuming
Martin Schwenke [Mon, 15 Oct 2018 10:21:25 +0000 (21:21 +1100)]
ctdb-daemon Add extra debug during record deletion for vacuuming

It isn't currently possible to distinguish these 2 cases.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
5 years agoctdb-tests: Minimise chances of test interfering with itself
Martin Schwenke [Tue, 18 Dec 2018 03:31:24 +0000 (14:31 +1100)]
ctdb-tests: Minimise chances of test interfering with itself

Checking that the database contains 0 records cause a traverse.  This
may take a lock and cause vacuuming to fail (or be deferred for a
particular record/chain).  Minimise the chance of this happening by
only checking for 0 records every 10 seconds.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
5 years agoctdb-daemon: Do not force full vacuum on first vacuuming run
Martin Schwenke [Mon, 22 Oct 2018 10:40:22 +0000 (21:40 +1100)]
ctdb-daemon: Do not force full vacuum on first vacuuming run

When the number of fast path vacuuming runs is 0 then a full vacuuming
run is done.  This means the first one is a full run, which is almost
certainly not what is intended.

Combine the 2 conditionals to only flag a full vacuuming run when the
count exceeds the configured limit.  This means that the
full_vacuum_run flag is set in both parent and child, but this is
harmless... and is better than getting it wrong.

Also tweak the comparison to be less-than-or-equal, since the zeroth
run needs to be counted.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
5 years agoctdb-packaging: Update library versions to upstream versions
Amitay Isaacs [Tue, 18 Dec 2018 02:37:40 +0000 (13:37 +1100)]
ctdb-packaging: Update library versions to upstream versions

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
5 years agoctdb-packaging: Match configure command as per spec file
Amitay Isaacs [Tue, 18 Dec 2018 00:01:35 +0000 (11:01 +1100)]
ctdb-packaging: Match configure command as per spec file

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
5 years agoctdb-packaging: Call waf with python wrapper
Amitay Isaacs [Tue, 18 Dec 2018 00:03:51 +0000 (11:03 +1100)]
ctdb-packaging: Call waf with python wrapper

This allows to build packages even when python3 is not available by
setting PYTHON variable.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
5 years agoctdb-build: Use open() instead of file() for python3
Amitay Isaacs [Mon, 17 Dec 2018 23:54:50 +0000 (10:54 +1100)]
ctdb-build: Use open() instead of file() for python3

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
5 years agoctdb-tool: Avoid data uninitialized warnings
Amitay Isaacs [Tue, 18 Dec 2018 00:33:30 +0000 (11:33 +1100)]
ctdb-tool: Avoid data uninitialized warnings

../../tools/ctdb.c: In function 'str_to_data':
../../tools/ctdb.c:624: warning: 'data.dsize' may be used uninitialized in this function
../../tools/ctdb.c:624: warning: 'data.dptr' may be used uninitialized in this function

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
5 years agoctdb-tests: Do not force TEST_VAR_DIR to be absolute
Martin Schwenke [Fri, 7 Sep 2018 04:48:17 +0000 (14:48 +1000)]
ctdb-tests: Do not force TEST_VAR_DIR to be absolute

This can result in Unix domain socket names that are too long.

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): Tue Dec 18 05:31:00 CET 2018 on sn-devel-144

5 years agoctdb-event: Force symbolic link targets to be absolute
Martin Schwenke [Fri, 7 Sep 2018 04:47:24 +0000 (14:47 +1000)]
ctdb-event: Force symbolic link targets to be absolute

If CTDB_BASE is relative then symbolic link targets will be incorrect.

Don't force CTDB_BASE to be absolute because this can result in Unix
domain socket names that are too long.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
5 years agoctdb-event: Declare and construct data_script only if needed
Martin Schwenke [Fri, 7 Sep 2018 04:35:15 +0000 (14:35 +1000)]
ctdb-event: Declare and construct data_script only if needed

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
5 years agoctdb-tests: Force symbolic link targets to be absolute
Martin Schwenke [Fri, 7 Sep 2018 04:45:00 +0000 (14:45 +1000)]
ctdb-tests: Force symbolic link targets to be absolute

If CTDB_BASE is relative then the symbolic link target will be
incorrect.

Don't force CTDB_BASE to be absolute because this can result in Unix
domain socket names that are too long.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
5 years agoctdb-event: Force EVENTSCRIPTS_TESTS_VAR_DIR to be absolute
Martin Schwenke [Fri, 7 Sep 2018 06:02:25 +0000 (16:02 +1000)]
ctdb-event: Force EVENTSCRIPTS_TESTS_VAR_DIR to be absolute

Event scripts (well, statd_callout) can change directory, causing
stubs to be unable to locate EVENTSCRIPTS_TESTS_VAR_DIR if it is
relative.

Don't force TEST_VAR_DIR to be absolute because this can result in
Unix domain socket names that are too long.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
5 years agoctdb-event: Force script directory to be absolute
Martin Schwenke [Fri, 7 Sep 2018 03:39:49 +0000 (13:39 +1000)]
ctdb-event: Force script directory to be absolute

If TEST_VAR_DIR is relative then symbolic link targets will be
incorrect.

Don't force TEST_VAR_DIR to be absolute because this can result in
Unix domain socket names that are too long.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
5 years agoctdb-recoverd: Call an election when the recovery lock is lost
Martin Schwenke [Thu, 8 Nov 2018 04:49:30 +0000 (15:49 +1100)]
ctdb-recoverd: Call an election when the recovery lock is lost

The lock may have been lost due to a failure in the underlying locking
mechanism.  This could be due to quorum loss or similar.  It is best
to call an election to confirm that this node should still be master.
At worst, the node will reelect itself, fail to take the lock and then
ban itself.  This is a suitable outcome for a node that has been
partitioned from others in the cluster.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
5 years agoctdb-doc: Add non-breaking space to lock_buckets documentation
Martin Schwenke [Thu, 13 Dec 2018 01:16:16 +0000 (12:16 +1100)]
ctdb-doc: Add non-breaking space to lock_buckets documentation

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
5 years agoctdb-daemon: Divide by 2 when calculating hop count bucket
Martin Schwenke [Thu, 15 Nov 2018 02:58:53 +0000 (13:58 +1100)]
ctdb-daemon: Divide by 2 when calculating hop count bucket

This provides finer resolution while still maintaining a reasonable
maximum.  In this case the top bucket contains any hop counts
>= 16384, compared to the current situation where the top bucket contains
hop counts >= 268435456.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
5 years agosmbd: Don't try to release a kernel oplock for a leased file
Volker Lendecke [Fri, 14 Dec 2018 12:05:50 +0000 (13:05 +0100)]
smbd: Don't try to release a kernel oplock for a leased file

If we have

[global]
  smb2 leases = yes
  kernel oplocks = no
[share]
  kernel oplocks = yes

for clients requesting leases we don't even try to acquire kernel
oplocks, because the kernel API is not compatible. Kernel oplocks are
per fd, leases are roughly "per inode".

We don't however special-case the LEASE_OPLOCK case in
release_file_oplock, leading to nasty error messages like "bad file
descriptor" on the fcntl(fd,F_SETLEASE,F_UNLCK) call. They are
harmless, but they raise eyebrows.

To simplify the if-condition, I factored out the kernel call and
applied early returns.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Dec 18 02:00:44 CET 2018 on sn-devel-144

5 years agodsdb: sort DSDB_EXTENDED defines by OID
Andrew Bartlett [Fri, 14 Dec 2018 01:49:03 +0000 (14:49 +1300)]
dsdb: sort DSDB_EXTENDED defines by OID

This helps avoid duplicate values and clearly indicates what value to select next.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Mon Dec 17 04:30:39 CET 2018 on sn-devel-144

5 years agodrepl: schema repl race condition fix
Aaron Haslett [Wed, 21 Nov 2018 00:55:53 +0000 (13:55 +1300)]
drepl: schema repl race condition fix

Adds final schema consistency check before committing changes.
Aborts if corruption found.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12889
Signed-off-by: Aaron Haslett <aaronhaslett@catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agoConditionally disable macOS incompatible tests
Will [Wed, 8 Nov 2017 03:52:34 +0000 (21:52 -0600)]
Conditionally disable macOS incompatible tests

Symbols _getgrent_r and _getpwent_r in
source4/torture/local/nss_tests.c are undefined in macOS. It seems
that checking HAVE_GETGRENT_R and HAVE_GETPWENT_R and conditionally
disabling those tests as suggested by hirochachacha in the referenced
bug allows samba on both `master` and `samba-4.7.1` to build properly
on macOS/darwin.

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

Signed-off-by: Will Haley <willhy@gmail.com>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agoSend status to systemd on daemon start
Marcos Mello [Fri, 30 Nov 2018 11:25:07 +0000 (09:25 -0200)]
Send status to systemd on daemon start

systemd service files run in no-forking mode (--foreground) since
8b6f58194da7e849cdb9d20712dff49b17a93a77.

Rearrange sd_notify() call in become_daemon() to only send status to systemd
in this mode (Type=notify is not designed to monitor forking). Drop READY=0
(it does nothing) and MAINPID= (unnecessary because the process spawned by
systemd is already the main PID).

Also remove STATUS= prefix from debug messages.

Signed-off-by: Marcos Mello <marcosfrm@gmail.com>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agomanpage: Advise vfs_fruit:veto_appledouble=yes can break rsync
Adam Nielsen [Sun, 15 Oct 2017 01:56:32 +0000 (11:56 +1000)]
manpage: Advise vfs_fruit:veto_appledouble=yes can break rsync

Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Uri Simchoni <uri@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agos4:scripting:bin: rm rpcclient
Guo Qiao [Thu, 13 Dec 2018 22:23:46 +0000 (11:23 +1300)]
s4:scripting:bin: rm rpcclient

This file only works in py2, and no one use it. Just delete it.

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
5 years agodsdb: Remove readOnlySchema concept from Samba
Andrew Bartlett [Sun, 16 Dec 2018 21:17:08 +0000 (10:17 +1300)]
dsdb: Remove readOnlySchema concept from Samba

This is a hold-over from the LDAP backend project, which has not yet been revived.

There will be bigger issues than what to do if the schema changes if this ever comes back
and our schema code is way to complex at the moment.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
5 years agolib:tsocket: Check for DOXYGEN as a #define
Andreas Schneider [Thu, 13 Dec 2018 17:54:26 +0000 (18:54 +0100)]
lib:tsocket: Check for DOXYGEN as a #define

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Autobuild-User(master): Gary Lockyer <gary@samba.org>
Autobuild-Date(master): Mon Dec 17 00:10:10 CET 2018 on sn-devel-144

5 years agos3:lib: Fix checking for config.h #define in system.c
Andreas Schneider [Thu, 13 Dec 2018 17:52:45 +0000 (18:52 +0100)]
s3:lib: Fix checking for config.h #define in system.c

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
5 years agos3: Fix checking for config.h #define in includes.h
Andreas Schneider [Thu, 13 Dec 2018 17:52:11 +0000 (18:52 +0100)]
s3: Fix checking for config.h #define in includes.h

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
5 years agonsswitch: Fix checking for config.h #define in winbind_nss.h
Andreas Schneider [Thu, 13 Dec 2018 17:51:18 +0000 (18:51 +0100)]
nsswitch: Fix checking for config.h #define in winbind_nss.h

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
5 years agonsswitch: Fix checking for config.h #define in nsstest.h
Andreas Schneider [Thu, 13 Dec 2018 17:49:32 +0000 (18:49 +0100)]
nsswitch: Fix checking for config.h #define in nsstest.h

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
5 years agokrb5_samba: Fix checking for config.h #define in krb5_samba.h
Andreas Schneider [Thu, 13 Dec 2018 17:48:44 +0000 (18:48 +0100)]
krb5_samba: Fix checking for config.h #define in krb5_samba.h

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
5 years agolib:util: Fix checking for config.h #define in fault.c
Andreas Schneider [Thu, 13 Dec 2018 17:48:03 +0000 (18:48 +0100)]
lib:util: Fix checking for config.h #define in fault.c

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
5 years agoreplace: Fix checking for config.h #define in replace.h
Andreas Schneider [Thu, 13 Dec 2018 17:47:16 +0000 (18:47 +0100)]
replace: Fix checking for config.h #define in replace.h

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
5 years agoreplace: Fix checking for config.h #define in gssapi.h
Andreas Schneider [Thu, 13 Dec 2018 17:46:38 +0000 (18:46 +0100)]
replace: Fix checking for config.h #define in gssapi.h

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
5 years agoreplace: Fix checking for config.h #define in readline.h
Andreas Schneider [Thu, 13 Dec 2018 17:45:14 +0000 (18:45 +0100)]
replace: Fix checking for config.h #define in readline.h

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
5 years agotravis-ci: Remove hooks for Travis CI (typically used with GitHub)
Andrew Bartlett [Thu, 13 Dec 2018 08:02:24 +0000 (21:02 +1300)]
travis-ci: Remove hooks for Travis CI (typically used with GitHub)

These will get out of date pretty quickly, so better to remove them now
that GitLab CI is the documented and supported solution.

This was our first public CI system, used because it is cost-free
to Open Source projects and integrated with GitHub.

It has served it's purpose now.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Fri Dec 14 22:04:20 CET 2018 on sn-devel-144

5 years agodsdb audit_log: Add windows event codes to password changes
Gary Lockyer [Thu, 13 Dec 2018 22:09:20 +0000 (11:09 +1300)]
dsdb audit_log: Add windows event codes to password changes

Add a new "eventId" element to the PasswordChange JSON log messages.
This contains a Windows Event Code Id either:
4723 Password changed
4724 Password reset

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agoauth log: Increment Authentication version
Gary Lockyer [Thu, 13 Dec 2018 01:48:46 +0000 (14:48 +1300)]
auth log: Increment Authentication version

Update the minor version of the Authorisation to reflect the addition of
the "eventId" and "logonType" elements.

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agoauth log: Add windows logon type codes
Gary Lockyer [Thu, 13 Dec 2018 01:46:31 +0000 (14:46 +1300)]
auth log: Add windows logon type codes

Add a new "logonType" element to the Authorisation JSON log messages.
This contains a Windows Logon Type, the supported logon types are:
2 Interactive
3 Network
8 NetworkCleartext

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agoauth log: Add windows event codes
Gary Lockyer [Wed, 12 Dec 2018 21:20:28 +0000 (10:20 +1300)]
auth log: Add windows event codes

Add a new "eventId" element to the Authorisation JSON log messages.
This contains a Windows Event Code Id either:
4624 Successful logon
4625 Unsuccessful logon

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agoidl: Add Windows event code ids
Gary Lockyer [Wed, 12 Dec 2018 21:17:44 +0000 (10:17 +1300)]
idl: Add Windows event code ids

Add idl definitions for Windows Event Code Ids, and Logon Types. This
intial commit adds:

Event Ids
4264 Successful logon
4625 Unsuccessful logon

Logon Types
 2 Interactive
 3 Network
 4 Batch
 5 Service
 7 Unlock
 8 NetworkCleartext
 9 NewCredentials
10 RemoteInteractive
11 CachedInteractive

The intention is to add Windows Event Codes to the JSON log messages, to
provide a common event identifier in mixed Windows and Samba networks.
And to assist security personnel with a windows background.

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agoPY3: change shebang to python3 in misc dirs
Joe Guo [Wed, 12 Dec 2018 00:43:21 +0000 (13:43 +1300)]
PY3: change shebang to python3 in misc dirs

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
Autobuild-User(master): Noel Power <npower@samba.org>
Autobuild-Date(master): Fri Dec 14 18:00:40 CET 2018 on sn-devel-144

5 years agoPY3: change shebang to python3 in lib dir
Joe Guo [Wed, 12 Dec 2018 00:41:58 +0000 (13:41 +1300)]
PY3: change shebang to python3 in lib dir

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
5 years agoPY3: change shebang to python3 in wintest dir
Joe Guo [Wed, 12 Dec 2018 00:37:10 +0000 (13:37 +1300)]
PY3: change shebang to python3 in wintest dir

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
5 years agoPY3: change shebang to python3 in script dir
Joe Guo [Wed, 12 Dec 2018 00:18:40 +0000 (13:18 +1300)]
PY3: change shebang to python3 in script dir

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
5 years agoPY3: change shebang to python3 in source4/dsdb dir
Joe Guo [Wed, 12 Dec 2018 00:40:43 +0000 (13:40 +1300)]
PY3: change shebang to python3 in source4/dsdb dir

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
5 years agoPY3: change shebang to python3 in source4/scripting dir
Joe Guo [Wed, 12 Dec 2018 00:39:24 +0000 (13:39 +1300)]
PY3: change shebang to python3 in source4/scripting dir

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
5 years agoPY3: change shebang to python3 in source4/torture dir
Joe Guo [Wed, 12 Dec 2018 00:38:33 +0000 (13:38 +1300)]
PY3: change shebang to python3 in source4/torture dir

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
5 years agoPY3: change shebang to python3 in source4/scripting/bin dir
Joe Guo [Mon, 10 Dec 2018 23:23:17 +0000 (12:23 +1300)]
PY3: change shebang to python3 in source4/scripting/bin dir

Samba default python is 3 now.

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
5 years agos3:test: make sids2xids test compatible with py2 and py3
Joe Guo [Thu, 13 Dec 2018 03:33:40 +0000 (16:33 +1300)]
s3:test: make sids2xids test compatible with py2 and py3

define a wrapper function for subprocess.check_output,
to return bytes for py2 and unicode for py3, and replace Popen with it.

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
5 years agobuild: Move python detection back into waf (instead of in configure and Makefile)
Andrew Bartlett [Tue, 11 Dec 2018 18:10:30 +0000 (07:10 +1300)]
build: Move python detection back into waf (instead of in configure and Makefile)

This avoids creating a mini-configure in the configure script.

Users wishing to use python2 to build need to specify PYTHON=
to both ./configure and make

After we merged the python3 change, it became clear that relying on systems prefixing
the correct python just causes trouble and make debugging harder, so only use $PYTHON
for the override, not the default case

This essentially reverts a660b7fb8e519bd3be558fd0425bff8f287fca1f but
leaves the files more consistent.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Noel Power <npower@samba.org>
5 years agoaudit_logging: auth_json_audit required auth_json
Andrew Bartlett [Fri, 14 Dec 2018 03:05:33 +0000 (16:05 +1300)]
audit_logging: auth_json_audit required auth_json

To log JSON the human-readable logs must also have been enabled

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

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Fri Dec 14 14:32:25 CET 2018 on sn-devel-144

5 years agolib/audit_logging: Use talloc_stackframe() in audit_log_json()
Andrew Bartlett [Fri, 14 Dec 2018 02:40:20 +0000 (15:40 +1300)]
lib/audit_logging: Use talloc_stackframe() in audit_log_json()

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
5 years agoaudit_logging: Remove debug log header and JSON Authentication: prefix
Andrew Bartlett [Thu, 13 Dec 2018 00:53:08 +0000 (13:53 +1300)]
audit_logging: Remove debug log header and JSON Authentication: prefix

Feedback from real-world users is that they really want raw JSON
strings in the log.

We can not easily remove the leading "  " but the other strings above
and before the JSON are really annoying to strip back off

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

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
5 years agoChange order of flags in Makefile so that crackcheck builds under Ubuntu
Brian Candler [Thu, 14 Dec 2017 20:39:09 +0000 (20:39 +0000)]
Change order of flags in Makefile so that crackcheck builds under Ubuntu

Signed-off-by: Brian Candler <b.candler@pobox.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Fri Dec 14 04:13:38 CET 2018 on sn-devel-144

5 years agotests/smbcontrol: fix typo in class name
Philipp Gesang [Mon, 20 Aug 2018 08:38:04 +0000 (10:38 +0200)]
tests/smbcontrol: fix typo in class name

Signed-off-by: Philipp Gesang <philipp.gesang@intra2net.com>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agoAdd #include <unistd.h> to provide prototype for getopt()
Brian Candler [Thu, 14 Dec 2017 20:40:22 +0000 (20:40 +0000)]
Add #include <unistd.h> to provide prototype for getopt()

Signed-off-by: Brian Candler <b.candler@pobox.com>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
5 years agoCorrection of comment in winbindd_pam.c
amitkuma [Thu, 21 Dec 2017 17:14:38 +0000 (22:44 +0530)]
Correction of comment in winbindd_pam.c

Internal comment corrected.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>