samba.git
3 years agopidl/ws: Remove pinfo->private_data from DCERPC dissectors.
Aurelien Aptel [Tue, 9 Feb 2016 16:30:09 +0000 (17:30 +0100)]
pidl/ws: Remove pinfo->private_data from DCERPC dissectors.

Sort of re-apply Wireshark commit 79cd356 which was never sync with
samba. It was reverted then reintroduced in the WS repo (yes this is
quite convulted).

Original commit message:

Author: Michael Mann <mmann78@netscape.net>
Date:   Wed Nov 6 12:36:09 2013 +0000

    Remove pinfo->private_data from DCERPC dissectors.  Bug 9387 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9387)

    This is the PIDL input file changes necessary to support removing pinfo->private_data from the DCERPC dissectors in favor of passing it through function parameters.  I didn't regenerate the dissector source, so this is just a "good faith" effort to mimic the manual changes.

    svn path=/trunk/; revision=53098

Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
3 years agopidl/ws: remove any starting _ in WS field names
Aurelien Aptel [Tue, 9 Feb 2016 16:12:41 +0000 (17:12 +0100)]
pidl/ws: remove any starting _ in WS field names

Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
3 years agopidl/ws: avoid trailing tabs
Aurelien Aptel [Tue, 9 Feb 2016 15:10:12 +0000 (16:10 +0100)]
pidl/ws: avoid trailing tabs

Port Wireshark commit 4f04a3c

Author: Stefan Metzmacher <metze@samba.org>
Date:   Thu Oct 29 08:32:52 2015 +0100

    tools/pidl: avoid trailing tabs

    Change-Id: I293dd6f2d7ff3b0e27bc3cc49e69977604f12260
Signed-off-by: Stefan Metzmacher <metze@samba.org>
    Reviewed-on: https://code.wireshark.org/review/11433
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
3 years agopidl: use https urls and update dead msdn link
Aurelien Aptel [Tue, 9 Feb 2016 14:43:53 +0000 (15:43 +0100)]
pidl: use https urls and update dead msdn link

Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
3 years agopidl/ws: Eliminate e_uuid_t in favor of e_guid_t
Aurelien Aptel [Tue, 9 Feb 2016 14:32:51 +0000 (15:32 +0100)]
pidl/ws: Eliminate e_uuid_t in favor of e_guid_t

Port Wireshark commit 499d959

Author: Guy Harris <guy@alum.mit.edu>
Date:   Tue Mar 3 02:47:53 2015 -0800

    Eliminate e_uuid_t in favor of e_guid_t.

    That eliminates a redundant and confusing data type, and avoids issues
    with one piece of code using e_uuid_t but wanting to use routines
    expecting an e_guid_t.

    Change-Id: I95e172d46d342ab40f6254300ecbd2a0530cde60
    Reviewed-on: https://code.wireshark.org/review/7506
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
3 years agopidl/ws: Remove #pragma warning (MSVC)
Aurelien Aptel [Fri, 5 Feb 2016 14:31:16 +0000 (15:31 +0100)]
pidl/ws: Remove #pragma warning (MSVC)

Port Wireshark commit ceda0f9

Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date:   Sun Oct 5 19:34:46 2014 +0200

    Remove #pragma warning (MSVC) for PIDL generate dissector

    Change-Id: I1e4c7944a2cd877f5c707703dcff44fe9f955a2c
    Reviewed-on: https://code.wireshark.org/review/4479
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
3 years agopidl/ws: fix Assigned value is garbage or undefined found by Clang Analyzer
Aurelien Aptel [Fri, 5 Feb 2016 14:29:28 +0000 (15:29 +0100)]
pidl/ws: fix Assigned value is garbage or undefined found by Clang Analyzer

Port Wireshark commit 683d657

Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date:   Sun Oct 5 19:27:15 2014 +0200

    PIDL (DCERPC): fix Assigned value is garbage or undefined found by Clang Analyzer

    packet-dcerpc-dnsserver.c:1002:12: warning: Assigned value is garbage or undefined
    packet-dcerpc-frstrans.c:1137:12: warning: Assigned value is garbage or undefined
    packet-dcerpc-lsa.c:6345:12: warning: Assigned value is garbage or undefined
    packet-dcerpc-nspi.c:7805:12: warning: Assigned value is garbage or undefined
    packet-dcerpc-dfs.c:3245:11: warning: Function call argument is an uninitialized value
    packet-dcerpc-dfs.c:3245:9: warning: 'level' may be used uninitialized in this function [-Wmaybe-uninitialized]

    Change-Id: Ife6a2f565ae215535d0e3d72ef50800114240e3f
    Reviewed-on: https://code.wireshark.org/review/4478
