autobuild[sn-devel-144]: intermittent test failure detected

[autobuild]

The autobuild test system (on sn-devel-144) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey.sn-devel-144/2017-09-15-0225/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-144/2017-09-15-0225/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-144/2017-09-15-0225/samba.stdout
  
The top commit at the time of the failure was:

commit 3f0938b9389dc9c0ca5e4acf0451f14050a7506f
Author: Alexander Bokovoy 
Date:   Wed Sep 13 11:37:34 2017 +0300

Install dcerpc/__init__.py for all Python environments

Also fix whitespace. We use tabs, not spaces in Python/waf code.

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

Signed-off-by: Alexander Bokovoy 
Reviewed-by: Andrew Bartlett 

Autobuild-User(master): Stefan Metzmacher 
Autobuild-Date(master): Thu Sep 14 22:29:39 CEST 2017 on sn-devel-144

[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
   via  3ed9c90 charset: fix str[n]casecmp_m() by comparing lower case 
values
   via  9d99b64 charset/tests: also tests the system str[n]casecmp()
   via  2a3d4fe charset/tests: add more str[n]casecmp_m() tests to 
demonstrate the bug
   via  c18ecde charset/tests: assert the exact values of str[n]casecmp_m()
  from  3f0938b Install dcerpc/__init__.py for all Python environments

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 3ed9c903671e795964ce3da9d0080444ef3eb5e9
Author: Stefan Metzmacher 
Date:   Wed Sep 6 09:47:20 2017 +0200

charset: fix str[n]casecmp_m() by comparing lower case values

The commits 
c615ebed6e3d273a682806b952d543e834e5630d^..f19ab5d334e3fb15761fb009e5de876dfc6ea785
replaced Str[n]CaseCmp() by str[n]casecmp_m().

The logic we had in str[n]casecmp_w() used to compare
the upper cased as well as the lower cased versions of the
characters and returned the difference between the lower cased versions.

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

Signed-off-by: Stefan Metzmacher 
Reviewed-by: Ralph Boehme 

Autobuild-User(master): Ralph Böhme 
Autobuild-Date(master): Fri Sep 15 02:23:29 CEST 2017 on sn-devel-144

commit 9d99b640b9002ad6c0eb0d29a6d7adcfda870e13
Author: Stefan Metzmacher 
Date:   Wed Sep 6 11:24:28 2017 +0200

charset/tests: also tests the system str[n]casecmp()

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

Signed-off-by: Stefan Metzmacher 
Reviewed-by: Ralph Boehme 

commit 2a3d4fe0c9eacf9d0b2261ef116a1f6b741e20ee
Author: Stefan Metzmacher 
Date:   Wed Sep 6 10:39:00 2017 +0200

charset/tests: add more str[n]casecmp_m() tests to demonstrate the bug

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

Signed-off-by: Stefan Metzmacher 
Reviewed-by: Ralph Boehme 

commit c18ecdececef8fcfdaa5d3e1a066533c8b41f19d
Author: Stefan Metzmacher 
Date:   Wed Sep 6 10:38:37 2017 +0200

charset/tests: assert the exact values of str[n]casecmp_m()

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

Signed-off-by: Stefan Metzmacher 
Reviewed-by: Ralph Boehme 

---

Summary of changes:
 lib/util/charset/tests/charset.c | 75 +++-
 lib/util/charset/util_str.c  | 32 ++---
 2 files changed, 86 insertions(+), 21 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/charset/tests/charset.c b/lib/util/charset/tests/charset.c
index 7f33656..71635c6 100644
--- a/lib/util/charset/tests/charset.c
+++ b/lib/util/charset/tests/charset.c
@@ -48,19 +48,37 @@ static bool test_codepoint_cmpi(struct torture_context 
*tctx)
return true;
 }
 
