The branch, v4-6-test has been updated
via 63b9e1c messaging: Fix dead but not cleaned-up-yet destination
sockets
via 65313eb s3:winbindd: talloc_steal the extra_data in
winbindd_list_users_recv()
from bbe371e ctdb-tests: Do not attempt to unregister the join handler
multiple times
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-6-test
- Log -----------------------------------------------------------------
commit 63b9e1c7489fff3f7d26d4b2909cd676929398e3
Author: Volker Lendecke <v...@samba.org>
Date: Tue Jan 10 12:30:54 2017 +0000
messaging: Fix dead but not cleaned-up-yet destination sockets
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12509
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
Autobuild-User(master): Stefan Metzmacher <me...@samba.org>
Autobuild-Date(master): Tue Jan 10 17:40:58 CET 2017 on sn-devel-144
(cherry picked from commit e84e44ce923e5dc7529bb813e10a2890528a4ab0)
Autobuild-User(v4-6-test): Stefan Metzmacher <me...@samba.org>
Autobuild-Date(v4-6-test): Sat Jan 14 14:14:26 CET 2017 on sn-devel-144
commit 65313ebfbbf43cd684cf5e1c8cbde7a58a991b19
Author: Stefan Metzmacher <me...@samba.org>
Date: Tue Jan 10 09:48:33 2017 +0100
s3:winbindd: talloc_steal the extra_data in winbindd_list_users_recv()
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12501
Pair-Programmed-With: Andreas Schneider <a...@samba.org>
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Signed-off-by: Andreas Schneider <a...@samba.org>
(cherry picked from commit dde30ab89c276474d19b584c6def6f25ed5cc678)
-----------------------------------------------------------------------
Summary of changes:
source3/lib/messages.c | 11 +++++++++++
source3/winbindd/winbindd_list_users.c | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 505eb66..533e869 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -626,6 +626,17 @@ int messaging_send_iov_from(struct messaging_context
*msg_ctx,
unbecome_root();
}
+ if (ret == ECONNREFUSED) {
+ /*
+ * Linux returns this when a socket exists in the file
+ * system without a listening process. This is not
+ * documented in susv4 or the linux manpages, but it's
+ * easily testable. For the higher levels this is the
+ * same as "destination does not exist"
+ */
+ ret = ENOENT;
+ }
+
return ret;
}
diff --git a/source3/winbindd/winbindd_list_users.c
b/source3/winbindd/winbindd_list_users.c
index 4a4343e..9a751a7 100644
--- a/source3/winbindd/winbindd_list_users.c
+++ b/source3/winbindd/winbindd_list_users.c
@@ -174,7 +174,7 @@ NTSTATUS winbindd_list_users_recv(struct tevent_req *req,
len = talloc_get_size(result);
- response->extra_data.data = result;
+ response->extra_data.data = talloc_steal(response, result);
response->length += len;
response->data.num_entries = 0;
--
Samba Shared Repository