Reviewed-by: Evan Huus <eapache@gmail.com>
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
3 years agopidl/ws: fix indent (use 4 tabs) and remove trailing whitespace
Aurelien Aptel [Fri, 5 Feb 2016 14:25:57 +0000 (15:25 +0100)]
pidl/ws: fix indent (use 4 tabs) and remove trailing whitespace

Port Wireshark commit 4110bde

Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date:   Fri Sep 26 19:51:34 2014 +0200

    PIDL: fix indent (use 4 tabs) and remove trailing whitespace

    Change-Id: I0ee63a040867b44ac9915704f5e581483ed6f7e2
    Reviewed-on: https://code.wireshark.org/review/4310
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
3 years agopidl/ws: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Aurelien Aptel [Fri, 5 Feb 2016 13:43:04 +0000 (14:43 +0100)]
pidl/ws: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Port Wireshark commit f6b9e7a

Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date:   Sun Sep 28 20:57:13 2014 +0200

    PIDL: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

    Change-Id: Ibae478771b30d6e9ae07315985f1e71bc6b65423
    Reviewed-on: https://code.wireshark.org/review/4350
Reviewed-by: Michael Mann <mmann78@netscape.net>
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
3 years agopidl/ws: enhance dissector
Aurelien Aptel [Fri, 5 Feb 2016 13:38:55 +0000 (14:38 +0100)]
pidl/ws: enhance dissector

Port Wireshark commit 28ec9c2

Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date:   Fri Sep 26 23:29:43 2014 +0200

    PIDL (DCERPC winreg): enhance dissector

    * Fix PIDL generator for NOEMIT Element (fix -Wunused-function for DCERPC winreg dissector)
    * Fix indent (use tabs)
    * Remove DCERPC winreg dissector from DIRTY list

    Change-Id: I5d16cbfe8481a5e5f7e5df9b51735c93ae4375a7
    Reviewed-on: https://code.wireshark.org/review/4322
Reviewed-by: Michael Mann <mmann78@netscape.net>
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
3 years agopidl/ws: fix -Wmissing-prototype
Aurelien Aptel [Fri, 5 Feb 2016 13:36:27 +0000 (14:36 +0100)]
pidl/ws: fix -Wmissing-prototype

Port Wireshark commit e759d82

Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date:   Fri Sep 26 18:47:53 2014 +0200

    PIDL: fix -Wmissing-prototype

    Change-Id: I4cae47450e8026b10bd373828f235184560e0a99
    Reviewed-on: https://code.wireshark.org/review/4308
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
3 years agopidl/ws: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Aurelien Aptel [Fri, 5 Feb 2016 13:29:22 +0000 (14:29 +0100)]
pidl/ws: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Port Wireshark commit f0b5fb7

Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date:   Fri Sep 26 21:31:32 2014 +0200

    PIDL: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

    Change-Id: I7f6f974732b7905f4ea4686e1a79ca6fbef78fa8
    Reviewed-on: https://code.wireshark.org/review/4319
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
3 years agoselftest: make samba3.blackbox.smbclient_tar as flapping
Ralph Boehme [Sun, 19 Jun 2016 17:22:02 +0000 (19:22 +0200)]
selftest: make samba3.blackbox.smbclient_tar as flapping

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Mon Jun 20 12:07:18 CEST 2016 on sn-devel-144

3 years agolib/util: Optimise trim_string() to use a single memmove(3)
Martin Schwenke [Sat, 18 Jun 2016 20:47:09 +0000 (06:47 +1000)]
lib/util: Optimise trim_string() to use a single memmove(3)

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Mon Jun 20 04:47:26 CEST 2016 on sn-devel-144

3 years agotorture: Add tests for trim_string()
Martin Schwenke [Sun, 19 Jun 2016 03:40:18 +0000 (13:40 +1000)]
torture: Add tests for trim_string()

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Ralph Boehme <slow@samba.org>
3 years agoselftest: Kerberos auth with netbios alias SPNs
Ralph Boehme [Sat, 18 Jun 2016 17:30:46 +0000 (19:30 +0200)]
selftest: Kerberos auth with netbios alias SPNs

Since commit 0f6d51f34baa816b6ec422c8bc28687f0a3073de libnet_join
automatically adds netbios aliases as SPNs to the machine account.

This commit adds a simple test with smbclient -k against the aliases.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Sun Jun 19 19:07:46 CEST 2016 on sn-devel-144