+static bool test_strcasecmp(struct torture_context *tctx)
+{
+   torture_assert_int_equal(tctx, strcasecmp("foo", "bar"), 4, "different 
strings both lower");
+   torture_assert_int_equal(tctx, strcasecmp("foo", "Bar"), 4, "different 
strings lower/upper");
+   torture_assert_int_equal(tctx, strcasecmp("Foo", "bar"), 4, "different 
strings upper/lower");
+   torture_assert_int_equal(tctx, strcasecmp("AFoo", "_bar"), 2, 
"different strings upper/lower");
+   torture_assert_int_equal(tctx, strcasecmp("foo", "foo"), 0, "same case 
strings");
+   torture_assert_int_equal(tctx, strcasecmp("foo", "Foo"), 0, "different 
case strings");
+
+   /*
+* Note that strcasecmp() doesn't allow NULL arguments
+*/
+   return true;
+}
+
 static bool test_strcasecmp_m(struct torture_context *tctx)
 {
/* file.{accented e} in iso8859-1 */
const char file_iso8859_1[7] = { 0x66, 0x69, 0x6c, 0x65, 0x2d, 0xe9, 0 
};
/* file.{accented e} in utf8 */
const char file_utf8[8] =  { 0x66, 0x69, 0x6c, 0x65, 0x2d, 0xc3, 
0xa9, 0 };
-   torture_assert(tctx, strcasecmp_m("foo", "bar") != 0, "different 
strings");
-   torture_assert(tctx, strcasecmp_m("foo", "foo") == 0, "same case 
strings");
-   torture_assert(tctx, strcasecmp_m("foo", "Foo") == 0, "different case 
strings");
-   torture_assert(tctx, strcasecmp_m(NULL, "Foo") != 0, "one NULL");
-   torture_assert(tctx, strcasecmp_m("foo", NULL) != 0, "other NULL");
-   torture_assert(tctx, strcasecmp_m(NULL, NULL) == 0, "both NULL");
-   torture_assert(tctx, strcasecmp_m(file_iso8859_1, file_utf8) != 0,
+   torture_assert_int_equal(tctx, strcasecmp_m("foo", "bar"), 4, 
"different strings both lower");
+   torture_assert_int_equal(tctx, strcasecmp_m("foo", "Bar"), 4, 
"different 

[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
   via  3f0938b Install dcerpc/__init__.py for all Python environments
   via  9516d42 s4-provision: Ensure the dummy main-domain DB used for DLZ 
has an @INDEXLIST
   via  24600e8 repl_meta_data: Show failing replicated entry in error code
   via  b0f22f2 selftest: reindex in dbcheck-oldrelease after modifying the 
backend DB
   via  5d9bb80 schema: Rework dsdb_schema_set_indices_and_attributes() db 
operations
   via  51be275 selftest: Check re-opening sam.ldb corrects the @ATTRIBUTES 
and @INDEXLIST
  from  a808c02 ctdb-protocol: Drop marshalling for monitor controls

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 3f0938b9389dc9c0ca5e4acf0451f14050a7506f
Author: Alexander Bokovoy 
Date:   Wed Sep 13 11:37:34 2017 +0300

Install dcerpc/__init__.py for all Python environments

Also fix whitespace. We use tabs, not spaces in Python/waf code.

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

Signed-off-by: Alexander Bokovoy 
Reviewed-by: Andrew Bartlett 

Autobuild-User(master): Stefan Metzmacher 
Autobuild-Date(master): Thu Sep 14 22:29:39 CEST 2017 on sn-devel-144

commit 9516d4229f85c7f19e1af49f0cc36ac3656d5477
Author: Andrew Bartlett 
Date:   Wed Aug 30 15:30:04 2017 +1200

s4-provision: Ensure the dummy main-domain DB used for DLZ has an @INDEXLIST

The other databases are created from copies of the main provision, but this 
one
is not, so did not previously get a valid @INDEXLIST.

This is important as otherwise we will not correctly notice support for
the GUID index or new DSDB features in @SAMBA_DSDB as this is gated
on seeing @SAMBA_FEATURES_SUPPORTED in @INDEXLIST.

Signed-off-by: Andrew Bartlett 
Reviewed-by: Garming Sam 

commit 24600e8e911cd8bec678282a29a7c5a8aefb9879
Author: Andrew Bartlett 
Date:   Wed Sep 6 16:24:35 2017 +1200

repl_meta_data: Show failing replicated entry in error code

This re-work of our LDIF printing avoids some of the privacy issue from
printing the full LDIF at level 4, while showing the entry that actually 
fails.

Instead, with e3988f8f74f4a11e8f26a548e0a33d20f4e863f7 we now print the DN
only at level 4, then the full message at 8.

With this patch on failure, we print the redacted failing message at 5.

While all of the DRS replication data is potentially sensitive
the passwords are most sensitive, and are now not printed unencrypted.

This discourages users from sending the full failing trace, as the
last entry is much more likely the issue.

Signed-off-by: Andrew Bartlett 
Reviewed-by: Garming Sam 

commit b0f22f2661f5712ac00cf221e734b99e8d5d04fa
Author: Andrew Bartlett 
Date:   Tue Sep 12 14:17:35 2017 +1200

selftest: reindex in dbcheck-oldrelease after modifying the backend DB

Modifying the backend DB is not a supported operation, but helps us create 
test
situations.

Signed-off-by: Andrew Bartlett 
Reviewed-by: Garming Sam 

commit 5d9bb80a027ba2b03c97d80c10173f946c758f69
Author: Andrew Bartlett 
Date:   Mon Sep 11 15:22:23 2017 +1200

schema: Rework dsdb_schema_set_indices_and_attributes() db operations

Commit ec9b1e881c3eef503d6b4b311594113acf7d47d8 did not fully fix this.

There is no value in using dsdb_replace(), we are under the read lock
and replace just confuses things further.

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

Signed-off-by: Andrew Bartlett 
Reviewed-by: Garming Sam 

commit 51be27522caffde8a3806f8c0c877a0f85eaf398
Author: Andrew Bartlett 
Date:   Wed Sep 13 16:13:06 2017 +1200

selftest: Check re-opening sam.ldb corrects the @ATTRIBUTES and @INDEXLIST

Signed-off-by: Andrew Bartlett 
Reviewed-by: Garming Sam 

---

Summary of changes:
 python/samba/provision/sambadns.py  |  4 ++
 python/samba/tests/dsdb_schema_attributes.py| 53 +
 source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 36 -
 source4/dsdb/schema/schema_set.c| 17 
 source4/librpc/wscript_build| 11 ++---
 testprogs/blackbox/dbcheck-oldrelease.sh|  3 ++
 6 files changed, 109 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/provision/sambadns.py 

[SCM] Samba Shared Repository - branch v4-7-test updated

[Karolin Seeger]

The branch, v4-7-test has been updated
   via  adfca55 WHATSNEW: Prepare changes since 4.7.0rc5.
   via  81f31fd libcli: SMB2: NetApps negotiate SMB3_11 but also set the 
SMB2_CAP_ENCRYPTION flag.
   via  668cc39 python: Allow debug classes to be specified on the command 
line for python tools
   via  c7f3f20 librpc/dceprc_util.c: Move debug message to DBG_DEBUG()
   via  2f2edad libcli/security: Move debug message to DBG_DEBUG()
   via  f6cadd5 dsdb: Add missing 
 to debug
   via  66de4c1 drs repl: Only print raw DRS replication traffic at level 9
   via  5977227 debug: Add new debug class "drs_repl" for DRS replication 
processing
   via  8fbaf15 repl_meta_data: Re-work printing of replicated entries
   via  2ea6beb linked_attributes: Use ldb_ldif_message_redacted_string() 
for consistency
   via  11568c8 repl_meta_data: Use ldb_ldif_message_redacted_string() to 
avoid printing secrets in logs
   via  dab3dea ldb: version 1.2.2
   via  256f485 ldb: Add new ldb_ldif_message_redacted_string() with tests
   via  0806c9c ldb_tdb: Refuse to re-index very old database with no DN in 
the record
   via  8f603e7 ldb_tdb: Use braces in ltdb_dn_list_find_val()
   via  504d3df ldb_tdb: Check for talloc_strdup() failure in 
ltdb_index_add1()
   via  285efde ldb_tdb: Check for errors during tdb operations in 
ltdb_reindex()
   via  5311eb4 ldb_tdb: Use memcmp rather than strncmp() in 
ltdb_key_is_record(), re_key() and re_index()
   via  0c87159 ldb_tdb: Create a common ltdb_key_is_record() allowing 
multiple key forms
   via  e703680 ldb_tdb: Do not trigger the unique index check during a 
re-index, use another pass
   via  7db6c56 ldb_tdb: Use memcmp() to compare TDB keys in re_index()
   via  1a2d909 ldb: Add tests for indexed and unindexed search expressions
   via  e517bc4 ldb: Fix tests to call the parent tearDown(), not setUp in 
tearDown
   via  b6fd54b ldb_tdb: Rework ltdb_modify_internal() to use 
ltdb_search_dn1() internally
   via  98a803f ldb: Add LDB_UNPACK_DATA_FLAG_NO_ATTRS
  from  eabed4d ctdb-daemon: GET_DB_SEQNUM should read database 
conditionally

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-7-test


- Log -
commit adfca554850ca2078dce79f26699308db799c85a
Author: Karolin Seeger 
Date:   Thu Sep 14 06:45:45 2017 -0700

WHATSNEW: Prepare changes since 4.7.0rc5.

Signed-off-by: Karolin Seeger 

Autobuild-User(v4-7-test): Karolin Seeger 
Autobuild-Date(v4-7-test): Thu Sep 14 22:01:27 CEST 2017 on sn-devel-144

commit 81f31fd50901a91fcce2024f3616f3543d4e4504
Author: Jeremy Allison 
Date:   Mon Sep 11 16:36:47 2017 -0700

libcli: SMB2: NetApps negotiate SMB3_11 but also set the 
SMB2_CAP_ENCRYPTION flag.

This is a SHOULD not, not a MUST not.

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

Signed-off-by: Jeremy Allison 
Reviewed-by: Steve French 

Autobuild-User(master): Jeremy Allison 
Autobuild-Date(master): Thu Sep 14 14:48:20 CEST 2017 on sn-devel-144

(cherry picked from commit f0a90a1287a8f4c4114919a32afaff52e3c69a9b)

commit 668cc39e320aeb30641580a1fcab39c108bd9c26
Author: Andrew Bartlett 
Date:   Thu Sep 7 11:26:04 2017 +1200

python: Allow debug classes to be specified on the command line for python 
tools

Signed-off-by: Andrew Bartlett 
Reviewed-by: Douglas Bagnall 

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

Autobuild-User(master): Andrew Bartlett 
Autobuild-Date(master): Thu Sep  7 10:43:33 CEST 2017 on sn-devel-144

(cherry picked from commit c938f61d332de0323cb135b201367f90f08d76a8)

commit c7f3f20590971d2777b81302484e32b595d109d5
Author: Andrew Bartlett 
Date:   Thu Sep 7 11:20:27 2017 +1200

librpc/dceprc_util.c: Move debug message to DBG_DEBUG()

This message shows up a lot (every packet) at level 6 for the succesful case

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

Signed-off-by: Andrew Bartlett 
Reviewed-by: Douglas Bagnall 
(cherry picked from commit cbb3dcf2c67dd6ddbb419fff04112e3c345c2108)

commit 2f2edada445e32a41c8f3c861261dff114f3f2d3
Author: Andrew Bartlett 
Date:   Thu Sep 7 11:19:01 2017 +1200

libcli/security: Move debug message to DBG_DEBUG()

This message shows up a lot at level 6 for no particularly good reason

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

Signed-off-by: Andrew Bartlett 
Reviewed-by: Douglas Bagnall 
  

[SCM] Samba Shared Repository - branch master updated

[Amitay Isaacs]

The branch, master has been updated
   via  a808c02 ctdb-protocol: Drop marshalling for monitor controls
   via  28eda77 ctdb-client: Drop client code for monitor controls
   via  98f5f11 ctdb-client: Drop old client code for monitor controls
   via  b119104 ctdb-daemon: Remove unused function ctdb_stop_monitoring()
   via  64225c6 ctdb-daemon: Drop monitoring mode
   via  690e3e1 ctdb-tests: Drop implementation of monitor controls
   via  b00e360 ctdb-daemon: Drop implementation of monitor controls
   via  74f29a4 ctdb-daemon: Mark monitoring controls obsolete
   via  4b01621 ctdb-docs: Drop mention of unimplemented commands
   via  53ae91a ctdb-tools: Drop monitoring-related ctdb commands
   via  19318d2 ctdb-daemon: Don't explicitly stop monitoring during 
shutdown
   via  4656b08 ctdb-daemon: Don't explicitly disable monitoring around 
recovery
   via  173aa68 ctdb-daemon: Don't explicitly disable monitoring when 
stopping a node
   via  12cf664 ctdb-daemon: Skip monitoring when not in RUNNING runstate
   via  873db69 ctdb-daemon: Skip monitoring when node is inactive
   via  5a782a2 ctdb-tests: Drop unused monitoring status support
   via  a878171 ctdb-client: Initialize ctdb_ltdb_header completely for 
empty record
   via  77c17b0 ctdb-daemon: Free up record data if a call request is 
deferred
  from  f0a90a1 libcli: SMB2: NetApps negotiate SMB3_11 but also set the 
SMB2_CAP_ENCRYPTION flag.

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit a808c0200197a4648caba88a550c8d63f3c8fe63
Author: Martin Schwenke 
Date:   Mon Sep 4 14:54:47 2017 +1000

ctdb-protocol: Drop marshalling for monitor controls

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs 

Autobuild-User(master): Amitay Isaacs 
Autobuild-Date(master): Thu Sep 14 18:42:28 CEST 2017 on sn-devel-144

commit 28eda778465272e6d0afa4d03da70d3c9e0d9472
Author: Martin Schwenke 
Date:   Mon Sep 4 14:51:38 2017 +1000

ctdb-client: Drop client code for monitor controls

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs 

commit 98f5f1122be9252f10e81c81e134599fd49575a1
Author: Martin Schwenke 
Date:   Mon Sep 4 14:51:02 2017 +1000

ctdb-client: Drop old client code for monitor controls

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs 

commit b119104267635d96b1f99a2e98d35438841585bf
Author: Martin Schwenke 
Date:   Mon Sep 11 10:54:03 2017 +1000

ctdb-daemon: Remove unused function ctdb_stop_monitoring()

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs 

commit 64225c63dd982b34154c2e2b4a92e610c29183bd
Author: Martin Schwenke 
Date:   Mon Sep 4 14:44:16 2017 +1000

ctdb-daemon: Drop monitoring mode

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs 

commit 690e3e13f22e1dd11d9a1d25659ff549f4aa8488
Author: Martin Schwenke 
Date:   Mon Sep 4 14:43:41 2017 +1000

ctdb-tests: Drop implementation of monitor controls

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs 

commit b00e3605151b739c4cac8f81af7b081dee2c7df7
Author: Martin Schwenke 
Date:   Mon Sep 4 14:33:17 2017 +1000

ctdb-daemon: Drop implementation of monitor controls

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs 

commit 74f29a48dbbb980f7e22783e80cee03feb2c18de
Author: Martin Schwenke 
Date:   Mon Sep 4 14:22:44 2017 +1000

ctdb-daemon: Mark monitoring controls obsolete

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs 

commit 4b01621912b75b3bf5cfe1473f94a6b8aff5ddbf
Author: Martin Schwenke 
Date:   Mon Sep 4 14:19:10 2017 +1000

ctdb-docs: Drop mention of unimplemented commands

Some of these are only in a comment but git grep finds them.

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs 

commit 53ae91a4f74c7a623077fa88e8f1a3a7fa55a5aa
Author: Martin Schwenke 
Date:   Mon Sep 4 14:18:49 2017 +1000

ctdb-tools: Drop monitoring-related ctdb commands

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs 

commit 19318d28354190a9cfafa1696e41c90351f85af9
Author: Martin Schwenke 
Date:   Mon Sep 11 10:48:50 2017 +1000

ctdb-daemon: Don't explicitly stop monitoring during 

autobuild[sn-devel-144]: intermittent test failure detected

[autobuild]

The autobuild test system (on sn-devel-144) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey.sn-devel-144/2017-09-14-1812/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-144/2017-09-14-1812/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-144/2017-09-14-1812/samba.stdout
  
The top commit at the time of the failure was:

commit f0a90a1287a8f4c4114919a32afaff52e3c69a9b
Author: Jeremy Allison 
Date:   Mon Sep 11 16:36:47 2017 -0700

libcli: SMB2: NetApps negotiate SMB3_11 but also set the 
SMB2_CAP_ENCRYPTION flag.

This is a SHOULD not, not a MUST not.

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

Signed-off-by: Jeremy Allison 
Reviewed-by: Steve French 

Autobuild-User(master): Jeremy Allison 
Autobuild-Date(master): Thu Sep 14 14:48:20 CEST 2017 on sn-devel-144

[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
   via  f0a90a1 libcli: SMB2: NetApps negotiate SMB3_11 but also set the 
SMB2_CAP_ENCRYPTION flag.
  from  1b6aa39 vfs_streams_xattr: Fix segfault when running with log level 
10

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit f0a90a1287a8f4c4114919a32afaff52e3c69a9b
Author: Jeremy Allison 
Date:   Mon Sep 11 16:36:47 2017 -0700

libcli: SMB2: NetApps negotiate SMB3_11 but also set the 
SMB2_CAP_ENCRYPTION flag.

This is a SHOULD not, not a MUST not.

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

Signed-off-by: Jeremy Allison 
Reviewed-by: Steve French 

Autobuild-User(master): Jeremy Allison 
Autobuild-Date(master): Thu Sep 14 14:48:20 CEST 2017 on sn-devel-144

---

Summary of changes:
 libcli/smb/smbXcli_base.c | 15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index d73949b..5493954 100644
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -4916,10 +4916,19 @@ static void smbXcli_negprot_smb2_done(struct tevent_req 
*subreq)
return;
}
 
+   /*
+* Here we are now at SMB3_11, so encryption should be
+* negotiated via context, not capabilities.
+*/
+
if (conn->smb2.server.capabilities & SMB2_CAP_ENCRYPTION) {
-   tevent_req_nterror(req,
-   NT_STATUS_INVALID_NETWORK_RESPONSE);
-   return;
+   /*
+* Server set SMB2_CAP_ENCRYPTION capability,
+* but *SHOULD* not, not *MUST* not. Just mask it off.
+* NetApp seems to do this:
+* BUG: https://bugzilla.samba.org/show_bug.cgi?id=13009
+*/
+   conn->smb2.server.capabilities &= ~SMB2_CAP_ENCRYPTION;
}
 
negotiate_context_offset = IVAL(body, 60);


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
   via  1b6aa39 vfs_streams_xattr: Fix segfault when running with log level 
10
  from  8d9a050 ctdb-tests: Add 31.clamd eventscript unit tests

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 1b6aa39fac0825b1f25fd62a6c67994b5c491170
Author: Christof Schmitt 
Date:   Wed Sep 13 16:23:53 2017 -0700

vfs_streams_xattr: Fix segfault when running with log level 10

This happens when vfs_streams_xattr is loaded, log level is set to 10
and the default stream of a file or directory is accessed. In that case
streams_xattr_open does not allocate the stream_io fsp extension. The
DBG_DEBUG message in streams_xattr_fstat tries to access the stream_io
before checking for a NULL value, resulting in the crash. Fix this by
moving the debug message after the check for a NULL pointer.

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

Signed-off-by: Christof Schmitt 
Reviewed-by: Ralph Boehme 

Autobuild-User(master): Ralph Böhme 
Autobuild-Date(master): Thu Sep 14 10:58:12 CEST 2017 on sn-devel-144

---

Summary of changes:
 source3/modules/vfs_streams_xattr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_streams_xattr.c 
b/source3/modules/vfs_streams_xattr.c
index 1b0b577..f75f6a1 100644
--- a/source3/modules/vfs_streams_xattr.c
+++ b/source3/modules/vfs_streams_xattr.c
@@ -232,12 +232,12 @@ static int streams_xattr_fstat(vfs_handle_struct *handle, 
files_struct *fsp,
struct stream_io *io = (struct stream_io *)
VFS_FETCH_FSP_EXTENSION(handle, fsp);
 
-   DBG_DEBUG("streams_xattr_fstat called for %s\n", fsp_str_dbg(io->fsp));
-
if (io == NULL || fsp->base_fsp == NULL) {
return SMB_VFS_NEXT_FSTAT(handle, fsp, sbuf);
}
 
+   DBG_DEBUG("streams_xattr_fstat called for %s\n", fsp_str_dbg(io->fsp));
+
if (!streams_xattr_recheck(io)) {
return -1;
}


-- 
Samba Shared Repository