25 files changed, 82 insertions, 42 deletions
diff --git a/config.h.in b/config.h.in
index b3981b15..ef062d8f 100644
--- a/config.h.in
+++ b/config.h.in
@@ -210,9 +210,6 @@
 /* Define if you have the <smi.h> header file.  */
 #undef HAVE_SMI_H
 
-/* Define if you have the <sys/cdefs.h> header file.  */
-#undef HAVE_SYS_CDEFS_H
-
 /* Define if you have the <zlib.h> header file.  */
 #undef HAVE_ZLIB_H
 
diff --git a/configure b/configure
index a09293a2..c1844f7b 100755
--- a/configure
+++ b/configure
@@ -1250,7 +1250,7 @@ else
 fi
 echo "$ac_t""$CPP" 1>&6
 
-for ac_hdr in fcntl.h malloc.h memory.h rpc/rpcent.h sys/cdefs.h
+for ac_hdr in fcntl.h malloc.h memory.h rpc/rpcent.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
diff --git a/configure.in b/configure.in
index 70cb018e..dac2e9f4 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.90 2000-01-08 06:03:17 assar Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.91 2000-01-09 21:34:16 fenner Exp $ (LBL)
 dnl
 dnl Copyright (c) 1994, 1995, 1996, 1997
 dnl	The Regents of the University of California.  All rights reserved.
@@ -6,7 +6,7 @@ dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
 
-AC_REVISION($Revision: 1.90 $)
+AC_REVISION($Revision: 1.91 $)
 AC_INIT(tcpdump.c)
 
 AC_CANONICAL_SYSTEM
@@ -20,7 +20,7 @@ fi
 AC_LBL_C_INIT(V_CCOPT, V_INCLS)
 AC_C_INLINE
 
-AC_CHECK_HEADERS(fcntl.h malloc.h memory.h rpc/rpcent.h sys/cdefs.h)
+AC_CHECK_HEADERS(fcntl.h malloc.h memory.h rpc/rpcent.h)
 AC_HEADER_TIME
 
 case "$target_os" in
diff --git a/missing/getaddrinfo.c b/missing/getaddrinfo.c
index 4dec9a1b..d45b14d7 100644
--- a/missing/getaddrinfo.c
+++ b/missing/getaddrinfo.c
@@ -42,6 +42,11 @@
 #include "config.h"
 #endif 
 
+#ifndef lint
+static const char rcsid[] =
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/getaddrinfo.c,v 1.7 2000-01-09 21:35:44 fenner Exp $";
+#endif
+
 #include <sys/types.h>
 #include <sys/param.h>
 #if 0
diff --git a/missing/getnameinfo.c b/missing/getnameinfo.c
index a19312f8..b7e99c26 100644
--- a/missing/getnameinfo.c
+++ b/missing/getnameinfo.c
@@ -38,6 +38,11 @@
 #include "config.h"
 #endif 
 
+#ifndef lint
+static const char rcsid[] =
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/getnameinfo.c,v 1.4 2000-01-09 21:35:44 fenner Exp $";
+#endif
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <net/if.h>
diff --git a/missing/inet_aton.c b/missing/inet_aton.c
index 8be3011d..0dbe9924 100644
--- a/missing/inet_aton.c
+++ b/missing/inet_aton.c
@@ -36,7 +36,12 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: inet_aton.c,v 1.1 1999-10-30 07:53:39 itojun Exp $ */
+/* $Id: inet_aton.c,v 1.2 2000-01-09 21:35:45 fenner Exp $ */
+
+#ifndef lint
+static const char rcsid[] =
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_aton.c,v 1.2 2000-01-09 21:35:45 fenner Exp $";
+#endif
 
 #include <sys/types.h>
 #include <netinet/in.h>
diff --git a/missing/inet_ntop.c b/missing/inet_ntop.c
index a6801b27..b0f4e444 100644
--- a/missing/inet_ntop.c
+++ b/missing/inet_ntop.c
@@ -36,7 +36,12 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: inet_ntop.c,v 1.2 1999-10-30 23:45:52 itojun Exp $ */
+/* $Id: inet_ntop.c,v 1.3 2000-01-09 21:35:45 fenner Exp $ */
+
+#ifndef lint
+static const char rcsid[] =
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_ntop.c,v 1.3 2000-01-09 21:35:45 fenner Exp $";
+#endif
 
 #include <stdio.h>
 #include <errno.h>
