1 files changed, 12 insertions, 2 deletions
diff --git a/src/log.c b/src/log.c
index f5a0b44..c5368b8 100644
--- a/src/log.c
+++ b/src/log.c
@@ -70,7 +70,14 @@ static unsigned int logging_initialized = FALSE;     /* boolean */
  */
 int open_log_file (const char *log_file_name)
 {
-        log_file_fd = create_file_safely (log_file_name, FALSE);
+        if (log_file_name == NULL) {
+                if(config.godaemon == FALSE)
+                        log_file_fd = fileno(stdout);
+                else
+                        log_file_fd = -1;
+        } else {
+                log_file_fd = create_file_safely (log_file_name, FALSE);
+        }
         return log_file_fd;
 }
 
@@ -79,7 +86,7 @@ int open_log_file (const char *log_file_name)
  */
 void close_log_file (void)
 {
-        if (log_file_fd < 0) {
+        if (log_file_fd < 0 || log_file_fd == fileno(stdout)) {
                 return;
         }
 
@@ -108,6 +115,9 @@ void log_message (int level, const char *fmt, ...)
 
         ssize_t ret;
 
+        if(!config.syslog && log_file_fd == -1)
+                return;
+
 #ifdef NDEBUG
         /*
          * Figure out if we should write the message or not.