Avoid -E and -M options inconsistencies with no libcrypto

[tcpdump] / print-token.c

diff --git a/print-token.c b/print-token.c
index a2132353e99f295140d51559a6b51af7c6a9bfde..74355ffd9ab9955e01f62a2119378d4922f95c02 100644 (file)
--- a/print-token.c
+++ b/print-token.c
@@ -26,9 +26,7 @@
 
 /* \summary: Token Ring printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -108,8 +106,8 @@ token_hdr_print(netdissect_options *ndo,
 {
        const char *srcname, *dstname;
 
-       srcname = mac64_string(ndo, fsrc);
-       dstname = mac64_string(ndo, fdst);
+       srcname = mac48_string(ndo, fsrc);
+       dstname = mac48_string(ndo, fdst);
 
        if (!ndo->ndo_qflag)
                ND_PRINT("%02x %02x ",
@@ -204,9 +202,9 @@ token_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
        }
 
        src.addr = srcmac;
-       src.addr_string = mac64_string;
+       src.addr_string = mac48_string;
        dst.addr = dstmac;
-       dst.addr_string = mac64_string;
+       dst.addr_string = mac48_string;
 
        /* Skip over token ring MAC header and routing information */
        length -= hdr_len;