From 661f73beeb8cc61c24e1d53003d310e835c48a45 Mon Sep 17 00:00:00 2001 From: Michael Meffie Date: Thu, 12 Mar 2015 18:12:06 -0400 Subject: [PATCH] util: fix server log fd validity checks Do not assume the server log file descriptor cannot be zero. Thanks to Chas Williams for spotting this bug. Change-Id: I0d264828926bf8cd765b45db4e529233b8686404 Reviewed-on: https://gerrit.openafs.org/11797 Reviewed-by: Benjamin Kaduk Tested-by: BuildBot --- src/util/serverLog.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/serverLog.c b/src/util/serverLog.c index 0f203b2..fb4862f 100644 --- a/src/util/serverLog.c +++ b/src/util/serverLog.c @@ -86,7 +86,7 @@ void WriteLogBuffer(char *buf, afs_uint32 len) { LOCK_SERVERLOG(); - if (serverLogFD > 0) { + if (serverLogFD >= 0) { if (write(serverLogFD, buf, len) < 0) ; /* don't care */ } @@ -132,7 +132,7 @@ vFSLog(const char *format, va_list args) syslog(LOG_INFO, "%s", info); } else #endif - if (serverLogFD > 0) { + if (serverLogFD >= 0) { if (write(serverLogFD, tbuffer, len) < 0) ; /* don't care */ } @@ -420,10 +420,10 @@ ReOpenLog(const char *fileName) #endif LOCK_SERVERLOG(); - if (serverLogFD > 0) + if (serverLogFD >= 0) close(serverLogFD); serverLogFD = open(fileName, O_WRONLY | O_APPEND | O_CREAT | (isfifo?O_NONBLOCK:0), 0666); - if (serverLogFD > 0) { + if (serverLogFD >= 0) { if (freopen(fileName, "a", stdout) == NULL) ; /* don't care */ if (freopen(fileName, "a", stderr) != NULL) { -- 1.9.4