From e09f3227872481af1a7bafe50d71a60f47292ac2 Mon Sep 17 00:00:00 2001
From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sat, 14 May 2011 01:39:11 +0200
Subject: [PATCH] accesslog: Fixed up stdout logging and related FD_CLOEXEC
 usage.

---
 src/accesslog.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/accesslog.c b/src/accesslog.c
index 02e5f1a..3a978e0 100644
--- a/src/accesslog.c
+++ b/src/accesslog.c
@@ -255,6 +255,7 @@ static void reopenlog(void)
 	flog(LOG_WARNING, "accesslog: could not reopen log file `%s' on SIGHUP: %s", outname, strerror(errno));
 	return;
     }
+    fcntl(fileno(new), F_SETFD, FD_CLOEXEC);
     if(locklog) {
 	if(lockfile(new)) {
 	    if((errno == EAGAIN) || (errno == EACCES)) {
@@ -326,11 +327,13 @@ int main(int argc, char **argv)
 	outname = argv[optind];
     if(outname == NULL) {
 	out = stdout;
+	locklog = 0;
     } else {
 	if((out = fopen(argv[optind], "a")) == NULL) {
 	    flog(LOG_ERR, "accesslog: could not open %s for logging: %s", argv[optind], strerror(errno));
 	    exit(1);
 	}
+	fcntl(fileno(out), F_SETFD, FD_CLOEXEC);
     }
     if(locklog) {
 	if(lockfile(out)) {
@@ -342,7 +345,6 @@ int main(int argc, char **argv)
 	    }
 	}
     }
-    fcntl(fileno(out), F_SETFD, FD_CLOEXEC);
     if((ch = stdmkchild(argv + optind + 1, NULL, NULL)) < 0) {
 	flog(LOG_ERR, "accesslog: could not fork child: %s", strerror(errno));
 	exit(1);
-- 
2.11.0