3 years agos3/net: print returned addresses in dns gethostbyname
Richard Sharpe [Sat, 18 Jun 2016 20:29:36 +0000 (13:29 -0700)]
s3/net: print returned addresses in dns gethostbyname

Make net ads dns gethostbyname actually print out the returned addresses
so we can use it in self tests.

Signed-off-by: Richard Sharpe <rsharpe@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Sun Jun 19 10:34:37 CEST 2016 on sn-devel-144

3 years agos4-kdc: Move KDC packet handling functions to kdc-server.c
Andreas Schneider [Fri, 10 Jun 2016 09:29:20 +0000 (11:29 +0200)]
s4-kdc: Move KDC packet handling functions to kdc-server.c

Create an Kerberos implmentation independent KDC-SERVER subsystem so we
can use it to implement a kpasswd server with MIT Kerberos in future.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Sun Jun 19 03:31:32 CEST 2016 on sn-devel-144

3 years agos4-kdc: Create a kdc-proxy.h header file
Andreas Schneider [Mon, 13 Jun 2016 09:20:44 +0000 (11:20 +0200)]
s4-kdc: Create a kdc-proxy.h header file

This makes the it Kerberos implmentation independent.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
3 years agos4-kdc: Rename proxy-heimdal.c to kdc-proxy.c
Andreas Schneider [Mon, 13 Jun 2016 09:19:51 +0000 (11:19 +0200)]
s4-kdc: Rename proxy-heimdal.c to kdc-proxy.c

The plan is to have a KDC-SERVER subsystem later.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
3 years agos4-kdc: Move KDC socket structs to krb5-server.h
Andreas Schneider [Fri, 10 Jun 2016 09:23:20 +0000 (11:23 +0200)]
s4-kdc: Move KDC socket structs to krb5-server.h

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
3 years agos4-kdc: Move kdc_process_fn_t declaration to kdc-server.h
Andreas Schneider [Fri, 10 Jun 2016 12:06:10 +0000 (14:06 +0200)]
s4-kdc: Move kdc_process_fn_t declaration to kdc-server.h

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
3 years agos4-kdc: Move definitions to kdc-server.h
Andreas Schneider [Fri, 10 Jun 2016 09:10:50 +0000 (11:10 +0200)]
s4-kdc: Move definitions to kdc-server.h

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
3 years agos4-kdc: Use better and simpler names for the kdc_process_ret enum
Andreas Schneider [Fri, 10 Jun 2016 07:50:45 +0000 (09:50 +0200)]
s4-kdc: Use better and simpler names for the kdc_process_ret enum

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
3 years agos4-kdc: Put the heimdal kdc config into a private data pointer
Andreas Schneider [Fri, 10 Jun 2016 07:42:33 +0000 (09:42 +0200)]
s4-kdc: Put the heimdal kdc config into a private data pointer

This allows us to make the struct general useable.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
3 years agos4-kdc: Use smb_krb5_mk_error() in kpasswd implementation
Andreas Schneider [Tue, 14 Jun 2016 14:31:32 +0000 (16:31 +0200)]
s4-kdc: Use smb_krb5_mk_error() in kpasswd implementation

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
3 years agos4-kdc: Use smb_krb5_mk_error() in kdc implemenation
Andreas Schneider [Tue, 14 Jun 2016 14:33:34 +0000 (16:33 +0200)]
s4-kdc: Use smb_krb5_mk_error() in kdc implemenation

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
3 years agokrb5_wrap: Add smb_krb5_mk_error()
Andreas Schneider [Mon, 13 Jun 2016 08:52:46 +0000 (10:52 +0200)]
krb5_wrap: Add smb_krb5_mk_error()

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
3 years agos4-kdc: Rename heimdal KDC files
Andreas Schneider [Fri, 10 Jun 2016 07:12:39 +0000 (09:12 +0200)]
s4-kdc: Rename heimdal KDC files

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
3 years agoctdb-tests: Improve ctdb protocol tests
Amitay Isaacs [Tue, 3 May 2016 04:12:42 +0000 (14:12 +1000)]
ctdb-tests: Improve ctdb protocol tests

Test with 0-sized arrays in various data types.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Sat Jun 18 23:31:50 CEST 2016 on sn-devel-144

