From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Tue, 1 Aug 2017 21:30:55 +0000 (-0400)
Subject: Merge pull request #983 in SNORT/snort3 from stdlog to master
X-Git-Tag: 3.0.0-240~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=30c62bdbed0e6188e09ad17cc601d2ca55bbf23f;p=thirdparty%2Fsnort3.git

Merge pull request #983 in SNORT/snort3 from stdlog to master

Squashed commit of the following:

commit c8d172dc28a8157129d8426255d40fa4a3acd645
Author: Russ Combs <rucombs@cisco.com>
Date:   Tue Aug 1 08:52:05 2017 -0400

    stdlog: support snort 3> log for text alerts
---

diff --git a/src/log/text_log.cc b/src/log/text_log.cc
index 1604f4c8f..6ea36c9b7 100644
--- a/src/log/text_log.cc
+++ b/src/log/text_log.cc
@@ -41,6 +41,7 @@
 
 /* a reasonable minimum */
 #define MIN_BUF  (4* K_BYTES)
+#define STDLOG_FILENO 3
 
 struct TextLog
 {
@@ -65,7 +66,10 @@ struct TextLog
 static FILE* TextLog_Open(const char* name)
 {
     if ( name && !strcasecmp(name, "stdout") )
-        return stdout;
+    {
+        FILE* stdlog = fdopen(STDLOG_FILENO, "w");
+        return stdlog ? stdlog : stdout;
+    }
 
     return OpenAlertFile(name);
 }