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

[autobuild]

The autobuild test system (on sn-devel-104) 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-104/2016-02-17-0808/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-104/2016-02-17-0808/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-104/2016-02-17-0808/samba.stdout
  
The top commit at the time of the failure was:

commit 7eab9e5fbd40e336d0345bea63b1a2541894ac64
Author: Stefan Metzmacher 
Date:   Mon Feb 1 12:27:18 2016 +0100

s4:selftest: run samba4.ldap.notification.python

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

Autobuild-User(master): Garming Sam 
Autobuild-Date(master): Wed Feb 17 06:54:48 CET 2016 on sn-devel-144

[SCM] Samba Shared Repository - branch master updated

[Garming Sam]

The branch, master has been updated
   via  7eab9e5 s4:selftest: run samba4.ldap.notification.python
   via  df04a2e s4:dsdb/tests: add notification.py with some basic tests
   via  e7dd980 s4:dsdb: let samba_dsdb make use of the dsdb_notification 
module
   via  6e88639 s4:ldap_server: add support for async notification requests
   via  46243e4 s4:dsdb: add dsdb_notification module
   via  3f0fbfa s4:dsdb/samldb: check for valid lDAPDisplayName vaues on 
add()
   via  ab16d11 s4:dsdb/tests: don't use spaces in lDAPDisplayName in 
urgent_replication.py
   via  29e3fc1 s4:ldap_server: make sure we only have one 
tstream_read_pdu_blob_send() on a connection
   via  d104d6e s4:libcli/ldap: add support for LDB_CONTROL_DIRSYNC_EX_OID
   via  fb705e1 ldb: version 1.1.26
   via  ad2b5fa ldb: add support for LDB_CONTROL_DIRSYNC_EX
   via  f721f27 ldb: add LDB_ATTR_FLAG_FORCE_BASE64_LDIF support
   via  6c8ab59 pyldb: eliminate warnings from python api test
   via  13e981d pyldb: add api tests for search_iterator()
   via  77ca078 pyldb: add ldb.search_iterator()
   via  e96fa7b pyldb: fix help message for ldb.search()
   via  2c2a254 pyldb: fix memory leak in py_ldb_search()
   via  e7bdd30 pyldb: Free correct context when pyldb_Object_AsDn() fails
   via  2b1cd4a ldb: allow a timeout of -1 result in no timeout timer at 
all.
   via  5db9f86 ldb-samba: fix the timeout setup in ildb_request_send()
   via  cd77b0bb s4:libcli/ldap: send AbandonRequests for cancelled requests
  from  a077e2a FIXUP: s3: VFS: Modify SMB_VFS_GET_NT_ACL to take a const 
struct smb_filename *

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


- Log -
commit 7eab9e5fbd40e336d0345bea63b1a2541894ac64
Author: Stefan Metzmacher 
Date:   Mon Feb 1 12:27:18 2016 +0100

s4:selftest: run samba4.ldap.notification.python

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

Autobuild-User(master): Garming Sam 
Autobuild-Date(master): Wed Feb 17 06:54:48 CET 2016 on sn-devel-144

commit df04a2eee26499066985431f7d930cdf0a4a74aa
Author: Stefan Metzmacher 
Date:   Mon Feb 1 10:58:41 2016 +0100

s4:dsdb/tests: add notification.py with some basic tests

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

commit e7dd9808b1970b56c50510d8847af7d5a542bd5a
Author: Stefan Metzmacher 
Date:   Thu Jul 23 12:09:45 2015 +0200

s4:dsdb: let samba_dsdb make use of the dsdb_notification module

This means our LDAP server will support LDB_CONTROL_NOTIFICATION_OID now.

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

commit 6e88639ed99564b92da9a069ae6c42d1ebe09678
Author: Stefan Metzmacher 
Date:   Thu Jul 23 12:08:42 2015 +0200

s4:ldap_server: add support for async notification requests

This is a simplified version that works with the current
dsdb_notification module that requires the caller to retry
periodically. We do that every 5 seconds or 100 microseconds
if we're forcing a retry.

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

commit 46243e4d80b7a1df8920d80af70c7ecca380b5a5
Author: Stefan Metzmacher 
Date:   Thu Jul 23 12:09:45 2015 +0200

s4:dsdb: add dsdb_notification module

This adds a simple implementation of LDB_CONTROL_NOTIFICATION_OID.
It requires caller (the ldap server task) to retry the request peridically,
using the same ldb_control structure in order to get some progress and
the never ending search behaviour an LDAP client expects.

