[SCM] Samba Shared Repository - branch v3-6-test updated

Karolin Seeger kseeger at samba.org
Mon Jan 28 12:07:56 MST 2013


The branch, v3-6-test has been updated
       via  035be05 Fix bug #9586 - smbd[29175]: disk_free: sys_popen() failed" message logged in /var/log/message many times.
      from  fb0868e Fix bug #9571 - Unlink after open causes smbd to panic.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 035be05db96b0544434febc33349adb910dba78e
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jan 23 14:39:09 2013 -0800

    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 at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Thu Jan 24 10:45:48 CET 2013 on sn-devel-104
    (cherry picked from commit 497febfe36354c4aff3696cd32c6c7e8fee55af8)

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/util_file.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

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"));


-- 
Samba Shared Repository


More information about the samba-cvs mailing list