The branch, v3-6-test has been updated
via 3dfbea7 nsswitch: Fix short writes in winbind_write_sock
from 80a5575 s3-winbind: Send online/offline message of the domain to
the parent.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 3dfbea723553b268008063b280c808bb30951fdc
Author: Volker Lendecke <v...@samba.org>
Date: Tue Oct 15 08:23:10 2013 +0000
nsswitch: Fix short writes in winbind_write_sock
We set the socket to nonblocking and don't handle EAGAIN right. We do
a poll anyway, so wait for writability, which should fix this.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10195
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Andreas Schneider <a...@samba.org>
(cherry picked from commit c6909887c26d4e827633acd50b11cf08c6aee0f7)
Signed-off-by: Andreas Schneider <a...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
nsswitch/wb_common.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/wb_common.c b/nsswitch/wb_common.c
index dcfc8a5..3ba2bb5 100644
--- a/nsswitch/wb_common.c
+++ b/nsswitch/wb_common.c
@@ -392,9 +392,9 @@ static int winbind_write_sock(void *buffer, int count, int
recursing,
call would not block by calling poll(). */
pfd.fd = winbindd_fd;
- pfd.events = POLLIN|POLLHUP;
+ pfd.events = POLLIN|POLLOUT|POLLHUP;
- ret = poll(&pfd, 1, 0);
+ ret = poll(&pfd, 1, -1);
if (ret == -1) {
winbind_close_sock();
return -1; /* poll error */
--
Samba Shared Repository
