Attachment 9310 Details for Bug 10195 – v4-0-test patch

[patch] v4-0-test patch

0001-nsswitch-Fix-short-writes-in-winbind_write_sock.patch (text/plain), 1.20 KB, created by Andreas Schneider on 2013-10-22 08:42:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2013-10-22 08:42:07 UTC

Size: 1.20 KB

patch

obsolete

>From 3ae183b271510c113abc0bf7a2b7cb9857d9efa4 Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Tue, 15 Oct 2013 08:23:10 +0000
>Subject: [PATCH] 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>
>---
> nsswitch/wb_common.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/nsswitch/wb_common.c b/nsswitch/wb_common.c
>index c56a76f..5fde8d0 100644
>--- a/nsswitch/wb_common.c
>+++ b/nsswitch/wb_common.c
>@@ -395,9 +395,9 @@ static int winbind_write_sock(void *buffer, int count, int recursing,
> 		   call would not block by calling poll(). */
> 
> 		pfd.fd = 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 */
>-- 
>1.8.4
>

Flags:

vl: review+

Actions: View

Attachments on bug 10195: 9289 | 9309 | 9310 | 9311