summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2013-01-23 14:39:09 -0800
committerVolker Lendecke <vl@samba.org>2013-01-24 10:45:48 +0100
commit497febfe36354c4aff3696cd32c6c7e8fee55af8 (patch)
treeab25fe4780f4abfd73db24ef45a8d7eff04aca01
parent1915b17d09485b9491caf3410b0c5186f6c2c616 (diff)
downloadsamba-497febfe36354c4aff3696cd32c6c7e8fee55af8.tar.gz
samba-497febfe36354c4aff3696cd32c6c7e8fee55af8.tar.bz2
samba-497febfe36354c4aff3696cd32c6c7e8fee55af8.zip
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> Reviewed-by: Volker Lendecke <vl@samba.org> Autobuild-User(master): Volker Lendecke <vl@samba.org> Autobuild-Date(master): Thu Jan 24 10:45:48 CET 2013 on sn-devel-104
-rw-r--r--source3/lib/util_file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/util_file.c b/source3/lib/util_file.c
index 50ff844762..8319f04a09 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"));