3 years agoctdb-protocol: Add checks to validate data on wire before unmarshaling
Amitay Isaacs [Tue, 3 May 2016 02:53:24 +0000 (12:53 +1000)]
ctdb-protocol: Add checks to validate data on wire before unmarshaling

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
3 years agoctdb-protocol: Add checks to validate data on wire before unmarshaling
Amitay Isaacs [Tue, 3 May 2016 03:20:53 +0000 (13:20 +1000)]
ctdb-protocol: Add checks to validate data on wire before unmarshaling

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
3 years agoctdb-protocol: Fix marshaling of uint arrays
Amitay Isaacs [Tue, 3 May 2016 06:46:29 +0000 (16:46 +1000)]
ctdb-protocol: Fix marshaling of uint arrays

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
3 years agos4: torture: Added raw readX test to ensure 'reserved' fields are zero.
Jeremy Allison [Fri, 10 Jun 2016 16:32:32 +0000 (09:32 -0700)]
s4: torture: Added raw readX test to ensure 'reserved' fields are zero.

Passes against Win2k12+, and smbd with the previous patch.

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

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Autobuild-User(master): Alexander Bokovoy <ab@samba.org>
Autobuild-Date(master): Sat Jun 18 19:32:22 CEST 2016 on sn-devel-144

3 years agos3: smbd: In reply_read_and_X() SMB1 server is overwriting part of the 'reserved...
Jeremy Allison [Mon, 13 Jun 2016 16:30:25 +0000 (09:30 -0700)]
s3: smbd: In reply_read_and_X() SMB1 server is overwriting part of the 'reserved' zero fields with reply data length.

This occurred due to old code that used to do:

SSVAL(smb_buf(req->outbuf),-2,nread);

to set the reply length. This code was not needed,
as srv_set_message() was already correctly setting
the bcc length and was probably left from much
earlier legacy code.

However, in commit ddaa65ef6e049a185281c4d5deca4045e3b085e2
this was converted to do:

SSVAL(req->outbuf,smb_vwv11,smb_maxcnt);

This code actually overwrites the last 'reserved'
field in the SMB_COM_READ_ANDX packet reply, but we
never noticed as no client (or server code) looks at or
checks vwv11 in a SMB_COM_READ_ANDX reply.

[MS-SMB] shows for SMB_COM_READ_ANDX reply:

