Attachment 8473 Details for Bug 9586 – git-am fix for 4.0.x and 2.6.x

[patch] git-am fix for 4.0.x and 2.6.x

0001-Fix-bug-9586-smbd-29175-disk_free-sys_popen-failed-m.patch (text/plain), 979 bytes, created by Jeremy Allison on 2013-01-23 22:40:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2013-01-23 22:40:39 UTC

Size: 979 bytes

patch

obsolete

>From 1bc2a95eb4e4ddacf1e298b8de9f87d15889168a Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Wed, 23 Jan 2013 14:39:09 -0800
>Subject: [PATCH] Fix bug #9586 - smbd[29175]: disk_free: sys_popen() failed"
> message logged in /var/log/message many times.
>
>Ensure when reading lines from an interruptible
>pipe source we ignore EINTR.
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>---
> source3/lib/util_file.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/source3/lib/util_file.c b/source3/lib/util_file.c
>index 50ff844..8319f04 100644
>--- a/source3/lib/util_file.c
>+++ b/source3/lib/util_file.c
>@@ -38,7 +38,7 @@ static char *file_pload(const char *syscmd, size_t *size)
> 	p = NULL;
> 	total = 0;
> 
>-	while ((n = read(fd, buf, sizeof(buf))) > 0) {
>+	while ((n = sys_read(fd, buf, sizeof(buf))) > 0) {
> 		p = talloc_realloc(NULL, p, char, total + n + 1);
> 		if (!p) {
> 		        DEBUG(0,("file_pload: failed to expand buffer!\n"));
>-- 
>1.8.1
>

Flags:

metze: review+
vl: review+
jra: review? (ddiss)

Actions: View

Attachments on bug 9586: 8473