diff --git a/missing/inet_pton.c b/missing/inet_pton.c
index c62bdcd8..a9b5c05d 100644
--- a/missing/inet_pton.c
+++ b/missing/inet_pton.c
@@ -36,7 +36,12 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: inet_pton.c,v 1.1 1999-10-30 07:53:39 itojun Exp $ */
+/* $Id: inet_pton.c,v 1.2 2000-01-09 21:35:46 fenner Exp $ */
+
+#ifndef lint
+static const char rcsid[] =
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_pton.c,v 1.2 2000-01-09 21:35:46 fenner Exp $";
+#endif
 
 #include <errno.h>
 #include <sys/types.h>
diff --git a/missing/snprintf.c b/missing/snprintf.c
index 1df2bc54..49c70e61 100644
--- a/missing/snprintf.c
+++ b/missing/snprintf.c
@@ -31,10 +31,17 @@
  * SUCH DAMAGE.
  */
 
+/* $Id: snprintf.c,v 1.2 2000-01-09 21:35:46 fenner Exp $ */
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
-/* $Id: snprintf.c,v 1.1 2000-01-07 16:01:38 assar Exp $ */
 #endif
+
+#ifndef lint
+static const char rcsid[] =
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/snprintf.c,v 1.2 2000-01-09 21:35:46 fenner Exp $";
+#endif
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/print-ascii.c b/print-ascii.c
index b2a78a03..882f2474 100644
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -40,13 +40,9 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
-#if 0
 #ifndef lint
-__RCSID("$NetBSD: print-ascii.c,v 1.1 1999/09/30 14:49:12 sjg Exp $");
-#endif
+static const char rcsid[] =
+     "@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.4 2000-01-09 21:34:16 fenner Exp $";
 #endif
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/print-bgp.c b/print-bgp.c
index 37ea9cb0..bc4cc4ad 100644
--- a/print-bgp.c
+++ b/print-bgp.c
@@ -31,6 +31,11 @@
 #include "config.h"
 #endif
 
