Avoid -E and -M options inconsistencies with no libcrypto

[tcpdump] / print-syslog.c

diff --git a/print-syslog.c b/print-syslog.c
index b0e1c91aa78457ebdc5b560900417d5be393d112..396f07a4e7cbf8676b21772db235d4a5db6a1b19 100644 (file)
--- a/print-syslog.c
+++ b/print-syslog.c
@@ -17,9 +17,7 @@
 /* \summary: Syslog protocol printer */
 /* specification: RFC 3164 (not RFC 5424) */
 
 /* \summary: Syslog protocol printer */
 /* specification: RFC 3164 (not RFC 5424) */
 

-#ifdef HAVE_CONFIG_H

 #include <config.h>
 #include <config.h>

-#endif

 
 #include "netdissect-stdinc.h"
 
 
 #include "netdissect-stdinc.h"
 


@@ -109,8 +107,7 @@ syslog_print(netdissect_options *ndo,
     facility = (pri & SYSLOG_FACILITY_MASK) >> 3;
     severity = pri & SYSLOG_SEVERITY_MASK;
 
     facility = (pri & SYSLOG_FACILITY_MASK) >> 3;
     severity = pri & SYSLOG_SEVERITY_MASK;
 

-    if (ndo->ndo_vflag < 1 )
-    {
+    if (ndo->ndo_vflag < 1 ) {

         ND_PRINT("SYSLOG %s.%s, length: %u",
                tok2str(syslog_facility_values, "unknown (%u)", facility),
                tok2str(syslog_severity_values, "unknown (%u)", severity),
         ND_PRINT("SYSLOG %s.%s, length: %u",
                tok2str(syslog_facility_values, "unknown (%u)", facility),
                tok2str(syslog_severity_values, "unknown (%u)", severity),


@@ -139,7 +136,7 @@ syslog_print(netdissect_options *ndo,
      * beautification to make it clear what was transmitted on the wire.
      */
     if (len > msg_off)
      * beautification to make it clear what was transmitted on the wire.
      */
     if (len > msg_off)

-        (void)nd_printn(ndo, pptr + msg_off, len - msg_off, NULL);
+        nd_printjn(ndo, pptr + msg_off, len - msg_off);

 
     if (ndo->ndo_vflag > 1)
         print_unknown_data(ndo, pptr, "\n\t", len);
 
     if (ndo->ndo_vflag > 1)
         print_unknown_data(ndo, pptr, "\n\t", len);