Get rid of "TCPDUMP" in some libnetdissect codes

diff --git a/config.h.in b/config.h.in
index 6699671404ce77ed78f3f1e9dec7f7ad4fdf3113..e45a2de82dd13f66a00855ed0708f34b0a405f36 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -1,5 +1,8 @@
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
+/* define if you want to build the possibly-buggy SMB printer */
+#undef ENABLE_SMB
+
 /* Define to 1 if you have the `alarm' function. */
 #undef HAVE_ALARM
 
@@ -280,9 +283,6 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
-/* define if you want to build the possibly-buggy SMB printer */
-#undef TCPDUMP_DO_SMB
-
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME
 

diff --git a/configure b/configure
index 6566eda27f4601fcccfb19577bf03c57b3660610..57234921b8cd6e361c3f6a9707c3e64fb2afa745 100755 (executable)
--- a/configure
+++ b/configure
@@ -4500,7 +4500,7 @@ $as_echo "yes" >&6; }
        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The SMB printer may have exploitable buffer overflows!!!" >&5
 $as_echo "$as_me: WARNING: The SMB printer may have exploitable buffer overflows!!!" >&2;}
 
-$as_echo "#define TCPDUMP_DO_SMB 1" >>confdefs.h
+$as_echo "#define ENABLE_SMB 1" >>confdefs.h
 
        LOCALSRC="print-smb.c smbutil.c $LOCALSRC"
        ;;

diff --git a/configure.in b/configure.in
index d0cd08334e8b4eedb028fb625896d8ed14d00139..0fb86a7a7b3d2a424a3576fcf42a879ec011dfb4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -175,7 +175,7 @@ AC_ARG_ENABLE(smb,
 case "$enableval" in
 yes)   AC_MSG_RESULT(yes)
        AC_WARN([The SMB printer may have exploitable buffer overflows!!!])
-       AC_DEFINE(TCPDUMP_DO_SMB, 1,
+       AC_DEFINE(ENABLE_SMB, 1,
            [define if you want to build the possibly-buggy SMB printer])
        LOCALSRC="print-smb.c smbutil.c $LOCALSRC"
        ;;

diff --git a/print-ipx.c b/print-ipx.c
index 22e613e77e1253104a591072ba2e25a5a1900d75..383a84b0f0fd2f6ac6e64cc230ca259cc62151c3 100644 (file)
--- a/print-ipx.c
+++ b/print-ipx.c
@@ -123,7 +123,7 @@ ipx_decode(netdissect_options *ndo, const struct ipxHdr *ipx, const u_char *data
        break;
       case IPX_SKT_NETBIOS:
        ND_PRINT((ndo, "ipx-netbios %d", length));
-#ifdef TCPDUMP_DO_SMB
+#ifdef ENABLE_SMB
        ipx_netbios_print(ndo, datap, length);
 #endif
        break;
@@ -132,7 +132,7 @@ ipx_decode(netdissect_options *ndo, const struct ipxHdr *ipx, const u_char *data
        break;
       case IPX_SKT_NWLINK_DGM:
        ND_PRINT((ndo, "ipx-nwlink-dgm %d", length));
-#ifdef TCPDUMP_DO_SMB
+#ifdef ENABLE_SMB
        ipx_netbios_print(ndo, datap, length);
 #endif
        break;

diff --git a/print-llc.c b/print-llc.c
index 3fdcef728a2a0ba65119c721fd36df1122d93a9c..aaaac8e1e8adbb14ee81ae8c835e3d6577a30c88 100644 (file)
--- a/print-llc.c
+++ b/print-llc.c
@@ -303,7 +303,7 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
                return (hdrlen);
        }
 
-#ifdef TCPDUMP_DO_SMB
+#ifdef ENABLE_SMB
        if (ssap == LLCSAP_NETBEUI && dsap == LLCSAP_NETBEUI
            && (!(control & LLC_S_FMT) || control == LLC_U_FMT)) {
                /*

diff --git a/print-tcp.c b/print-tcp.c
index ce9bf11e68d2f20aa7b34fbb8e42f9c2821ef897..98dc07d1b1f6efa325174b2000a85238d5515b9e 100644 (file)
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -654,7 +654,7 @@ tcp_print(netdissect_options *ndo,
                 bgp_print(ndo, bp, length);
         else if (sport == PPTP_PORT || dport == PPTP_PORT)
                 pptp_print(ndo, bp);
-#ifdef TCPDUMP_DO_SMB
+#ifdef ENABLE_SMB
         else if (sport == NETBIOS_SSN_PORT || dport == NETBIOS_SSN_PORT)
                 nbt_tcp_print(ndo, bp, length);
        else if (sport == SMB_PORT || dport == SMB_PORT)

diff --git a/print-udp.c b/print-udp.c
index f9a6e333750581d247729e2f12c88e3ea973ac83..2b63318a41954a08afff19ebedcc3cc7628a88c7 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -577,7 +577,7 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length,
                        krb_print(ndo, (const void *)(up + 1));
                else if (ISPORT(L2TP_PORT))
                        l2tp_print(ndo, (const u_char *)(up + 1), length);
-#ifdef TCPDUMP_DO_SMB
+#ifdef ENABLE_SMB
                else if (ISPORT(NETBIOS_NS_PORT))
                        nbt_udp137_print(ndo, (const u_char *)(up + 1), length);
                else if (ISPORT(NETBIOS_DGRAM_PORT))