Slight fixes to log_fd

diff --git a/cmdline.c b/cmdline.c
index b44f6f8b751908acf27357035d1e22af81a3af0e..82e0f1159febe838bb58d04304b742ea657bd5ea 100644 (file)
--- a/cmdline.c
+++ b/cmdline.c
@@ -309,7 +309,7 @@ bool cmdlineParse(int argc, char *argv[], struct nsjconf_t * nsjconf)
       .argv = NULL,
       .port = 0,
       .bindhost = "::",
-      .log_fd = 2,
+      .log_fd = STDERR_FILENO,
       .logfile = NULL,
       .loglevel = INFO,
       .daemonize = false,

diff --git a/config.c b/config.c
index 343ea7eeddf61ff3356013356f378a5cd98070e5..0fed705375b5e83e166be3cabace17564dab7822 100644 (file)
--- a/config.c
+++ b/config.c
@@ -69,7 +69,9 @@ static bool configParseInternal(struct nsjconf_t *nsjconf, Nsjail__NsJailConfig
        nsjconf->tlimit = njc->time_limit;
        nsjconf->daemonize = njc->daemon;
 
-       nsjconf->log_fd = njc->log_fd;
+       if (njc->has_log_fd) {
+               nsjconf->log_fd = njc->log_fd;
+       }
        nsjconf->logfile = utilStrDup(njc->log_file);
        if (njc->has_log_level) {
                switch (njc->log_level) {
@@ -94,7 +96,7 @@ static bool configParseInternal(struct nsjconf_t *nsjconf, Nsjail__NsJailConfig
                }
        }
 
-       if (njc->log_file || njc->has_log_level) {
+       if (njc->has_log_fd || njc->log_file || njc->has_log_level) {
                if (logInitLogFile(nsjconf) == false) {
                        return false;
                }

diff --git a/config.proto b/config.proto
index 8dbf948f407b71d7f22952262bb508b4156bbcc7..2ae26564120ac3d0deae28adab8b71973b0272d2 100644 (file)
--- a/config.proto
+++ b/config.proto
@@ -89,7 +89,7 @@ message NsJailConfig
     required bool daemon = 14 [ default = false ];
 
     /* FD to log to. */
-    required int32 log_fd = 61 [ default = 2 ];
+    optional int32 log_fd = 61;
     /* File to save lofs to */
     optional string log_file = 15;
     /* Minimum log level displayed.