SMB_Parameters
{
        UCHAR WordCount;
        Words
        {
                UCHAR AndXCommand;
                UCHAR AndXReserved;
                USHORT AndXOffset;
                USHORT Available;
                USHORT DataCompactionMode;
                USHORT Reserved1;
                USHORT DataLength;
                USHORT DataOffset;
                USHORT DataLengthHigh;
                USHORT Reserved2[4];
        }
}
SMB_Data
{
        USHORT ByteCount;
        Bytes
        {
                UCHAR Pad[] (optional);
                UCHAR Data[variable];
        }

and indeed checking wireshark from Win2012R2
we find that smbd is writing the returned
read length into smb_vwv11 and Windows leaves
it as zeros (reserved).

Also fix the same problem in the named pipes code.

Torture test to ensure Reserved2[4] replies
are zero to follow.

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

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
3 years agos3: smbd: Use common function setup_readX_header() in aio read code.
Jeremy Allison [Mon, 13 Jun 2016 16:25:02 +0000 (09:25 -0700)]
s3: smbd: Use common function setup_readX_header() in aio read code.

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

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
3 years agos3: smbd: Make setup_readX_header() externally accessible
Jeremy Allison [Mon, 13 Jun 2016 16:22:56 +0000 (09:22 -0700)]
s3: smbd: Make setup_readX_header() externally accessible

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

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
3 years agos3: smbd: Remove unused 'req' argument from setup_readX_header()
Jeremy Allison [Mon, 13 Jun 2016 16:20:43 +0000 (09:20 -0700)]
s3: smbd: Remove unused 'req' argument from setup_readX_header()

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

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
3 years agos3: torture: Add test that proves Win2k12 correctly returns pidlow and pidhigh in...
Jeremy Allison [Sun, 12 Jun 2016 00:51:16 +0000 (17:51 -0700)]
s3: torture: Add test that proves Win2k12 correctly returns pidlow and pidhigh in SMB1 requests.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
3 years agos3: smbd: Correctly reflect back SMB_PIDHIGH to a client.
Per Forlin [Sat, 11 Jun 2016 00:00:55 +0000 (17:00 -0700)]
s3: smbd: Correctly reflect back SMB_PIDHIGH to a client.

Torture test to follow.

Signed-off-by: Per Forlin <per.forlin@gmail.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
3 years agos3: libsmb: Widen the internal client smb1.pid to 32-bits as is used on the wire...
Jeremy Allison [Fri, 10 Jun 2016 23:51:11 +0000 (16:51 -0700)]
s3: libsmb: Widen the internal client smb1.pid to 32-bits as is used on the wire and in libcli/smb/smb1*.c

Note: This has *NO* effect on the lock context code, as on the
wire for all SMB1 locking requests, the pid used as the lock
context is already truncated down to 16-bits - the field is only
16-bits wide.

This allows the cli_XXX() calls to correctly set pidlow AND pidhigh
in SMB1 requests put on the wire by the libcli/smb/smb1*.c code.

Note that currently the smbd server doesn't correctly return
pidhigh yet - a fix (and tests) for that will follow.

As pidhigh is not checked in any client code (mid is used
to differentiate different requests) this has no effect
other than a correctness fix.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
3 years agos4: libcli: Internal SMB1 pid is already stored as and uses 32-bits. Correct getpid...
Jeremy Allison [Fri, 10 Jun 2016 23:15:22 +0000 (16:15 -0700)]
s4: libcli: Internal SMB1 pid is already stored as and uses 32-bits. Correct getpid() cast.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
3 years agoselftest: Remove nbt wait time
Andreas Schneider [Fri, 17 Jun 2016 08:01:19 +0000 (10:01 +0200)]
selftest: Remove nbt wait time

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Fri Jun 17 22:15:09 CEST 2016 on sn-devel-144

3 years agoselftest: Add newlines for info output
Andreas Schneider [Fri, 17 Jun 2016 08:47:06 +0000 (10:47 +0200)]
selftest: Add newlines for info output

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
3 years agoselftest: Fix indentation in wait_for_start()
Andreas Schneider [Fri, 17 Jun 2016 07:48:19 +0000 (09:48 +0200)]
selftest: Fix indentation in wait_for_start()

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
3 years agoselftest: Consistently check for provision return code
Andreas Schneider [Fri, 17 Jun 2016 07:23:49 +0000 (09:23 +0200)]
selftest: Consistently check for provision return code

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
3 years agoselftest: Remove unneeded sleep before first ldbsearch execution
Andreas Schneider [Fri, 17 Jun 2016 11:03:48 +0000 (13:03 +0200)]
selftest: Remove unneeded sleep before first ldbsearch execution

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
3 years agoselftest: Use the correct smb.conf for ldbsearch
Andreas Schneider [Fri, 17 Jun 2016 11:03:34 +0000 (13:03 +0200)]
selftest: Use the correct smb.conf for ldbsearch

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
3 years agolib/ldb-samba: We can confirm a GUID is a GUID by length
Andrew Bartlett [Wed, 15 Jun 2016 03:42:18 +0000 (15:42 +1200)]
lib/ldb-samba: We can confirm a GUID is a GUID by length

The GUID_from_ndr_blob() is pointless and costly

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Fri Jun 17 18:13:56 CEST 2016 on sn-devel-144

3 years agoselftest: Do not run local.ndr 3 times
Andrew Bartlett [Tue, 14 Jun 2016 08:08:40 +0000 (20:08 +1200)]
selftest: Do not run local.ndr 3 times

This is already run from under source4/selftest/tests.py

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agoflapping: remove samba_dnsupdate from flapping
Garming Sam [Fri, 17 Jun 2016 00:51:47 +0000 (12:51 +1200)]
flapping: remove samba_dnsupdate from flapping

nsupdate is now installed

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
3 years agorepl: Avoid excessive stack use and instead sort the links in the heap
Andrew Bartlett [Mon, 13 Jun 2016 04:41:08 +0000 (16:41 +1200)]
repl: Avoid excessive stack use and instead sort the links in the heap

The two large stack-based arrays would overflow the stack, this avoids
a duplicate of the struct drsuapi_DsReplicaLinkedAttribute array

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

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agogetncchanges: Match Windows on linked attribute sort
Garming Sam [Thu, 9 Jun 2016 05:03:18 +0000 (17:03 +1200)]
getncchanges: Match Windows on linked attribute sort

The order of linked attributes depends on comparison of the NDR packed
GUIDs (not its struct GUID form).

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11960

3 years agogetncchanges: sort with precalculated target guid array
Garming Sam [Mon, 6 Jun 2016 23:56:49 +0000 (11:56 +1200)]
getncchanges: sort with precalculated target guid array

This avoids reparsing the linked attribute and schema refetching.

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11960

3 years agogetncchanges: remove some whitespace
Garming Sam [Mon, 6 Jun 2016 23:57:02 +0000 (11:57 +1200)]
getncchanges: remove some whitespace

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11960

3 years agotests/drs: change sort order in tests to match Windows
Garming Sam [Thu, 9 Jun 2016 03:54:25 +0000 (15:54 +1200)]
tests/drs: change sort order in tests to match Windows

Although we attempted to sort by GUID based on DRSR, it is actually
sorted by the ndr packed GUID.

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11960

3 years agotests/drs: assert sorted identifier GUIDs across getncchanges
Garming Sam [Thu, 9 Jun 2016 02:55:57 +0000 (14:55 +1200)]
tests/drs: assert sorted identifier GUIDs across getncchanges

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11960

3 years agotests/drs: make cleanup more robust
Garming Sam [Wed, 8 Jun 2016 22:56:28 +0000 (10:56 +1200)]
tests/drs: make cleanup more robust

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11960

3 years agotests/drs: extend getnc_exop test to check linked attributes
Garming Sam [Tue, 7 Jun 2016 23:10:58 +0000 (11:10 +1200)]
tests/drs: extend getnc_exop test to check linked attributes

Assert that linked attributes propagate across DRS and come in a
particular sorted order.

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11960

3 years agolibnet: only create local private krb5.conf if joining an AD domain
Michael Adam [Wed, 15 Jun 2016 22:15:00 +0000 (00:15 +0200)]
libnet: only create local private krb5.conf if joining an AD domain

This prevents irritating warning messages.

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 Jun 17 08:13:55 CEST 2016 on sn-devel-144

3 years agowinbind: honor 'socket options' in winbind
Jim McDonough [Wed, 15 Jun 2016 19:57:01 +0000 (15:57 -0400)]
winbind: honor 'socket options' in winbind

Set socket options from smb.conf before negprot, as done by libsmbclient

Signed-off-by: Jim McDonough <jmcd@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
3 years agos4: dns: Correctly check for talloc failure.
Jeremy Allison [Thu, 16 Jun 2016 04:25:59 +0000 (21:25 -0700)]
s4: dns: Correctly check for talloc failure.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Thu Jun 16 16:55:15 CEST 2016 on sn-devel-144

3 years agoflapping: temporarily add samba_dnsupdate test
Garming Sam [Wed, 15 Jun 2016 04:32:23 +0000 (16:32 +1200)]
flapping: temporarily add samba_dnsupdate test

This should be removed when we can run nsupdate on sn-devel

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Garming Sam <garming@samba.org>
Autobuild-Date(master): Thu Jun 16 08:37:56 CEST 2016 on sn-devel-144

3 years agodrs: Send DRSUAPI_DRS_GET_ALL_GROUP_MEMBERSHIP by default
Garming [Tue, 14 Jun 2016 22:05:34 +0000 (10:05 +1200)]
drs: Send DRSUAPI_DRS_GET_ALL_GROUP_MEMBERSHIP by default

This flag is not implemented in Samba, however, on an RODC replicating from
Windows, failing to send this flag leaves out group memberships.

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
3 years agoselftest: Remove print attribute from getnc_exop test
Andrew Bartlett [Tue, 14 Jun 2016 07:55:44 +0000 (19:55 +1200)]
selftest: Remove print attribute from getnc_exop test

This otherwise fills the logs with every object

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agoselftest: Add a DNS test matching Windows
Andrew Bartlett [Fri, 10 Jun 2016 03:40:59 +0000 (15:40 +1200)]
selftest: Add a DNS test matching Windows

This performs the same steps as Windows does

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agodns_server: Fix typo in dns_authoritative_for_zone() name.
Garming Sam [Mon, 30 May 2016 22:48:15 +0000 (10:48 +1200)]
dns_server: Fix typo in dns_authoritative_for_zone() name.

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
3 years agoselftest: confirm samba_dnsupdate works in both nsupdate and samba_tool mode
Andrew Bartlett [Tue, 1 Sep 2015 03:58:30 +0000 (15:58 +1200)]
selftest: confirm samba_dnsupdate works in both nsupdate and samba_tool mode

This can be extended, but already checks the basic functionality

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agoselftest: Always set up a resolv.conf and use it in samba_dnsupdate
Andrew Bartlett [Fri, 10 Jun 2016 03:43:37 +0000 (15:43 +1200)]
selftest: Always set up a resolv.conf and use it in samba_dnsupdate

This allows samba_dnsupdate to be tested without resolv_wrapper.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agoselftest: Ensure we write 127. addresses into DNS
Andrew Bartlett [Fri, 28 Aug 2015 03:07:49 +0000 (15:07 +1200)]
selftest: Ensure we write 127. addresses into DNS

The --all-interfaces option is required both with and without the dns_host_file

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agosamba_dnsupdate: Give the administrator more detail when DNS lookups fail
Andrew Bartlett [Wed, 12 Aug 2015 23:34:36 +0000 (11:34 +1200)]
samba_dnsupdate: Give the administrator more detail when DNS lookups fail

This avoids treating server errors identically to name-not-present status values

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agosamba_dnsupdate: Implement RPC <ZONE> prefix in dns_update_list
Andrew Bartlett [Tue, 11 Aug 2015 00:37:01 +0000 (12:37 +1200)]
samba_dnsupdate: Implement RPC <ZONE> prefix in dns_update_list

This allows us to update the stub records as well as the zone itself.

Based on a proposed syntax by metze.

Andrew Bartlett

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agosamba_dnsupdate: Simplify logic and add more verbose debugging
Andrew Bartlett [Mon, 10 Aug 2015 00:15:04 +0000 (12:15 +1200)]
samba_dnsupdate: Simplify logic and add more verbose debugging

By reducing the intendation this code is a little clearer

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agosamba_dnsupdate: Allow admin to force a particular IP into samba_dnsupdate
Andrew Bartlett [Fri, 7 Aug 2015 02:57:20 +0000 (14:57 +1200)]
samba_dnsupdate: Allow admin to force a particular IP into samba_dnsupdate

This should help in deployements beyind NAT.

It will also help in testing.

Andrew Bartlett

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agodns_update_list: Add in NS records
Andrew Bartlett [Mon, 2 Mar 2015 00:37:54 +0000 (13:37 +1300)]
dns_update_list: Add in NS records

This is as suggested by metze in 4383ec5b83d12bd19749582217f082cbaa31a128

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agosamba_dnsupdate: Add a mode that calls samba-tool dns, rather than nsupdate
Andrew Bartlett [Wed, 25 Feb 2015 23:29:23 +0000 (12:29 +1300)]
samba_dnsupdate: Add a mode that calls samba-tool dns, rather than nsupdate

This mode is more likely to work when we change hostname or IP

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agosamba_dnsupdate: Work around a bug in nsupdate
Andreas Schneider [Tue, 25 Aug 2015 15:26:05 +0000 (17:26 +0200)]
samba_dnsupdate: Work around a bug in nsupdate

The doio_send() function of bind fails on a short write with sendmsg().

See https://bugzilla.redhat.com/show_bug.cgi?id=1250921

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
3 years agosamba_dnsupdate: Fix typo in -no-substitutions name
Garming Sam [Thu, 26 May 2016 02:12:40 +0000 (14:12 +1200)]
samba_dnsupdate: Fix typo in -no-substitutions name

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
3 years agotests/drs: cleanup some whitespace
Garming Sam [Tue, 7 Jun 2016 23:11:15 +0000 (11:11 +1200)]
tests/drs: cleanup some whitespace

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11960

3 years agodrsuapi.idl: Add attid used in testing in idl
Garming Sam [Wed, 8 Jun 2016 02:19:42 +0000 (14:19 +1200)]
drsuapi.idl: Add attid used in testing in idl

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11960

3 years agoselftest: Check a user with only primaryGroupID is correct in samr.GetUserGroups...
Andrew Bartlett [Thu, 9 Jun 2016 02:56:02 +0000 (14:56 +1200)]
selftest: Check a user with only primaryGroupID is correct in samr.GetUserGroups() reply

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agoselftest: Test that primaryGroupID is first in samr.GetUserGroups() reply
Andrew Bartlett [Thu, 9 Jun 2016 02:55:24 +0000 (14:55 +1200)]
selftest: Test that primaryGroupID is first in samr.GetUserGroups() reply

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agoselftest: Add alias membership to the tokengroups test
Andrew Bartlett [Thu, 9 Jun 2016 02:54:47 +0000 (14:54 +1200)]
selftest: Add alias membership to the tokengroups test

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agos4-samr: Rework GetGroupsForUser to use memberOf
Andrew Bartlett [Wed, 8 Jun 2016 04:49:01 +0000 (16:49 +1200)]
s4-samr: Rework GetGroupsForUser to use memberOf

By reading the SID values from the memberOf links, we avoid an un-indexed search on
the member attribute.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agos4-libcli/raw: Fix compiler errors when building with --address-sanitizer
Andrew Bartlett [Tue, 7 Jun 2016 03:43:29 +0000 (15:43 +1200)]
s4-libcli/raw: Fix compiler errors when building with --address-sanitizer

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agos4-kcc: Fix compiler errors when building with --address-sanitizer
Andrew Bartlett [Tue, 7 Jun 2016 03:43:13 +0000 (15:43 +1200)]
s4-kcc: Fix compiler errors when building with --address-sanitizer

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agos3-vfs/snapper: Fix compiler errors when building with --address-sanitizer
Andrew Bartlett [Tue, 7 Jun 2016 03:43:01 +0000 (15:43 +1200)]
s3-vfs/snapper: Fix compiler errors when building with --address-sanitizer

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agos3-libnet: Fix compiler errors when building with --address-sanitizer
Andrew Bartlett [Tue, 7 Jun 2016 03:42:41 +0000 (15:42 +1200)]
s3-libnet: Fix compiler errors when building with --address-sanitizer

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agos3-client: Fix compiler errors when building with --address-sanitizer
Andrew Bartlett [Tue, 7 Jun 2016 03:42:33 +0000 (15:42 +1200)]
s3-client: Fix compiler errors when building with --address-sanitizer

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agolibgpo: Fix compiler errors when building with --address-sanitizer
Andrew Bartlett [Tue, 7 Jun 2016 03:42:23 +0000 (15:42 +1200)]
libgpo: Fix compiler errors when building with --address-sanitizer

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agolibcli/smb: Fix compiler errors when building with --address-sanitizer
Andrew Bartlett [Tue, 7 Jun 2016 03:42:15 +0000 (15:42 +1200)]
libcli/smb: Fix compiler errors when building with --address-sanitizer

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agoselftest: Expand tokenGroups test to also compare with samr.GetGroupsForUser
Andrew Bartlett [Wed, 8 Jun 2016 02:46:07 +0000 (14:46 +1200)]
selftest: Expand tokenGroups test to also compare with samr.GetGroupsForUser

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agoselftest: Expand tokenGroups test to also build nested groups
Andrew Bartlett [Wed, 8 Jun 2016 02:45:47 +0000 (14:45 +1200)]
selftest: Expand tokenGroups test to also build nested groups

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agos4-samr: Fix samr.QueryUserInfo level 1 primary group
Andrew Bartlett [Thu, 9 Jun 2016 02:56:44 +0000 (14:56 +1200)]
s4-samr: Fix samr.QueryUserInfo level 1 primary group

Because of this typo, the primary group ID was returned as 0

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agosamba-tool domain join: Refuse to re-join a DC with a still-valid password
Andrew Bartlett [Tue, 31 May 2016 02:54:45 +0000 (14:54 +1200)]
samba-tool domain join: Refuse to re-join a DC with a still-valid password

While the DC will eventually get back to the same state, it can take a
while, so try harder not to overwrite our already-working account

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agosamba-tool: Improve fsmo handling
Andrew Bartlett [Fri, 3 Jun 2016 02:50:55 +0000 (14:50 +1200)]
samba-tool: Improve fsmo handling

This makes a clear seperation between data and display variables
and improves the tests.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agoselftest: Rebase DrsBaseTestCase on SambaToolCmdTest
Andrew Bartlett [Wed, 1 Jun 2016 09:27:07 +0000 (21:27 +1200)]
selftest: Rebase DrsBaseTestCase on SambaToolCmdTest

This then makes SambaToolCmdTest based on BlackboxTestCase.

This allows us to use better command output testing in the fsmo tests

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agoselftest: add test for DNS updates with TKEY/TSIG
Ralph Boehme [Wed, 4 May 2016 12:26:16 +0000 (14:26 +0200)]
selftest: add test for DNS updates with TKEY/TSIG

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

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Autobuild-User(master): Garming Sam <garming@samba.org>
Autobuild-Date(master): Thu Jun 16 04:07:41 CEST 2016 on sn-devel-144

3 years agos4/dns_server: enable sending of TSIG error records
Ralph Boehme [Mon, 30 May 2016 14:44:00 +0000 (16:44 +0200)]
s4/dns_server: enable sending of TSIG error records

This final patch enables sending TSIG error records by adding
DNS_RCODE_NOTAUTH to the set of error conditions that are allowed to
trigger sending a full generated response.

See RFC 2845 "4.5.1. KEY check and error handling" and "4.5.3. MAC check
and error handling".

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

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
3 years agos4/dns_server: prepare sending correct error responses for dns_verify_tsig() errors
Ralph Boehme [Mon, 30 May 2016 14:42:14 +0000 (16:42 +0200)]
s4/dns_server: prepare sending correct error responses for dns_verify_tsig() errors

Call dns_verify_tsig() after updating state.flags and assign and use
out_packet for dns_verify_tsig().

We will need the updated flags when sending TSIG error responses when
TSIG request MAC verification fails and dns_verify_tsig() uses the
passed in packet as response, so we have to make sure we copy in_packet
to out_packet before calling out and pass out_packet.

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

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>