For now we remember the known_usn in a cookie stored
in the otherwise unused ldb_control->data fielf
and we do a simple search using (uSNChanged>=${known_usn}+1).

In future we may do things based on the uSNChanged value.

for (i = old_highest + 1; i <= current_highest; i) {
search for (uSNChanged=i)
}

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

commit 3f0fbfa7b2eac8e54ce165564cf6f33dd1821644
Author: Stefan Metzmacher 
Date:   Mon Feb 1 23:04:04 2016 +0100

s4:dsdb/samldb: check for valid lDAPDisplayName vaues on add()

This still leaves modifies(), but that's a task for another day.

Signed-off-by: Stefan 

[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
   via  a077e2a FIXUP: s3: VFS: Modify SMB_VFS_GET_NT_ACL to take a const 
struct smb_filename *
   via  616d068 s3: VFS: Modify SMB_VFS_GET_NT_ACL to take a const struct 
smb_filename * instead of const char *
  from  3330c79 tdb: eliminate deprecation warnings in python tests

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


- Log -
commit a077e2ae62fea085f392cc32f1eb48942f5d43c7
Author: Ralph Boehme 
Date:   Sun Feb 14 21:36:15 2016 +0100

FIXUP: s3: VFS: Modify SMB_VFS_GET_NT_ACL to take a const struct 
smb_filename *

Signed-off-by: Ralph Boehme 
Reviewed-by: Jeremy Allison 

Autobuild-User(master): Jeremy Allison 
Autobuild-Date(master): Tue Feb 16 23:26:48 CET 2016 on sn-devel-144

commit 616d068f0cebb8e50a855b6e30f36fccb7f5a3c8
Author: Jeremy Allison 
Date:   Fri Feb 12 10:30:10 2016 -0800

s3: VFS: Modify SMB_VFS_GET_NT_ACL to take a const struct smb_filename * 
instead of const char *

Bumps VFS version to 35.

Preparing to reduce use of lp_posix_pathnames().

Most of this is boilerplate, the only subtleties are in
the modules:

vfs_catia.c
vfs_media_harmony.c
vfs_shadow_copy2.c
vfs_unityed_media.c

Where the path is modified then passed to SMB_VFS_NEXT_GET_NT_ACL().
In these cases the change uses synthetic_smb_fname() to
create a new struct smb_filename from the modified path.

Signed-off-by: Jeremy Allison 
Reviewed-by: Ralph Boehme 

---

Summary of changes:
 examples/VFS/skel_opaque.c  |  3 ++-
 examples/VFS/skel_transparent.c | 10 +++---
 source3/include/vfs.h   |  9 ++---
 source3/include/vfs_macros.h|  8 
 source3/modules/vfs_acl_common.c| 21 ++---
 source3/modules/vfs_catia.c | 16 ++--
 source3/modules/vfs_default.c   |  9 ++---
 source3/modules/vfs_full_audit.c|  6 +++---
 source3/modules/vfs_media_harmony.c | 21 -
 source3/modules/vfs_nfs4acl_xattr.c |  4 +++-
 source3/modules/vfs_shadow_copy2.c  | 36 ++--
 source3/modules/vfs_snapper.c   | 33 +++--
 source3/modules/vfs_time_audit.c|  8 +---
 source3/modules/vfs_unityed_media.c | 21 -
 source3/smbd/dir.c  |  2 +-
 source3/smbd/file_access.c  | 12 +++-
 source3/smbd/open.c | 27 +++
 source3/smbd/posix_acls.c   | 15 ++-
 source3/smbd/pysmbd.c   | 18 --
 source3/smbd/vfs.c  |  8 ++--
 source3/torture/cmd_vfs.c   | 12 +++-
 21 files changed, 235 insertions(+), 64 deletions(-)


Changeset truncated at 500 lines:

diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index a4309d4..0d5571c 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -667,7 +667,8 @@ static NTSTATUS skel_fget_nt_acl(vfs_handle_struct *handle, 
files_struct *fsp,
 }
 
 static NTSTATUS skel_get_nt_acl(vfs_handle_struct *handle,
-   const char *name, uint32_t security_info,
+   const struct smb_filename *smb_fname,
+   uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
 {
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index 2d1ed79..fc3c818 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -794,12 +794,16 @@ static NTSTATUS skel_fget_nt_acl(vfs_handle_struct 
*handle, files_struct *fsp,
 }
 
 static NTSTATUS skel_get_nt_acl(vfs_handle_struct *handle,
-   const char *name, uint32_t security_info,
+   const struct smb_filename *smb_fname,
+   uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
 {
-   return SMB_VFS_NEXT_GET_NT_ACL(handle, name, security_info, mem_ctx,
-  ppdesc);
+   return SMB_VFS_NEXT_GET_NT_ACL(handle,
+   smb_fname,
+   security_info,
+   mem_ctx,
+   ppdesc);
 }
 
 static NTSTATUS skel_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index c18ea59..d416a5b 100644
--- a/source3/include/vfs.h
+++ 

[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
   via  3330c79 tdb: eliminate deprecation warnings in python tests
   via  7b3fb85 ctdb: Fix CID 1353175 Logically dead code
   via  e23ab7d ctdb: Fix CID 1353176 Logically dead code
  from  d3be72a idmap_ad: Fix a copy error

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


- Log -
commit 3330c79324fe8316a2d122d3f2bf47c4e2c75c0c
Author: Michael Adam 
Date:   Mon Feb 15 11:33:10 2016 +0100

tdb: eliminate deprecation warnings in python tests

assertEquals() is superseded by assertEqual()

Signed-off-by: Michael Adam 
Reviewed-by: Stefan Metzmacher 

Autobuild-User(master): Michael Adam 
Autobuild-Date(master): Tue Feb 16 19:58:39 CET 2016 on sn-devel-144

commit 7b3fb853a42ae02aae7420b09d21aad727284bbe
Author: Volker Lendecke 
Date:   Tue Feb 16 11:20:56 2016 +0100

ctdb: Fix CID 1353175 Logically dead code

Signed-off-by: Volker Lendecke 
Reviewed-by: Martin Schwenke 
Reviewed-by: Michael Adam 

commit e23ab7d40801c3121c7df98f6ea4cdc9a5e0bd89
Author: Volker Lendecke 
Date:   Tue Feb 16 11:18:40 2016 +0100

ctdb: Fix CID 1353176 Logically dead code

Signed-off-by: Volker Lendecke 
Reviewed-by: Martin Schwenke 
Reviewed-by: Michael Adam 

---

Summary of changes:
 ctdb/server/ctdb_takeover.c|  5 ++--
 ctdb/server/ipalloc_common.c   |  7 +++---
 lib/tdb/python/tests/simple.py | 52 +-
 3 files changed, 32 insertions(+), 32 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index cdb4601..62af1e6 100644
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -1340,17 +1340,18 @@ create_merged_ip_list(struct ctdb_context *ctdb, struct 
ipalloc_state *ipalloc_s
ctdb->ip_tree = trbt_create(ctdb, 0);
 
for (i=0; i < ctdb->num_nodes; i++) {
-   public_ips = _state->known_public_ips[i];
 
if (ctdb->nodes[i]->flags & NODE_FLAGS_DELETED) {
continue;
}
 
/* there were no public ips for this node */
-   if (public_ips == NULL) {
+   if (ipalloc_state->known_public_ips == NULL) {
continue;
}
 
+   public_ips = _state->known_public_ips[i];
+
for (j=0; j < public_ips->num; j++) {
struct public_ip_list *tmp_ip;
 
diff --git a/ctdb/server/ipalloc_common.c b/ctdb/server/ipalloc_common.c
index c84359b..95d5ecf 100644
--- a/ctdb/server/ipalloc_common.c
+++ b/ctdb/server/ipalloc_common.c
@@ -65,13 +65,12 @@ static bool can_node_host_ip(struct ipalloc_state 
*ipalloc_state,
if (ipalloc_state->noiphost[pnn]) {
return false;
}
-
-   public_ips = _state->available_public_ips[pnn];
-
-   if (public_ips == NULL) {
+   if (ipalloc_state->available_public_ips == NULL) {
return false;
}
 
+   public_ips = _state->available_public_ips[pnn];
+
for (i=0; inum; i++) {
if (ctdb_same_ip(>addr, _ips->ip[i].addr)) {
/* yes, this node can serve this public ip */
diff --git a/lib/tdb/python/tests/simple.py b/lib/tdb/python/tests/simple.py
index b3136dd..1518078 100644
--- a/lib/tdb/python/tests/simple.py
+++ b/lib/tdb/python/tests/simple.py
@@ -43,7 +43,7 @@ class InternalTdbTests(TestCase):
 self.tdb = tdb.Tdb()
 
 # repr used to crash on internal db
-self.assertEquals(repr(self.tdb), "Tdb()")
+self.assertEqual(repr(self.tdb), "Tdb()")
 
 
 class CommonTdbTests(TestCase):
@@ -111,12 +111,12 @@ class SimpleTdbTests(TestCase):
 
 def test_store(self):
 self.tdb.store(b"bar", b"bla")
-self.assertEquals(b"bla", self.tdb.get(b"bar"))
+self.assertEqual(b"bla", self.tdb.get(b"bar"))
 
 def test_getitem(self):
 self.tdb[b"bar"] = b"foo"
 self.tdb.reopen()
-self.assertEquals(b"foo", self.tdb[b"bar"])
+self.assertEqual(b"foo", self.tdb[b"bar"])
 
 def test_delete(self):
 self.tdb[b"bar"] = b"foo"
@@ -139,21 +139,21 @@ class SimpleTdbTests(TestCase):
 self.tdb[b"brainslug"] = b"2"
 l = list(self.tdb)
 l.sort()
-self.assertEquals([b"bla", b"brainslug"], l)
+self.assertEqual([b"bla", b"brainslug"], l)
 
 def test_transaction_cancel(self):
 self.tdb[b"bloe"] = b"2"
 self.tdb.transaction_start()
 self.tdb[b"bloe"] = b"1"
 self.tdb.transaction_cancel()
-

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

[autobuild]

The autobuild test system (on sn-devel-104) 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-104/2016-02-16-1655/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-104/2016-02-16-1655/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-104/2016-02-16-1655/samba.stdout
  
The top commit at the time of the failure was:

commit d3be72a5e3ce45616e152f708288e9092624f878
Author: Volker Lendecke 
Date:   Mon Feb 8 10:30:43 2016 +0100

idmap_ad: Fix a copy error

Signed-off-by: Volker Lendecke 
Reviewed-by: Andreas Schneider 

Autobuild-User(master): Volker Lendecke 
Autobuild-Date(master): Tue Feb 16 14:14:21 CET 2016 on sn-devel-144

[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
   via  d3be72a idmap_ad: Fix a copy error
   via  58de339 credentials: Fix a typo
   via  2c73ed8 credentials: Fix whitespace
   via  db64deb winbind: Fix a type error
   via  ad82251 winbind: Add some const
  from  d9e3358 build: Fix cluster-support option, default was 'None' now 
'False'

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


- Log -
commit d3be72a5e3ce45616e152f708288e9092624f878
Author: Volker Lendecke 
Date:   Mon Feb 8 10:30:43 2016 +0100

idmap_ad: Fix a copy error

Signed-off-by: Volker Lendecke 
Reviewed-by: Andreas Schneider 

Autobuild-User(master): Volker Lendecke 
Autobuild-Date(master): Tue Feb 16 14:14:21 CET 2016 on sn-devel-144

commit 58de339247f843672cabb94845f8d79dd841a69e
Author: Volker Lendecke 
Date:   Sun Feb 7 16:22:59 2016 +0100

credentials: Fix a typo

Signed-off-by: Volker Lendecke 
Reviewed-by: Andreas Schneider 

commit 2c73ed8c69499732a4559fa0c5829bd661d15278
Author: Volker Lendecke 
Date:   Sun Feb 7 16:22:05 2016 +0100

credentials: Fix whitespace

Signed-off-by: Volker Lendecke 
Reviewed-by: Andreas Schneider 

commit db64deb6819b814ffb49901aa00ef8fb7e480787
Author: Volker Lendecke 
Date:   Tue Feb 2 14:41:16 2016 +0100

winbind: Fix a type error

nss_info_methods has "get_nss_info"'s p_gid parameter as
gid_t *, not uint32_t *. Probably that did not hurt due to
typedefs, but if we find a platform where gid_t is not
uint32_t, this would be VERY hard to debug

Signed-off-by: Volker Lendecke 
Reviewed-by: Andreas Schneider 

commit ad82251c23ba89e391d25d3bf0f2a38925f62b20
Author: Volker Lendecke 
Date:   Tue Feb 2 14:21:32 2016 +0100

winbind: Add some const

This makes source and destination a bit clearer to me

Signed-off-by: Volker Lendecke 
Reviewed-by: Andreas Schneider 

---

Summary of changes:
 auth/credentials/credentials_secrets.c | 59 +-
 source3/winbindd/idmap_ad.c| 20 +---
 source3/winbindd/wb_fill_pwent.c   |  4 +--
 source3/winbindd/winbindd_proto.h  |  2 +-
 4 files changed, 47 insertions(+), 38 deletions(-)


Changeset truncated at 500 lines:

diff --git a/auth/credentials/credentials_secrets.c 
b/auth/credentials/credentials_secrets.c
index 784e345..d5a37cf 100644
--- a/auth/credentials/credentials_secrets.c
+++ b/auth/credentials/credentials_secrets.c
@@ -1,4 +1,4 @@
-/* 
+/*
Unix SMB/CIFS implementation.
 
User credentials handling (as regards on-disk files)
@@ -6,17 +6,17 @@
Copyright (C) Jelmer Vernooij 2005
Copyright (C) Tim Potter 2001
Copyright (C) Andrew Bartlett  2005
-   
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-   
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.
-   
+
You should have received a copy of the GNU General Public License
along with this program.  If not, see .
 */
@@ -43,24 +43,24 @@
 
 /**
  * Fill in credentials for the machine trust account, from the secrets 
database.
- * 
+ *
  * @param cred Credentials structure to fill in
  * @retval NTSTATUS error detailing any failure
  */
-static NTSTATUS cli_credentials_set_secrets_lct(struct cli_credentials *cred, 
+static NTSTATUS cli_credentials_set_secrets_lct(struct cli_credentials *cred,
struct loadparm_context *lp_ctx,
struct ldb_context *ldb,
const char *base,
-   const char *filter, 
+   const char *filter,
time_t 
secrets_tdb_last_change_time,
const char 
*secrets_tdb_password,
char **error_string)
 {
TALLOC_CTX *mem_ctx;
-   
+
int ldb_ret;
struct ldb_message *msg;
-   
+
const char *machine_account;
const char *password;
const 

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

[autobuild]

The autobuild test system (on sn-devel-104) 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-104/2016-02-16-1310/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-104/2016-02-16-1310/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-104/2016-02-16-1310/samba.stdout
  
The top commit at the time of the failure was:

commit d9e335872a4072dd2db05a8bdbfa30ceedecdfcf
Author: Noel Power 
Date:   Thu Feb 11 16:02:24 2016 +

build: Fix cluster-support option, default was 'None' now 'False'

Cluster-support had some auto-detection but no longer does.

Prior to commit id(s) e67c4b977a52d1744f4da8296bbcd7c213cbe92a &
69c0c43d55c93b82b2e398d5c61009fd347170bf cluster support was auto
detected

Signed-off-by: Noel Power 
Reviewed-by: Martin Schwenke 
Reviewed-by: Uri Simchoni 
Reviewed-by: Amitay Isaacs 

Autobuild-User(master): Amitay Isaacs 
Autobuild-Date(master): Tue Feb 16 04:03:14 CET 2016 on sn-devel-144

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

[Karolin Seeger]

The branch, v4-4-test has been updated
   via  3a4be07 ctdb-scripts: Drop use of "smbcontrol winbindd ip-dropped 
..."
   via  4f637ba lib/tsocket: workaround sockets not supporting FIONREAD
   via  6774af1 param: Fix str_list_v3 to accept ; again
   via  b65697f lib:socket: fix CID 1350009 - illegal memory accesses 
(BUFFER_SIZE_WARNING)
   via  08b1ff8 s3:utils/smbget set default blocksize
   via  5ca7624 s3:utils/smbget add a error message on allocation error
   via  558663a lib/socket: Fix improper use of default interface speed
   via  903b13e loadparm: Fix memory leak issue.
   via  2c91eb7 Revert "ctdb-daemon: Check packet generation against 
database generation"
   via  f3bca17 s3: smbd: posix_acls: Fix check for setting u:g:o entry on 
a filesystem with no ACL support.
   via  0221677 s3:smbd:open: Skip redundant call to file_set_dosmode when 
creating a new file.
   via  c358f3c smbd: Fix CID 1351216 Dereference null return value
   via  ed8a55f smbd: Fix CID 1351215 Improper use of negative value
   via  6c2a3e2 lib:socket: fix CID 1350010 - integer OVERFLOW_BEFORE_WIDEN
  from  0a0276b VERSION: Bump version up to 4.4.0rc3...

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


- Log -
commit 3a4be07364acf90913c49e58c5ee876d06923c2a
Author: Martin Schwenke 
Date:   Mon Feb 8 15:55:17 2016 +1100

ctdb-scripts: Drop use of "smbcontrol winbindd ip-dropped ..."

This is unnecessary in Samba >= 4.0 because winbindd monitors IP
address itself and no longer needs to be told when they are dropped.
The smbcontrol commands can hang if a node has recovery mode active
because smbcontrol is unable to connect to the registry.  Therefore,
the smbcontrol commands should be removed.

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

Signed-off-by: Martin Schwenke 
Reviewed-by: Ralph Boehme 

Autobuild-User(master): Ralph Böhme 
Autobuild-Date(master): Wed Feb 10 14:08:17 CET 2016 on sn-devel-144

(cherry picked from commit 519564bb35a0f840bc4d7c8c5a92441c97b49791)

Autobuild-User(v4-4-test): Karolin Seeger 
Autobuild-Date(v4-4-test): Tue Feb 16 12:54:57 CET 2016 on sn-devel-144

commit 4f637ba7df5754130739c98aafd8bc6eb8e5b1c0
Author: Ralph Boehme 
Date:   Thu Feb 4 15:35:06 2016 +0100

lib/tsocket: workaround sockets not supporting FIONREAD

Netlink sockets don't support querying pending bytes with ioctl(fd,
FIONREAD, ...) and would return EOPNOTSUPP, so use recvmsg() with
MSG_PEEK|MSG_TRUNC as a fallback.

The MSG_TRUNC flag to recvmsg() is Linux only, but netlink is as well,
so we're safe for now.

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

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

Autobuild-User(master): Ralph Böhme 
Autobuild-Date(master): Wed Feb 10 10:30:24 CET 2016 on sn-devel-144

(cherry picked from commit 574313a1e11d521ba3f7232ff0b4186b49658199)

commit 6774af16ea9b9fecb797a6fae2668b589ee22dc2
Author: Volker Lendecke 
Date:   Thu Feb 11 13:11:46 2016 +0100

param: Fix str_list_v3 to accept ; again

Signed-off-by: Volker Lendecke 
Reviewed-by: Andreas Schneider 

Autobuild-User(master): Volker Lendecke 
Autobuild-Date(master): Thu Feb 11 19:19:55 CET 2016 on sn-devel-144
https://bugzilla.samba.org/show_bug.cgi?id=11732

commit b65697fd937a5d5765349aad65d2d60b04e33191
Author: Michael Adam 
Date:   Wed Feb 3 11:41:23 2016 +0100

lib:socket: fix CID 1350009 - illegal memory accesses (BUFFER_SIZE_WARNING)

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

Pair-Programmed-With: Guenther Deschner 

Signed-off-by: Michael Adam 
Signed-off-by: Guenther Deschner 
Reviewed-by: Uri Simchoni 
(cherry picked from commit 8b36428b195f6e1d1063f1abccb718f2665d271f)

commit 08b1ff8d8c7bbee8d7c8cd2ac8ac8dceac87b95d
Author: Christian Ambach 
Date:   Thu Feb 4 21:39:47 2016 +0100

s3:utils/smbget set default blocksize

this got lost in the recent refactorings and causes problems
when smbget attempts to use a zero byte read buffer

Signed-off-by: Christian Ambach 
Reviewed-by: Volker Lendecke 

Autobuild-User(master): Volker Lendecke 
Autobuild-Date(master): Fri Feb  5 12:10:16 CET 2016 on sn-devel-144

(cherry picked from commit da2aae933e3964aafce05c74755244e0f2b4d982)

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

[Karolin Seeger]

The branch, v4-3-test has been updated
   via  6c6599c ctdb-scripts: Drop use of "smbcontrol winbindd ip-dropped 
..."
   via  f8618dc lib/tsocket: workaround sockets not supporting FIONREAD
  from  6c1a5f0 param: Fix str_list_v3 to accept ; again

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


- Log -
commit 6c6599cf1ce45e0582e01b206c99e0b143bbfdc4
Author: Martin Schwenke 
Date:   Mon Feb 8 15:55:17 2016 +1100

ctdb-scripts: Drop use of "smbcontrol winbindd ip-dropped ..."

This is unnecessary in Samba >= 4.0 because winbindd monitors IP
address itself and no longer needs to be told when they are dropped.
The smbcontrol commands can hang if a node has recovery mode active
because smbcontrol is unable to connect to the registry.  Therefore,
the smbcontrol commands should be removed.

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

Signed-off-by: Martin Schwenke 
Reviewed-by: Ralph Boehme 

Autobuild-User(master): Ralph Böhme 
Autobuild-Date(master): Wed Feb 10 14:08:17 CET 2016 on sn-devel-144

(cherry picked from commit 519564bb35a0f840bc4d7c8c5a92441c97b49791)

Autobuild-User(v4-3-test): Karolin Seeger 
Autobuild-Date(v4-3-test): Tue Feb 16 12:13:06 CET 2016 on sn-devel-104

commit f8618dc2d6014bd710883ff195915c89f1959054
Author: Ralph Boehme 
Date:   Thu Feb 4 15:35:06 2016 +0100

lib/tsocket: workaround sockets not supporting FIONREAD

Netlink sockets don't support querying pending bytes with ioctl(fd,
FIONREAD, ...) and would return EOPNOTSUPP, so use recvmsg() with
MSG_PEEK|MSG_TRUNC as a fallback.

The MSG_TRUNC flag to recvmsg() is Linux only, but netlink is as well,
so we're safe for now.

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

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

Autobuild-User(master): Ralph Böhme 
Autobuild-Date(master): Wed Feb 10 10:30:24 CET 2016 on sn-devel-144

(cherry picked from commit 574313a1e11d521ba3f7232ff0b4186b49658199)

---

Summary of changes:
 ctdb/config/events.d/11.natgw   |  4 ---
 ctdb/config/events.d/49.winbind |  7 -
 lib/tsocket/tsocket_bsd.c   | 62 -
 3 files changed, 61 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/config/events.d/11.natgw b/ctdb/config/events.d/11.natgw
index 54e6cd9..29339f4 100755
--- a/ctdb/config/events.d/11.natgw
+++ b/ctdb/config/events.d/11.natgw
@@ -149,10 +149,6 @@ natgw_set_slave ()
_net="${_net_gw%@*}"
ip route add "$_net" via "$_natgwip" metric 10
 done
-
-# Make sure winbindd does not stay bound to this address if we are
-# no longer NATGW master
-smbcontrol winbindd ip-dropped $CTDB_NATGW_PUBLIC_IP >/dev/null 2>&1
 }
 
 natgw_ensure_master ()
diff --git a/ctdb/config/events.d/49.winbind b/ctdb/config/events.d/49.winbind
index dee3c90..a1ea787 100755
--- a/ctdb/config/events.d/49.winbind
+++ b/ctdb/config/events.d/49.winbind
@@ -55,13 +55,6 @@ case "$1" in
ctdb_check_command wbinfo -p
;;
 
- takeip|releaseip)
-   iface=$2
-   ip=$3
-   maskbits=$4
-
-   smbcontrol winbindd ip-dropped $ip >/dev/null 2>/dev/null
-   ;;
 *)
ctdb_standard_event_handler "$@"
;;
diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c
index 8203755..0756fb3 100644
--- a/lib/tsocket/tsocket_bsd.c
+++ b/lib/tsocket/tsocket_bsd.c
@@ -132,6 +132,43 @@ static int tsocket_bsd_common_prepare_fd(int fd, bool 
high_fd)
return -1;
 }
 
+#ifdef HAVE_LINUX_RTNETLINK_H
+/**
+ * Get the amount of pending bytes from a netlink socket
+ *
+ * For some reason netlink sockets don't support querying the amount of pending
+ * data via ioctl with FIONREAD, which is what we use in tsocket_bsd_pending()
+ * below.
+ *
+ * We know we are on Linux as we're using netlink, which means we have a 
working
+ * MSG_TRUNC flag to recvmsg() as well, so we use that together with MSG_PEEK.
+ **/
+static ssize_t tsocket_bsd_netlink_pending(int fd)
+{
+   struct iovec iov;
+   struct msghdr msg;
+   char buf[1];
+
+   iov = (struct iovec) {
+   .iov_base = buf,
+   .iov_len = sizeof(buf)
+   };
+
+   msg = (struct msghdr) {
+   .msg_iov = ,
+   .msg_iovlen = 1
+   };
+
+   return recvmsg(fd, , MSG_PEEK | MSG_TRUNC);
+}
+#else
+static ssize_t tsocket_bsd_netlink_pending(int fd)
+{
+   errno = ENOSYS;
+   return -1;
+}
+#endif
+
 static ssize_t tsocket_bsd_pending(int 

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

[Karolin Seeger]

The branch, v4-2-test has been updated
   via  cb0d8e1 ctdb-scripts: Drop use of "smbcontrol winbindd ip-dropped 
..."
   via  d0ba284 lib/tsocket: workaround sockets not supporting FIONREAD
   via  7f8cbd8 param: Fix str_list_v3 to accept ; again
   via  6ff4dd7 loadparm: Fix memory leak issue.
   via  bf29f7d s3: smbd: posix_acls: Fix check for setting u:g:o entry on 
a filesystem with no ACL support.
   via  bd140e6 s3:smbd:open: Skip redundant call to file_set_dosmode when 
creating a new file.
  from  3435f30 docs-xml: fix typo in smbspool_krb5_wrapper manpage.

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


- Log -
commit cb0d8e16c48e036a32944bd4b64069b91b607a47
Author: Martin Schwenke 
Date:   Mon Feb 8 15:55:17 2016 +1100

ctdb-scripts: Drop use of "smbcontrol winbindd ip-dropped ..."

This is unnecessary in Samba >= 4.0 because winbindd monitors IP
address itself and no longer needs to be told when they are dropped.
The smbcontrol commands can hang if a node has recovery mode active
because smbcontrol is unable to connect to the registry.  Therefore,
the smbcontrol commands should be removed.

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

Signed-off-by: Martin Schwenke 
Reviewed-by: Ralph Boehme 

Autobuild-User(master): Ralph Böhme 
Autobuild-Date(master): Wed Feb 10 14:08:17 CET 2016 on sn-devel-144

(cherry picked from commit 519564bb35a0f840bc4d7c8c5a92441c97b49791)

Autobuild-User(v4-2-test): Karolin Seeger 
Autobuild-Date(v4-2-test): Tue Feb 16 11:32:47 CET 2016 on sn-devel-104

commit d0ba284ccbfd054108e9ea8d64a65f467619c6d7
Author: Ralph Boehme 
Date:   Thu Feb 4 15:35:06 2016 +0100

lib/tsocket: workaround sockets not supporting FIONREAD

Netlink sockets don't support querying pending bytes with ioctl(fd,
FIONREAD, ...) and would return EOPNOTSUPP, so use recvmsg() with
MSG_PEEK|MSG_TRUNC as a fallback.

The MSG_TRUNC flag to recvmsg() is Linux only, but netlink is as well,
so we're safe for now.

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

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

Autobuild-User(master): Ralph Böhme 
Autobuild-Date(master): Wed Feb 10 10:30:24 CET 2016 on sn-devel-144

(cherry picked from commit 574313a1e11d521ba3f7232ff0b4186b49658199)

commit 7f8cbd8fe42b0785355cfaef4069ad469b02dd77
Author: Volker Lendecke 
Date:   Thu Feb 11 13:11:46 2016 +0100

param: Fix str_list_v3 to accept ; again

Signed-off-by: Volker Lendecke 
Reviewed-by: Andreas Schneider 

Autobuild-User(master): Volker Lendecke 
Autobuild-Date(master): Thu Feb 11 19:19:55 CET 2016 on sn-devel-144
https://bugzilla.samba.org/show_bug.cgi?id=11732

commit 6ff4dd74452da86ff230dd9b41bcb6b6e55318b2
Author: Hemanth Thummala 
Date:   Tue Feb 2 10:33:20 2016 -0800

loadparm: Fix memory leak issue.

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

Signed-off-by: Hemanth Thummala 
Reviewed-by: Alexander Bokovoy 
Reviewed-by: Andreas Schneider 

Autobuild-User(master): Andreas Schneider 
Autobuild-Date(master): Thu Feb  4 12:39:14 CET 2016 on sn-devel-144

(cherry picked from commit 8247d93701ed838190fe74044a63a56d63d37bf5)

commit bf29f7d67a47e64d9c9212135e59081c748a8f4e
Author: Jeremy Allison 
Date:   Tue Feb 9 12:47:43 2016 -0800

s3: smbd: posix_acls: Fix check for setting u:g:o entry on a filesystem 
with no ACL support.

Since 4.0.x we add 2 additional ACE entries, one SMB_ACL_USER
and SMB_ACL_GROUP to match the existing SMB_ACL_USER_OBJ and
SMB_ACL_GROUP_OBJ entries. The two additional entries break
the simple "must have 3 entries" check done inside 
convert_canon_ace_to_posix_perms().
Replace this with a more complete test.

Problem and initial fix provided by 

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

Signed-off-by: Jeremy Allison 
Reviewed-by: Uri Simchoni 

Autobuild-User(master): Uri Simchoni 
Autobuild-Date(master): Thu Feb 11 11:14:53 CET 2016 on sn-devel-144

(cherry picked from commit 5172bf0c5b0672c1479c2ad776460956aa469bca)

commit bd140e69e4990858842df76b0ca42dc87a602666
Author: Jose A. Rivera 
Date:   Wed Feb 3 20:58:19 2016 -0600

s3:smbd:open: Skip