+#ifndef lint
+static const char rcsid[] =
+     "@(#) $Header: /tcpdump/master/tcpdump/print-bgp.c,v 1.10 2000-01-09 21:34:17 fenner Exp $";
+#endif
+
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/types.h>
diff --git a/print-frag6.c b/print-frag6.c
index a8bc0b20..d31de277 100644
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) /master/usr.sbin/tcpdump/tcpdump/print-icmp.c,v 2.1 1995/02/03 18:14:42 polk Exp (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-frag6.c,v 1.4 2000-01-09 21:34:17 fenner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/print-icmp6.c b/print-icmp6.c
index 6f0015cb..fad58776 100644
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) /master/usr.sbin/tcpdump/tcpdump/print-icmp.c,v 2.1 1995/02/03 18:14:42 polk Exp (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp6.c,v 1.3 2000-01-09 21:34:17 fenner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/print-ip6.c b/print-ip6.c
index 5350153c..5f01d186 100644
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) /master/usr.sbin/tcpdump/tcpdump/print-ip.c,v 2.1 1995/02/03 18:14:45 polk Exp (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.3 2000-01-09 21:34:18 fenner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/print-ip6opts.c b/print-ip6opts.c
index 1fb6b66c..a860e961 100644
--- a/print-ip6opts.c
+++ b/print-ip6opts.c
@@ -31,6 +31,11 @@
 #include "config.h"
 #endif
 
+#ifndef lint
+static const char rcsid[] =
+     "@(#) $Header: /tcpdump/master/tcpdump/print-ip6opts.c,v 1.3 2000-01-09 21:34:18 fenner Exp $";
+#endif
+
 #ifdef INET6
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/print-ipcomp.c b/print-ipcomp.c
index ba2987ae..2cecb326 100644
--- a/print-ipcomp.c
+++ b/print-ipcomp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) /master/usr.sbin/tcpdump/tcpdump/print-icmp.c,v 2.1 1995/02/03 18:14:42 polk Exp (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.3 2000-01-09 21:34:18 fenner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/print-mobile.c b/print-mobile.c
index b6c414c8..977d9ee7 100644
--- a/print-mobile.c
+++ b/print-mobile.c
@@ -36,17 +36,15 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if 0
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: print-mobile.c,v 1.2 1998/09/30 08:57:01 hwr Exp $");
-#endif
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#ifndef lint
+static const char rcsid[] =
+     "@(#) $Header: /tcpdump/master/tcpdump/print-mobile.c,v 1.3 2000-01-09 21:34:18 fenner Exp $";
+#endif
+
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/uio.h>
diff --git a/print-ripng.c b/print-ripng.c
index 3288a29a..5e87ff5e 100644
--- a/print-ripng.c
+++ b/print-ripng.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) /master/usr.sbin/tcpdump/tcpdump/print-rip.c,v 2.1 1995/02/03 18:15:05 polk Exp (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ripng.c,v 1.3 2000-01-09 21:34:19 fenner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/print-rt6.c b/print-rt6.c
index a0750e0b..874c38cc 100644
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) /master/usr.sbin/tcpdump/tcpdump/print-icmp.c,v 2.1 1995/02/03 18:14:42 polk Exp (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-rt6.c,v 1.4 2000-01-09 21:34:19 fenner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/print-rx.c b/print-rx.c
index 7fd9206f..c38e7aa3 100644
--- a/print-rx.c
+++ b/print-rx.c
@@ -13,7 +13,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Id: print-rx.c,v 1.6 2000-01-07 15:17:43 assar Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-rx.c,v 1.7 2000-01-09 21:34:19 fenner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/print-smb.c b/print-smb.c
index 9810cda9..b8510351 100644
--- a/print-smb.c
+++ b/print-smb.c
@@ -9,6 +9,11 @@
 #include "config.h"
 #endif
 
+#ifndef lint
+static const char rcsid[] =
+     "@(#) $Header: /tcpdump/master/tcpdump/print-smb.c,v 1.4 2000-01-09 21:34:19 fenner Exp $";
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
diff --git a/print-telnet.c b/print-telnet.c
index df2147e6..beb6be91 100644
--- a/print-telnet.c
+++ b/print-telnet.c
@@ -49,13 +49,9 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
-#if 0
 #ifndef lint
-__RCSID("$NetBSD: print-telnet.c,v 1.2 1999/10/11 12:40:12 sjg Exp $");
-#endif
+static const char rcsid[] =
+     "@(#) $Header: /tcpdump/master/tcpdump/print-telnet.c,v 1.5 2000-01-09 21:34:20 fenner Exp $";
 #endif
 
 #include <sys/param.h>
diff --git a/print-vjc.c b/print-vjc.c
index 68fd869f..120129d2 100644
--- a/print-vjc.c
+++ b/print-vjc.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) print-vjc.c,v 1.1.2.2 1998/08/31 05:44:21 onoe Exp (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-vjc.c,v 1.3 2000-01-09 21:34:20 fenner Exp $ (LBL)";
 #endif
 
 #include <sys/param.h>
diff --git a/smbutil.c b/smbutil.c
index bcea660e..14e5c1db 100644
--- a/smbutil.c
+++ b/smbutil.c
@@ -9,6 +9,11 @@
 #include "config.h"
 #endif
 
+#ifndef lint
+static const char rcsid[] =
+     "@(#) $Header: /tcpdump/master/tcpdump/smbutil.c,v 1.5 2000-01-09 21:34:20 fenner Exp $";
+#endif
+
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/types.h>
diff --git a/strcasecmp.c b/strcasecmp.c
index 8f9bcf2a..7b98fc19 100644
--- a/strcasecmp.c
+++ b/strcasecmp.c
@@ -10,14 +10,15 @@
  * is provided ``as is'' without express or implied warranty.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)strcasecmp.c	5.5 (Berkeley) 11/24/87";
-#endif /* LIBC_SCCS and not lint */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#ifndef lint
+static const char rcsid[] =
+     "@(#) $Header: /tcpdump/master/tcpdump/strcasecmp.c,v 1.3 2000-01-09 21:34:21 fenner Exp $";
+#endif
+
 #include <sys/types.h>
 
 #include "interface.h"