diff options
author | Volker Lendecke <vl@samba.org> | 2013-10-15 08:23:10 +0000 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2013-11-28 10:13:42 +0100 |
commit | 47bd5f0d7b677e9806770b3ba4dc162923c8f073 (patch) | |
tree | a2d3b56ee2529bc35b518893bc2a78297318a728 | |
parent | 81ce51dd4f3d657ab3b4f6295db6efe6c9315d88 (diff) | |
download | samba-47bd5f0d7b677e9806770b3ba4dc162923c8f073.tar.gz |
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 <vl@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit c6909887c26d4e827633acd50b11cf08c6aee0f7)
Signed-off-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 3dfbea723553b268008063b280c808bb30951fdc)
-rw-r--r-- | nsswitch/wb_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nsswitch/wb_common.c b/nsswitch/wb_common.c index dcfc8a51568..3ba2bb5b2b0 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 */ |