summaryrefslogtreecommitdiff
path: root/usr.sbin/tcpdump
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/tcpdump')
-rw-r--r--usr.sbin/tcpdump/addrtoname.c6
-rw-r--r--usr.sbin/tcpdump/bpf_dump.c6
-rw-r--r--usr.sbin/tcpdump/gmt2local.c7
-rw-r--r--usr.sbin/tcpdump/machdep.c7
-rw-r--r--usr.sbin/tcpdump/parsenfsfh.c7
-rw-r--r--usr.sbin/tcpdump/print-arp.c7
-rw-r--r--usr.sbin/tcpdump/print-atalk.c7
-rw-r--r--usr.sbin/tcpdump/print-atm.c6
-rw-r--r--usr.sbin/tcpdump/print-bgp.c7
-rw-r--r--usr.sbin/tcpdump/print-bootp.c7
-rw-r--r--usr.sbin/tcpdump/print-carp.c7
-rw-r--r--usr.sbin/tcpdump/print-cdp.c7
-rw-r--r--usr.sbin/tcpdump/print-decnet.c7
-rw-r--r--usr.sbin/tcpdump/print-dhcp6.c7
-rw-r--r--usr.sbin/tcpdump/print-domain.c7
-rw-r--r--usr.sbin/tcpdump/print-dvmrp.c7
-rw-r--r--usr.sbin/tcpdump/print-enc.c7
-rw-r--r--usr.sbin/tcpdump/print-ether.c6
-rw-r--r--usr.sbin/tcpdump/print-etherip.c7
-rw-r--r--usr.sbin/tcpdump/print-fddi.c7
-rw-r--r--usr.sbin/tcpdump/print-frag6.c7
-rw-r--r--usr.sbin/tcpdump/print-hsrp.c7
-rw-r--r--usr.sbin/tcpdump/print-icmp.c7
-rw-r--r--usr.sbin/tcpdump/print-icmp6.c7
-rw-r--r--usr.sbin/tcpdump/print-igrp.c7
-rw-r--r--usr.sbin/tcpdump/print-ike.c7
-rw-r--r--usr.sbin/tcpdump/print-ip.c7
-rw-r--r--usr.sbin/tcpdump/print-ip6.c7
-rw-r--r--usr.sbin/tcpdump/print-ipsec.c7
-rw-r--r--usr.sbin/tcpdump/print-ipx.c7
-rw-r--r--usr.sbin/tcpdump/print-isoclns.c7
-rw-r--r--usr.sbin/tcpdump/print-krb.c7
-rw-r--r--usr.sbin/tcpdump/print-l2tp.c7
-rw-r--r--usr.sbin/tcpdump/print-llc.c7
-rw-r--r--usr.sbin/tcpdump/print-lwres.c5
-rw-r--r--usr.sbin/tcpdump/print-netbios.c7
-rw-r--r--usr.sbin/tcpdump/print-nfs.c7
-rw-r--r--usr.sbin/tcpdump/print-ntp.c7
-rw-r--r--usr.sbin/tcpdump/print-null.c7
-rw-r--r--usr.sbin/tcpdump/print-ospf.c7
-rw-r--r--usr.sbin/tcpdump/print-ospf6.c7
-rw-r--r--usr.sbin/tcpdump/print-pflog.c7
-rw-r--r--usr.sbin/tcpdump/print-pfsync.c7
-rw-r--r--usr.sbin/tcpdump/print-pim.c7
-rw-r--r--usr.sbin/tcpdump/print-ppp.c7
-rw-r--r--usr.sbin/tcpdump/print-raw.c7
-rw-r--r--usr.sbin/tcpdump/print-rip.c7
-rw-r--r--usr.sbin/tcpdump/print-ripng.c7
-rw-r--r--usr.sbin/tcpdump/print-rt6.c7
-rw-r--r--usr.sbin/tcpdump/print-sl.c7
-rw-r--r--usr.sbin/tcpdump/print-smb.c7
-rw-r--r--usr.sbin/tcpdump/print-snmp.c7
-rw-r--r--usr.sbin/tcpdump/print-sunrpc.c7
-rw-r--r--usr.sbin/tcpdump/print-tcp.c7
-rw-r--r--usr.sbin/tcpdump/print-tftp.c7
-rw-r--r--usr.sbin/tcpdump/print-timed.c7
-rw-r--r--usr.sbin/tcpdump/print-udp.c7
-rw-r--r--usr.sbin/tcpdump/print-udpencap.c7
-rw-r--r--usr.sbin/tcpdump/print-vrrp.c7
-rw-r--r--usr.sbin/tcpdump/print-wb.c7
-rw-r--r--usr.sbin/tcpdump/savestr.c7
-rw-r--r--usr.sbin/tcpdump/setsignal.c7
-rw-r--r--usr.sbin/tcpdump/smbutil.c7
-rw-r--r--usr.sbin/tcpdump/tcpdump.c10
-rw-r--r--usr.sbin/tcpdump/util.c7
65 files changed, 64 insertions, 388 deletions
diff --git a/usr.sbin/tcpdump/addrtoname.c b/usr.sbin/tcpdump/addrtoname.c
index d26552e20b9..c3ff5168345 100644
--- a/usr.sbin/tcpdump/addrtoname.c
+++ b/usr.sbin/tcpdump/addrtoname.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: addrtoname.c,v 1.30 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: addrtoname.c,v 1.31 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -23,10 +23,6 @@
* Internet, ethernet, port, and protocol string to address
* and address to string conversion routines
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: addrtoname.c,v 1.30 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/bpf_dump.c b/usr.sbin/tcpdump/bpf_dump.c
index 588055ad742..ff71083afac 100644
--- a/usr.sbin/tcpdump/bpf_dump.c
+++ b/usr.sbin/tcpdump/bpf_dump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bpf_dump.c,v 1.7 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: bpf_dump.c,v 1.8 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993, 1994, 1995, 1996
@@ -20,10 +20,6 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: bpf_dump.c,v 1.7 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
#include <sys/types.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/gmt2local.c b/usr.sbin/tcpdump/gmt2local.c
index 34fb15644b3..a752caea333 100644
--- a/usr.sbin/tcpdump/gmt2local.c
+++ b/usr.sbin/tcpdump/gmt2local.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gmt2local.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: gmt2local.c,v 1.5 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: gmt2local.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/types.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/machdep.c b/usr.sbin/tcpdump/machdep.c
index 434c812f5de..c94d5fcc6bf 100644
--- a/usr.sbin/tcpdump/machdep.c
+++ b/usr.sbin/tcpdump/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.7 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.8 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1996, 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: machdep.c,v 1.7 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/types.h>
#ifdef __osf__
#include <sys/sysinfo.h>
diff --git a/usr.sbin/tcpdump/parsenfsfh.c b/usr.sbin/tcpdump/parsenfsfh.c
index f8c9465a167..1652be88ae0 100644
--- a/usr.sbin/tcpdump/parsenfsfh.c
+++ b/usr.sbin/tcpdump/parsenfsfh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parsenfsfh.c,v 1.9 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: parsenfsfh.c,v 1.10 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1993, 1994 Jeffrey C. Mogul, Digital Equipment Corporation,
@@ -42,11 +42,6 @@
* Western Research Laboratory
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: parsenfsfh.c,v 1.9 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/types.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/print-arp.c b/usr.sbin/tcpdump/print-arp.c
index db0311825ba..1f1c5123dce 100644
--- a/usr.sbin/tcpdump/print-arp.c
+++ b/usr.sbin/tcpdump/print-arp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-arp.c,v 1.11 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-arp.c,v 1.12 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-arp.c,v 1.11 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-atalk.c b/usr.sbin/tcpdump/print-atalk.c
index fc016c6575b..ceb2e1a4f1d 100644
--- a/usr.sbin/tcpdump/print-atalk.c
+++ b/usr.sbin/tcpdump/print-atalk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-atalk.c,v 1.25 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-atalk.c,v 1.26 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -23,11 +23,6 @@
* Format and print AppleTalk packets.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-atalk.c,v 1.25 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-atm.c b/usr.sbin/tcpdump/print-atm.c
index 713bdb4b175..73b37908f48 100644
--- a/usr.sbin/tcpdump/print-atm.c
+++ b/usr.sbin/tcpdump/print-atm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-atm.c,v 1.8 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-atm.c,v 1.9 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1994, 1995, 1996, 1997
@@ -20,10 +20,6 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-atm.c,v 1.8 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/print-bgp.c b/usr.sbin/tcpdump/print-bgp.c
index 6ca2143f5cd..01aa9ee026e 100644
--- a/usr.sbin/tcpdump/print-bgp.c
+++ b/usr.sbin/tcpdump/print-bgp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-bgp.c,v 1.13 2009/09/08 15:53:11 claudio Exp $ */
+/* $OpenBSD: print-bgp.c,v 1.14 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (C) 1999 WIDE Project.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-bgp.c,v 1.13 2009/09/08 15:53:11 claudio Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/types.h>
diff --git a/usr.sbin/tcpdump/print-bootp.c b/usr.sbin/tcpdump/print-bootp.c
index 25bd3d741e2..7991f0d7d65 100644
--- a/usr.sbin/tcpdump/print-bootp.c
+++ b/usr.sbin/tcpdump/print-bootp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-bootp.c,v 1.16 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-bootp.c,v 1.17 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997
@@ -22,11 +22,6 @@
*
* Format and print bootp packets.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-bootp.c,v 1.16 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-carp.c b/usr.sbin/tcpdump/print-carp.c
index 39cf632ceb5..2c02a73e76c 100644
--- a/usr.sbin/tcpdump/print-carp.c
+++ b/usr.sbin/tcpdump/print-carp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-carp.c,v 1.5 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-carp.c,v 1.6 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 2000 William C. Fenner.
@@ -28,11 +28,6 @@
* Header: /tcpdump/master/tcpdump/print-vrrp.c,v 1.3 2000/10/10 05:05:08 guy Exp
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-carp.c,v 1.5 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/usr.sbin/tcpdump/print-cdp.c b/usr.sbin/tcpdump/print-cdp.c
index b58b4743667..bfb20b0db6c 100644
--- a/usr.sbin/tcpdump/print-cdp.c
+++ b/usr.sbin/tcpdump/print-cdp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-cdp.c,v 1.3 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-cdp.c,v 1.4 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993, 1994, 1995, 1996, 1997
@@ -26,11 +26,6 @@
* http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/frames.htm
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-cdp.c,v 1.3 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/print-decnet.c b/usr.sbin/tcpdump/print-decnet.c
index f506ea33a5e..8615abff887 100644
--- a/usr.sbin/tcpdump/print-decnet.c
+++ b/usr.sbin/tcpdump/print-decnet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-decnet.c,v 1.11 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-decnet.c,v 1.12 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993, 1994, 1995, 1996, 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-decnet.c,v 1.11 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-dhcp6.c b/usr.sbin/tcpdump/print-dhcp6.c
index 3176101d6ad..3546b6c9ac5 100644
--- a/usr.sbin/tcpdump/print-dhcp6.c
+++ b/usr.sbin/tcpdump/print-dhcp6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-dhcp6.c,v 1.6 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-dhcp6.c,v 1.7 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (C) 1998 and 1999 WIDE Project.
@@ -29,11 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-dhcp6.c,v 1.6 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#ifdef INET6
#include <sys/param.h>
diff --git a/usr.sbin/tcpdump/print-domain.c b/usr.sbin/tcpdump/print-domain.c
index 47bf259f925..91ec24d5fca 100644
--- a/usr.sbin/tcpdump/print-domain.c
+++ b/usr.sbin/tcpdump/print-domain.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-domain.c,v 1.16 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-domain.c,v 1.17 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-domain.c,v 1.16 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-dvmrp.c b/usr.sbin/tcpdump/print-dvmrp.c
index f22e807521b..41718706113 100644
--- a/usr.sbin/tcpdump/print-dvmrp.c
+++ b/usr.sbin/tcpdump/print-dvmrp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-dvmrp.c,v 1.5 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-dvmrp.c,v 1.6 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1995, 1996
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-dvmrp.c,v 1.5 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-enc.c b/usr.sbin/tcpdump/print-enc.c
index 3f548d0ff77..994d0825c39 100644
--- a/usr.sbin/tcpdump/print-enc.c
+++ b/usr.sbin/tcpdump/print-enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-enc.c,v 1.10 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-enc.c,v 1.11 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-enc.c,v 1.10 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-ether.c b/usr.sbin/tcpdump/print-ether.c
index 208d3ecdf38..2b6f87af220 100644
--- a/usr.sbin/tcpdump/print-ether.c
+++ b/usr.sbin/tcpdump/print-ether.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ether.c,v 1.25 2008/12/05 01:25:24 sthen Exp $ */
+/* $OpenBSD: print-ether.c,v 1.26 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -20,10 +20,6 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-ether.c,v 1.25 2008/12/05 01:25:24 sthen Exp $ (LBL)";
-#endif
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/print-etherip.c b/usr.sbin/tcpdump/print-etherip.c
index be4f39f9072..d28268ed8d9 100644
--- a/usr.sbin/tcpdump/print-etherip.c
+++ b/usr.sbin/tcpdump/print-etherip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-etherip.c,v 1.5 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-etherip.c,v 1.6 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -30,11 +30,6 @@
* Format and print etherip packets
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-etherip.c,v 1.5 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-fddi.c b/usr.sbin/tcpdump/print-fddi.c
index 0abe979d210..a9bfb4daaeb 100644
--- a/usr.sbin/tcpdump/print-fddi.c
+++ b/usr.sbin/tcpdump/print-fddi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-fddi.c,v 1.13 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-fddi.c,v 1.14 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-fddi.c,v 1.13 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#ifdef HAVE_FDDI
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/print-frag6.c b/usr.sbin/tcpdump/print-frag6.c
index 1ceace94955..816a31d7213 100644
--- a/usr.sbin/tcpdump/print-frag6.c
+++ b/usr.sbin/tcpdump/print-frag6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-frag6.c,v 1.3 2006/05/27 21:52:38 moritz Exp $ */
+/* $OpenBSD: print-frag6.c,v 1.4 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#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)";
-#endif
-
#ifdef INET6
#include <sys/param.h>
diff --git a/usr.sbin/tcpdump/print-hsrp.c b/usr.sbin/tcpdump/print-hsrp.c
index c91cc91cbc4..523971d9bf1 100644
--- a/usr.sbin/tcpdump/print-hsrp.c
+++ b/usr.sbin/tcpdump/print-hsrp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-hsrp.c,v 1.3 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-hsrp.c,v 1.4 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (C) 2001 Julian Cowley
@@ -31,11 +31,6 @@
/* Cisco Hot Standby Router Protocol (HSRP). */
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-hsrp.c,v 1.3 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/usr.sbin/tcpdump/print-icmp.c b/usr.sbin/tcpdump/print-icmp.c
index f224e2528fd..6348b76affb 100644
--- a/usr.sbin/tcpdump/print-icmp.c
+++ b/usr.sbin/tcpdump/print-icmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-icmp.c,v 1.19 2009/05/25 10:53:35 sthen Exp $ */
+/* $OpenBSD: print-icmp.c,v 1.20 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994, 1995, 1996
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-icmp.c,v 1.19 2009/05/25 10:53:35 sthen Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-icmp6.c b/usr.sbin/tcpdump/print-icmp6.c
index 941dad30951..2d5803a2d16 100644
--- a/usr.sbin/tcpdump/print-icmp6.c
+++ b/usr.sbin/tcpdump/print-icmp6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-icmp6.c,v 1.6 2009/05/25 10:53:35 sthen Exp $ */
+/* $OpenBSD: print-icmp6.c,v 1.7 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#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)";
-#endif
-
#ifdef INET6
#include <ctype.h>
diff --git a/usr.sbin/tcpdump/print-igrp.c b/usr.sbin/tcpdump/print-igrp.c
index eb38147c7d9..ccb02f41308 100644
--- a/usr.sbin/tcpdump/print-igrp.c
+++ b/usr.sbin/tcpdump/print-igrp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-igrp.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-igrp.c,v 1.5 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1996, 1997
@@ -23,11 +23,6 @@
* Initial contribution from Francis Dupont (francis.dupont@inria.fr)
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-igrp.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/types.h> /* concession to AIX */
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-ike.c b/usr.sbin/tcpdump/print-ike.c
index 73375a7eb68..7396a9a2a8a 100644
--- a/usr.sbin/tcpdump/print-ike.c
+++ b/usr.sbin/tcpdump/print-ike.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ike.c,v 1.31 2008/12/18 16:18:49 hshoexer Exp $ */
+/* $OpenBSD: print-ike.c,v 1.32 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
@@ -27,11 +27,6 @@
* in co-operation with SSH Communications Security, Espoo, Finland
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-ike.c,v 1.31 2008/12/18 16:18:49 hshoexer Exp $ (XXX)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-ip.c b/usr.sbin/tcpdump/print-ip.c
index 04ccfe9503e..9ea03d17154 100644
--- a/usr.sbin/tcpdump/print-ip.c
+++ b/usr.sbin/tcpdump/print-ip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ip.c,v 1.34 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-ip.c,v 1.35 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-ip.c,v 1.34 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-ip6.c b/usr.sbin/tcpdump/print-ip6.c
index 9063102a0e0..629c5e12fee 100644
--- a/usr.sbin/tcpdump/print-ip6.c
+++ b/usr.sbin/tcpdump/print-ip6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ip6.c,v 1.10 2007/10/04 18:38:29 canacar Exp $ */
+/* $OpenBSD: print-ip6.c,v 1.11 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#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)";
-#endif
-
#ifdef INET6
#include <sys/param.h>
diff --git a/usr.sbin/tcpdump/print-ipsec.c b/usr.sbin/tcpdump/print-ipsec.c
index 38da430924f..dd6204a3c88 100644
--- a/usr.sbin/tcpdump/print-ipsec.c
+++ b/usr.sbin/tcpdump/print-ipsec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ipsec.c,v 1.13 2009/02/18 01:53:06 mcbride Exp $ */
+/* $OpenBSD: print-ipsec.c,v 1.14 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
@@ -26,11 +26,6 @@
* in co-operation with SSH Communications Security, Espoo, Finland
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-ipsec.c,v 1.13 2009/02/18 01:53:06 mcbride Exp $ (XXX)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-ipx.c b/usr.sbin/tcpdump/print-ipx.c
index 498c2c29bca..4ddd73bce27 100644
--- a/usr.sbin/tcpdump/print-ipx.c
+++ b/usr.sbin/tcpdump/print-ipx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ipx.c,v 1.11 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-ipx.c,v 1.12 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1994, 1995, 1996
@@ -24,11 +24,6 @@
* Contributed by Brad Parker (brad@fcr.com).
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-ipx.c,v 1.11 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-isoclns.c b/usr.sbin/tcpdump/print-isoclns.c
index 7fca8ff687a..12df60a81d5 100644
--- a/usr.sbin/tcpdump/print-isoclns.c
+++ b/usr.sbin/tcpdump/print-isoclns.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-isoclns.c,v 1.11 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-isoclns.c,v 1.12 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993, 1994, 1995, 1996
@@ -23,11 +23,6 @@
* Original code by Matt Thomas, Digital Equipment Corporation
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-isoclns.c,v 1.11 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-krb.c b/usr.sbin/tcpdump/print-krb.c
index f7dff0aeeba..99f7cd093b9 100644
--- a/usr.sbin/tcpdump/print-krb.c
+++ b/usr.sbin/tcpdump/print-krb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-krb.c,v 1.7 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-krb.c,v 1.8 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1995, 1996, 1997
@@ -23,11 +23,6 @@
* Initial contribution from John Hawkinson (jhawk@mit.edu).
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-krb.c,v 1.7 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-l2tp.c b/usr.sbin/tcpdump/print-l2tp.c
index 15473c13207..caa639112fc 100644
--- a/usr.sbin/tcpdump/print-l2tp.c
+++ b/usr.sbin/tcpdump/print-l2tp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-l2tp.c,v 1.4 2009/07/12 18:11:03 jsg Exp $ */
+/* $OpenBSD: print-l2tp.c,v 1.5 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1991, 1993, 1994, 1995, 1996, 1997
@@ -23,11 +23,6 @@
* L2TP support contributed by Motonori Shindo (mshindo@ascend.co.jp)
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-l2tp.c,v 1.4 2009/07/12 18:11:03 jsg Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/param.h>
#include <stdio.h>
diff --git a/usr.sbin/tcpdump/print-llc.c b/usr.sbin/tcpdump/print-llc.c
index c4bf1ab76d3..2f78c6809db 100644
--- a/usr.sbin/tcpdump/print-llc.c
+++ b/usr.sbin/tcpdump/print-llc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-llc.c,v 1.17 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-llc.c,v 1.18 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993, 1994, 1995, 1996, 1997
@@ -24,11 +24,6 @@
* with an awful lot of hacking by Jeffrey Mogul, DECWRL
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-llc.c,v 1.17 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/print-lwres.c b/usr.sbin/tcpdump/print-lwres.c
index bac6e833c07..b6113d3c688 100644
--- a/usr.sbin/tcpdump/print-lwres.c
+++ b/usr.sbin/tcpdump/print-lwres.c
@@ -27,11 +27,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-lwres.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/usr.sbin/tcpdump/print-netbios.c b/usr.sbin/tcpdump/print-netbios.c
index 30065872633..09fc475b3c2 100644
--- a/usr.sbin/tcpdump/print-netbios.c
+++ b/usr.sbin/tcpdump/print-netbios.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-netbios.c,v 1.7 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-netbios.c,v 1.8 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1994, 1995, 1996
@@ -24,11 +24,6 @@
* Contributed by Brad Parker (brad@fcr.com).
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-netbios.c,v 1.7 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-nfs.c b/usr.sbin/tcpdump/print-nfs.c
index 006e8e209bf..d63920fbde9 100644
--- a/usr.sbin/tcpdump/print-nfs.c
+++ b/usr.sbin/tcpdump/print-nfs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-nfs.c,v 1.15 2007/06/29 11:39:25 thib Exp $ */
+/* $OpenBSD: print-nfs.c,v 1.16 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) Header: print-nfs.c,v 1.64 97/06/30 13:51:16 leres Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-ntp.c b/usr.sbin/tcpdump/print-ntp.c
index e5e77ba3d5b..f3ea0df5092 100644
--- a/usr.sbin/tcpdump/print-ntp.c
+++ b/usr.sbin/tcpdump/print-ntp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ntp.c,v 1.14 2009/03/04 16:54:42 stevesk Exp $ */
+/* $OpenBSD: print-ntp.c,v 1.15 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -25,11 +25,6 @@
* loosely based on print-bootp.c
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-ntp.c,v 1.14 2009/03/04 16:54:42 stevesk Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-null.c b/usr.sbin/tcpdump/print-null.c
index c07c60e792d..3c57edc7565 100644
--- a/usr.sbin/tcpdump/print-null.c
+++ b/usr.sbin/tcpdump/print-null.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-null.c,v 1.18 2008/12/29 10:02:55 michele Exp $ */
+/* $OpenBSD: print-null.c,v 1.19 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1991, 1993, 1994, 1995, 1996, 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-null.c,v 1.18 2008/12/29 10:02:55 michele Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-ospf.c b/usr.sbin/tcpdump/print-ospf.c
index 87c771fd2c6..a69898c3ded 100644
--- a/usr.sbin/tcpdump/print-ospf.c
+++ b/usr.sbin/tcpdump/print-ospf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ospf.c,v 1.13 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-ospf.c,v 1.14 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993, 1994, 1995, 1996, 1997
@@ -23,11 +23,6 @@
* OSPF support contributed by Jeffrey Honig (jch@mitchell.cit.cornell.edu)
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-ospf.c,v 1.13 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-ospf6.c b/usr.sbin/tcpdump/print-ospf6.c
index c23e18de05e..ae7da9986e4 100644
--- a/usr.sbin/tcpdump/print-ospf6.c
+++ b/usr.sbin/tcpdump/print-ospf6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ospf6.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-ospf6.c,v 1.5 2009/10/27 23:59:55 deraadt Exp $ */
/*
@@ -24,11 +24,6 @@
* OSPF support contributed by Jeffrey Honig (jch@mitchell.cit.cornell.edu)
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-ospf6.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#ifdef INET6
#include <sys/param.h>
diff --git a/usr.sbin/tcpdump/print-pflog.c b/usr.sbin/tcpdump/print-pflog.c
index f5855051e82..f42d5000144 100644
--- a/usr.sbin/tcpdump/print-pflog.c
+++ b/usr.sbin/tcpdump/print-pflog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-pflog.c,v 1.19 2009/04/06 12:09:06 henning Exp $ */
+/* $OpenBSD: print-pflog.c,v 1.20 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-pflog.c,v 1.19 2009/04/06 12:09:06 henning Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-pfsync.c b/usr.sbin/tcpdump/print-pfsync.c
index f54b4d6c9a6..79f9cf151df 100644
--- a/usr.sbin/tcpdump/print-pfsync.c
+++ b/usr.sbin/tcpdump/print-pfsync.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-pfsync.c,v 1.35 2009/03/31 01:21:29 dlg Exp $ */
+/* $OpenBSD: print-pfsync.c,v 1.36 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 2002 Michael Shalayeff
@@ -26,11 +26,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-pfsync.c,v 1.35 2009/03/31 01:21:29 dlg Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-pim.c b/usr.sbin/tcpdump/print-pim.c
index 05b514c18a4..342d9dcb47a 100644
--- a/usr.sbin/tcpdump/print-pim.c
+++ b/usr.sbin/tcpdump/print-pim.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-pim.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-pim.c,v 1.5 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1995, 1996
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-pim.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-ppp.c b/usr.sbin/tcpdump/print-ppp.c
index 50048942a95..7654d538938 100644
--- a/usr.sbin/tcpdump/print-ppp.c
+++ b/usr.sbin/tcpdump/print-ppp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ppp.c,v 1.20 2008/10/10 15:24:24 claudio Exp $ */
+/* $OpenBSD: print-ppp.c,v 1.21 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-ppp.c,v 1.20 2008/10/10 15:24:24 claudio Exp $ (LBL)";
-#endif
-
#ifdef PPP
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/print-raw.c b/usr.sbin/tcpdump/print-raw.c
index 1af4f0d4d24..ba46f884d7f 100644
--- a/usr.sbin/tcpdump/print-raw.c
+++ b/usr.sbin/tcpdump/print-raw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-raw.c,v 1.5 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-raw.c,v 1.6 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1996
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-raw.c,v 1.5 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-rip.c b/usr.sbin/tcpdump/print-rip.c
index ab3ca64c651..60e1e3c273b 100644
--- a/usr.sbin/tcpdump/print-rip.c
+++ b/usr.sbin/tcpdump/print-rip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-rip.c,v 1.11 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-rip.c,v 1.12 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1989, 1990, 1991, 1993, 1994, 1996
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-rip.c,v 1.11 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-ripng.c b/usr.sbin/tcpdump/print-ripng.c
index dda0af337ae..aee45c201f4 100644
--- a/usr.sbin/tcpdump/print-ripng.c
+++ b/usr.sbin/tcpdump/print-ripng.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ripng.c,v 1.1 2000/04/26 21:35:42 jakob Exp $ */
+/* $OpenBSD: print-ripng.c,v 1.2 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1989, 1990, 1991, 1993, 1994
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#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)";
-#endif
-
#ifdef INET6
#include <sys/param.h>
diff --git a/usr.sbin/tcpdump/print-rt6.c b/usr.sbin/tcpdump/print-rt6.c
index 4c8371479a4..0b926e67002 100644
--- a/usr.sbin/tcpdump/print-rt6.c
+++ b/usr.sbin/tcpdump/print-rt6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-rt6.c,v 1.2 2007/05/06 09:56:45 claudio Exp $ */
+/* $OpenBSD: print-rt6.c,v 1.3 2009/10/27 23:59:55 deraadt Exp $ */
/*
@@ -22,11 +22,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#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)";
-#endif
-
#ifdef INET6
#include <sys/param.h>
diff --git a/usr.sbin/tcpdump/print-sl.c b/usr.sbin/tcpdump/print-sl.c
index 3842de53f87..3772d225df7 100644
--- a/usr.sbin/tcpdump/print-sl.c
+++ b/usr.sbin/tcpdump/print-sl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-sl.c,v 1.13 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-sl.c,v 1.14 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1989, 1990, 1991, 1993, 1994, 1995, 1996, 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-sl.c,v 1.13 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#ifdef HAVE_NET_SLIP_H
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/print-smb.c b/usr.sbin/tcpdump/print-smb.c
index 58917d14a54..c74a2742317 100644
--- a/usr.sbin/tcpdump/print-smb.c
+++ b/usr.sbin/tcpdump/print-smb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-smb.c,v 1.3 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-smb.c,v 1.4 2009/10/27 23:59:55 deraadt Exp $ */
/*
Copyright (C) Andrew Tridgell 1995-1999
@@ -11,11 +11,6 @@
#include "config.h"
#endif
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-smb.c,v 1.3 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
diff --git a/usr.sbin/tcpdump/print-snmp.c b/usr.sbin/tcpdump/print-snmp.c
index 32603168af3..1f63238a17a 100644
--- a/usr.sbin/tcpdump/print-snmp.c
+++ b/usr.sbin/tcpdump/print-snmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-snmp.c,v 1.15 2008/01/17 17:33:15 reyk Exp $ */
+/* $OpenBSD: print-snmp.c,v 1.16 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997
@@ -55,11 +55,6 @@
# @(#)snmp.awk.x 1.1 (LANL) 1/15/90
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-snmp.c,v 1.15 2008/01/17 17:33:15 reyk Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/print-sunrpc.c b/usr.sbin/tcpdump/print-sunrpc.c
index 9356951a9cf..fdcf642b990 100644
--- a/usr.sbin/tcpdump/print-sunrpc.c
+++ b/usr.sbin/tcpdump/print-sunrpc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-sunrpc.c,v 1.16 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-sunrpc.c,v 1.17 2009/10/27 23:59:55 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993, 1994, 1995, 1996
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-sunrpc.c,v 1.16 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-tcp.c b/usr.sbin/tcpdump/print-tcp.c
index 6a75bd99e24..f393d1aff25 100644
--- a/usr.sbin/tcpdump/print-tcp.c
+++ b/usr.sbin/tcpdump/print-tcp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-tcp.c,v 1.26 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-tcp.c,v 1.27 2009/10/27 23:59:56 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-tcp.c,v 1.26 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-tftp.c b/usr.sbin/tcpdump/print-tftp.c
index 4f7dd1da5e4..2d23e71bc93 100644
--- a/usr.sbin/tcpdump/print-tftp.c
+++ b/usr.sbin/tcpdump/print-tftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-tftp.c,v 1.9 2009/07/30 15:36:19 sthen Exp $ */
+/* $OpenBSD: print-tftp.c,v 1.10 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997
@@ -23,11 +23,6 @@
* Format and print trivial file transfer protocol packets.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-tftp.c,v 1.9 2009/07/30 15:36:19 sthen Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/print-timed.c b/usr.sbin/tcpdump/print-timed.c
index a711d224945..fa0713e9770 100644
--- a/usr.sbin/tcpdump/print-timed.c
+++ b/usr.sbin/tcpdump/print-timed.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-timed.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-timed.c,v 1.5 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 2000 Ben Smithurst <ben@scientia.demon.co.uk>
@@ -25,11 +25,6 @@
*
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-timed.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/usr.sbin/tcpdump/print-udp.c b/usr.sbin/tcpdump/print-udp.c
index 3156c404674..e84c1f5d568 100644
--- a/usr.sbin/tcpdump/print-udp.c
+++ b/usr.sbin/tcpdump/print-udp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-udp.c,v 1.30 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-udp.c,v 1.31 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-udp.c,v 1.30 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/usr.sbin/tcpdump/print-udpencap.c b/usr.sbin/tcpdump/print-udpencap.c
index cfdb69ae851..e9b88f4ec39 100644
--- a/usr.sbin/tcpdump/print-udpencap.c
+++ b/usr.sbin/tcpdump/print-udpencap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-udpencap.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-udpencap.c,v 1.5 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 2003 Markus Friedl. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-udpencap.c,v 1.4 2007/10/07 16:41:05 deraadt Exp $ (XXX)";
-#endif
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.sbin/tcpdump/print-vrrp.c b/usr.sbin/tcpdump/print-vrrp.c
index fe0c0531b00..226fceba8da 100644
--- a/usr.sbin/tcpdump/print-vrrp.c
+++ b/usr.sbin/tcpdump/print-vrrp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-vrrp.c,v 1.2 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-vrrp.c,v 1.3 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 2000 William C. Fenner.
@@ -28,11 +28,6 @@
* Header: /tcpdump/master/tcpdump/print-vrrp.c,v 1.3 2000/10/10 05:05:08 guy Exp
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-vrrp.c,v 1.2 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/usr.sbin/tcpdump/print-wb.c b/usr.sbin/tcpdump/print-wb.c
index b99130aaead..304ad43542a 100644
--- a/usr.sbin/tcpdump/print-wb.c
+++ b/usr.sbin/tcpdump/print-wb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-wb.c,v 1.7 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: print-wb.c,v 1.8 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1993, 1994, 1995, 1996
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: print-wb.c,v 1.7 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/types.h>
#include <sys/time.h>
diff --git a/usr.sbin/tcpdump/savestr.c b/usr.sbin/tcpdump/savestr.c
index 9bf84a00fec..f3cb5955f3e 100644
--- a/usr.sbin/tcpdump/savestr.c
+++ b/usr.sbin/tcpdump/savestr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: savestr.c,v 1.6 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: savestr.c,v 1.7 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: savestr.c,v 1.6 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.sbin/tcpdump/setsignal.c b/usr.sbin/tcpdump/setsignal.c
index fd27cb21723..2421ca87a54 100644
--- a/usr.sbin/tcpdump/setsignal.c
+++ b/usr.sbin/tcpdump/setsignal.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: setsignal.c,v 1.3 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: setsignal.c,v 1.4 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: setsignal.c,v 1.3 2007/10/07 16:41:05 deraadt Exp $ (LBL)";
-#endif
-
#include <sys/types.h>
#ifdef HAVE_MEMORY_H
diff --git a/usr.sbin/tcpdump/smbutil.c b/usr.sbin/tcpdump/smbutil.c
index 9207b9d777e..a060bff39b5 100644
--- a/usr.sbin/tcpdump/smbutil.c
+++ b/usr.sbin/tcpdump/smbutil.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smbutil.c,v 1.6 2007/10/07 16:41:05 deraadt Exp $ */
+/* $OpenBSD: smbutil.c,v 1.7 2009/10/27 23:59:57 deraadt Exp $ */
/*
Copyright (C) Andrew Tridgell 1995-1999
@@ -11,11 +11,6 @@
#include "config.h"
#endif
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: smbutil.c,v 1.6 2007/10/07 16:41:05 deraadt Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/types.h>
diff --git a/usr.sbin/tcpdump/tcpdump.c b/usr.sbin/tcpdump/tcpdump.c
index 81ee8f662d3..0a13c88f547 100644
--- a/usr.sbin/tcpdump/tcpdump.c
+++ b/usr.sbin/tcpdump/tcpdump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcpdump.c,v 1.61 2009/02/14 11:18:56 sthen Exp $ */
+/* $OpenBSD: tcpdump.c,v 1.62 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -21,14 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char copyright[] =
- "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997\n\
-The Regents of the University of California. All rights reserved.\n";
-static const char rcsid[] =
- "@(#) $Id: tcpdump.c,v 1.61 2009/02/14 11:18:56 sthen Exp $ (LBL)";
-#endif
-
/*
* tcpdump - monitor tcp/ip traffic on an ethernet.
*
diff --git a/usr.sbin/tcpdump/util.c b/usr.sbin/tcpdump/util.c
index d103c04193e..15921ff078d 100644
--- a/usr.sbin/tcpdump/util.c
+++ b/usr.sbin/tcpdump/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.24 2008/09/19 08:52:16 mpf Exp $ */
+/* $OpenBSD: util.c,v 1.25 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997
@@ -21,11 +21,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: util.c,v 1.24 2008/09/19 08:52:16 mpf Exp $ (LBL)";
-#endif
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/file.h>