summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/ac/ac.c4
-rw-r--r--usr.sbin/accton/accton.c11
-rw-r--r--usr.sbin/amd/amd/amd.c8
-rw-r--r--usr.sbin/amd/amd/map.c7
-rw-r--r--usr.sbin/amd/amd/mapc.c7
-rw-r--r--usr.sbin/amd/amd/mntfs.c6
-rw-r--r--usr.sbin/amd/amd/nfs_ops.c7
-rw-r--r--usr.sbin/amd/amd/opts.c5
-rw-r--r--usr.sbin/amd/amd/restart.c5
-rw-r--r--usr.sbin/amd/amq/amq.c15
-rw-r--r--usr.sbin/amd/fsinfo/fsinfo.c8
-rw-r--r--usr.sbin/amd/include/am.h3
-rw-r--r--usr.sbin/amd/mk-amd-map/mk-amd-map.c15
-rw-r--r--usr.sbin/chroot/chroot.c16
-rw-r--r--usr.sbin/config/cmd.c6
-rw-r--r--usr.sbin/config/exec.c6
-rw-r--r--usr.sbin/config/exec_aout.c6
-rw-r--r--usr.sbin/config/exec_ecoff.c6
-rw-r--r--usr.sbin/config/exec_elf.c6
-rw-r--r--usr.sbin/config/main.c8
-rw-r--r--usr.sbin/config/misc.c6
-rw-r--r--usr.sbin/config/ukc.c6
-rw-r--r--usr.sbin/config/ukcutil.c6
-rw-r--r--usr.sbin/cron/atrun.c6
-rw-r--r--usr.sbin/cron/cron.c6
-rw-r--r--usr.sbin/cron/database.c6
-rw-r--r--usr.sbin/cron/do_command.c6
-rw-r--r--usr.sbin/cron/entry.c6
-rw-r--r--usr.sbin/cron/env.c6
-rw-r--r--usr.sbin/cron/job.c6
-rw-r--r--usr.sbin/cron/misc.c6
-rw-r--r--usr.sbin/cron/popen.c10
-rw-r--r--usr.sbin/cron/user.c6
-rw-r--r--usr.sbin/dev_mkdb/dev_mkdb.c13
-rw-r--r--usr.sbin/edquota/edquota.c11
-rw-r--r--usr.sbin/inetd/inetd.c13
-rw-r--r--usr.sbin/iostat/iostat.c17
-rw-r--r--usr.sbin/kgmon/kgmon.c13
-rw-r--r--usr.sbin/kvm_mkdb/kvm_mkdb.c16
-rw-r--r--usr.sbin/kvm_mkdb/nlist.c10
-rw-r--r--usr.sbin/kvm_mkdb/testdb.c10
-rw-r--r--usr.sbin/lpr/common_source/common.c10
-rw-r--r--usr.sbin/lpr/common_source/common_vars.c6
-rw-r--r--usr.sbin/lpr/common_source/displayq.c10
-rw-r--r--usr.sbin/lpr/common_source/rmjob.c10
-rw-r--r--usr.sbin/lpr/common_source/startdaemon.c10
-rw-r--r--usr.sbin/lpr/filters/lpf.c16
-rw-r--r--usr.sbin/lpr/lpc/cmds.c16
-rw-r--r--usr.sbin/lpr/lpc/cmdtab.c10
-rw-r--r--usr.sbin/lpr/lpc/lpc.c16
-rw-r--r--usr.sbin/lpr/lpd/key.c10
-rw-r--r--usr.sbin/lpr/lpd/lpd.c16
-rw-r--r--usr.sbin/lpr/lpd/lpdchar.c10
-rw-r--r--usr.sbin/lpr/lpd/modes.c10
-rw-r--r--usr.sbin/lpr/lpd/printjob.c13
-rw-r--r--usr.sbin/lpr/lpd/recvjob.c16
-rw-r--r--usr.sbin/lpr/lpd/ttcompat.c6
-rw-r--r--usr.sbin/lpr/lpq/lpq.c16
-rw-r--r--usr.sbin/lpr/lpr/lpr.c16
-rw-r--r--usr.sbin/lpr/lprm/lprm.c16
-rw-r--r--usr.sbin/lpr/lptest/lptest.c16
-rw-r--r--usr.sbin/lpr/pac/pac.c16
-rw-r--r--usr.sbin/mopd/common/cmp.c7
-rw-r--r--usr.sbin/mopd/common/device.c7
-rw-r--r--usr.sbin/mopd/common/dl.c7
-rw-r--r--usr.sbin/mopd/common/file.c7
-rw-r--r--usr.sbin/mopd/common/get.c7
-rw-r--r--usr.sbin/mopd/common/loop-bsd.c7
-rw-r--r--usr.sbin/mopd/common/mopdef.c7
-rw-r--r--usr.sbin/mopd/common/nma.c7
-rw-r--r--usr.sbin/mopd/common/pf.c7
-rw-r--r--usr.sbin/mopd/common/print.c7
-rw-r--r--usr.sbin/mopd/common/put.c7
-rw-r--r--usr.sbin/mopd/common/rc.c7
-rw-r--r--usr.sbin/mopd/mopa.out/mopa.out.c6
-rw-r--r--usr.sbin/mopd/mopchk/mopchk.c6
-rw-r--r--usr.sbin/mopd/mopd/mopd.c7
-rw-r--r--usr.sbin/mopd/mopd/process.c7
-rw-r--r--usr.sbin/mopd/mopprobe/mopprobe.c6
-rw-r--r--usr.sbin/mopd/moptrace/moptrace.c6
-rw-r--r--usr.sbin/mopd/otherOS/loop-linux2.c4
-rw-r--r--usr.sbin/mopd/otherOS/loop.c6
-rw-r--r--usr.sbin/mopd/otherOS/pf-snit.c6
-rw-r--r--usr.sbin/mrinfo/mrinfo.c8
-rw-r--r--usr.sbin/mrouted/main.c5
-rw-r--r--usr.sbin/mtrace/mtrace.c7
-rw-r--r--usr.sbin/mtree/compare.c10
-rw-r--r--usr.sbin/mtree/crc.c11
-rw-r--r--usr.sbin/mtree/create.c10
-rw-r--r--usr.sbin/mtree/mtree.c16
-rw-r--r--usr.sbin/mtree/spec.c10
-rw-r--r--usr.sbin/mtree/verify.c10
-rw-r--r--usr.sbin/netgroup_mkdb/netgroup_mkdb.c5
-rw-r--r--usr.sbin/netgroup_mkdb/str.c4
-rw-r--r--usr.sbin/netgroup_mkdb/util.c4
-rw-r--r--usr.sbin/portmap/portmap.c21
-rw-r--r--usr.sbin/pppd/auth.c10
-rw-r--r--usr.sbin/pppd/cbcp.c10
-rw-r--r--usr.sbin/pppd/ccp.c10
-rw-r--r--usr.sbin/pppd/chap.c10
-rw-r--r--usr.sbin/pppd/chap_ms.c10
-rw-r--r--usr.sbin/pppd/chat/chat.c10
-rw-r--r--usr.sbin/pppd/demand.c10
-rw-r--r--usr.sbin/pppd/fsm.c10
-rw-r--r--usr.sbin/pppd/ipcp.c10
-rw-r--r--usr.sbin/pppd/lcp.c10
-rw-r--r--usr.sbin/pppd/magic.c10
-rw-r--r--usr.sbin/pppd/main.c10
-rw-r--r--usr.sbin/pppd/options.c10
-rw-r--r--usr.sbin/pppd/pppstats/pppstats.c10
-rw-r--r--usr.sbin/pppd/sys-bsd.c10
-rw-r--r--usr.sbin/pppd/upap.c10
-rw-r--r--usr.sbin/pstat/pstat.c16
-rw-r--r--usr.sbin/pwd_mkdb/pwd_mkdb.c16
-rw-r--r--usr.sbin/quot/quot.c6
-rw-r--r--usr.sbin/quotaon/quotaon.c11
-rw-r--r--usr.sbin/rarpd/arptab.c10
-rw-r--r--usr.sbin/rarpd/rarpd.c12
-rw-r--r--usr.sbin/rbootd/bpf.c7
-rw-r--r--usr.sbin/rbootd/conf.c7
-rw-r--r--usr.sbin/rbootd/parseconf.c7
-rw-r--r--usr.sbin/rbootd/rbootd.c13
-rw-r--r--usr.sbin/rbootd/rmpproto.c7
-rw-r--r--usr.sbin/rbootd/utils.c7
-rw-r--r--usr.sbin/rdate/rdate.c9
-rw-r--r--usr.sbin/rdate/rfc868time.c10
-rw-r--r--usr.sbin/repquota/repquota.c11
-rw-r--r--usr.sbin/rmt/rmt.c13
-rw-r--r--usr.sbin/route6d/route6d.c6
-rw-r--r--usr.sbin/rpc.lockd/test.c7
-rw-r--r--usr.sbin/rwhod/rwhod.c11
-rw-r--r--usr.sbin/sa/main.c10
-rw-r--r--usr.sbin/sa/pdb.c6
-rw-r--r--usr.sbin/sa/usrdb.c6
-rw-r--r--usr.sbin/sliplogin/sliplogin.c11
-rw-r--r--usr.sbin/slstats/slstats.c6
-rw-r--r--usr.sbin/syslogd/syslogd.c16
-rw-r--r--usr.sbin/syslogd/ttymsg.c9
-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
-rw-r--r--usr.sbin/timed/timed/acksend.c6
-rw-r--r--usr.sbin/timed/timed/byteorder.c6
-rw-r--r--usr.sbin/timed/timed/candidate.c6
-rw-r--r--usr.sbin/timed/timed/cksum.c6
-rw-r--r--usr.sbin/timed/timed/correct.c6
-rw-r--r--usr.sbin/timed/timed/master.c6
-rw-r--r--usr.sbin/timed/timed/measure.c6
-rw-r--r--usr.sbin/timed/timed/networkdelta.c6
-rw-r--r--usr.sbin/timed/timed/readmsg.c6
-rw-r--r--usr.sbin/timed/timed/slave.c6
-rw-r--r--usr.sbin/timed/timed/timed.c12
-rw-r--r--usr.sbin/timed/timedc/cmds.c8
-rw-r--r--usr.sbin/timed/timedc/cmdtab.c6
-rw-r--r--usr.sbin/timed/timedc/timedc.c12
-rw-r--r--usr.sbin/traceroute/traceroute.c16
-rw-r--r--usr.sbin/traceroute6/traceroute6.c12
-rw-r--r--usr.sbin/trpt/trpt.c12
-rw-r--r--usr.sbin/vipw/vipw.c12
-rw-r--r--usr.sbin/ypbind/ypbind.c6
-rw-r--r--usr.sbin/yppoll/yppoll.c6
-rw-r--r--usr.sbin/ypserv/common/yplib_host.c6
-rw-r--r--usr.sbin/ypserv/makedbm/db.c6
-rw-r--r--usr.sbin/ypserv/makedbm/makedbm.c6
-rw-r--r--usr.sbin/ypserv/mkalias/mkalias.c6
-rw-r--r--usr.sbin/ypserv/mknetid/mknetid.c6
-rw-r--r--usr.sbin/ypserv/revnetgroup/hash.c6
-rw-r--r--usr.sbin/ypserv/revnetgroup/parse_netgroup.c6
-rw-r--r--usr.sbin/ypserv/revnetgroup/revnetgroup.c6
-rw-r--r--usr.sbin/ypserv/stdethers/stdethers.c6
-rw-r--r--usr.sbin/ypserv/stdhosts/stdhosts.c6
-rw-r--r--usr.sbin/ypserv/yppush/yppush.c6
-rw-r--r--usr.sbin/ypserv/yppush/yppush_err.c6
-rw-r--r--usr.sbin/ypserv/yppush/yppush_proc.c6
-rw-r--r--usr.sbin/ypserv/yppush/yppush_svc.c6
-rw-r--r--usr.sbin/ypserv/ypserv/acl.c6
-rw-r--r--usr.sbin/ypserv/ypserv/ypserv.c6
-rw-r--r--usr.sbin/ypserv/ypserv/ypserv_db.c6
-rw-r--r--usr.sbin/ypserv/ypserv/ypserv_proc.c6
-rw-r--r--usr.sbin/ypserv/yptest/yptest.c6
-rw-r--r--usr.sbin/ypserv/ypxfr/ypxfr.c6
-rw-r--r--usr.sbin/ypset/ypset.c6
244 files changed, 228 insertions, 1786 deletions
diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c
index ede3854c878..a0e7ae781e6 100644
--- a/usr.sbin/ac/ac.c
+++ b/usr.sbin/ac/ac.c
@@ -13,10 +13,6 @@
* other than his own.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: ac.c,v 1.19 2007/11/17 15:08:57 sobrado Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/file.h>
#include <sys/time.h>
diff --git a/usr.sbin/accton/accton.c b/usr.sbin/accton/accton.c
index 79529053752..241e7eedfbf 100644
--- a/usr.sbin/accton/accton.c
+++ b/usr.sbin/accton/accton.c
@@ -27,17 +27,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1988 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/* from: static char sccsid[] = "@(#)accton.c 4.3 (Berkeley) 6/1/90"; */
-static char *rcsid = "$Id: accton.c,v 1.7 2003/06/11 23:33:24 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <err.h>
#include <stdio.h>
diff --git a/usr.sbin/amd/amd/amd.c b/usr.sbin/amd/amd/amd.c
index dc2c76e5ccf..a71f5ea60d3 100644
--- a/usr.sbin/amd/amd/amd.c
+++ b/usr.sbin/amd/amd/amd.c
@@ -32,15 +32,9 @@
* SUCH DAMAGE.
*
* from: @(#)amd.c 8.1 (Berkeley) 6/6/93
- * $Id: amd.c,v 1.15 2009/08/12 13:21:17 deraadt Exp $
+ * $Id: amd.c,v 1.16 2009/10/27 23:59:50 deraadt Exp $
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
/*
* Automounter
*/
diff --git a/usr.sbin/amd/amd/map.c b/usr.sbin/amd/amd/map.c
index 358ec9ffdd5..187adbf8613 100644
--- a/usr.sbin/amd/amd/map.c
+++ b/usr.sbin/amd/amd/map.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: map.c,v 1.9 2007/11/27 16:22:14 martynas Exp $ */
+/* $OpenBSD: map.c,v 1.10 2009/10/27 23:59:50 deraadt Exp $ */
/*-
* Copyright (c) 1990 Jan-Simon Pendry
@@ -34,11 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)map.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$OpenBSD: map.c,v 1.9 2007/11/27 16:22:14 martynas Exp $";
-#endif /* not lint */
-
#include "am.h"
#include <unistd.h>
diff --git a/usr.sbin/amd/amd/mapc.c b/usr.sbin/amd/amd/mapc.c
index 21904f09e44..2d41bf39a27 100644
--- a/usr.sbin/amd/amd/mapc.c
+++ b/usr.sbin/amd/amd/mapc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mapc.c,v 1.12 2003/10/30 16:04:06 millert Exp $ */
+/* $OpenBSD: mapc.c,v 1.13 2009/10/27 23:59:50 deraadt Exp $ */
/*-
* Copyright (c) 1989 Jan-Simon Pendry
@@ -34,11 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)mapc.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: mapc.c,v 1.12 2003/10/30 16:04:06 millert Exp $";
-#endif /* not lint */
-
/*
* Mount map cache
*/
diff --git a/usr.sbin/amd/amd/mntfs.c b/usr.sbin/amd/amd/mntfs.c
index 57ffa1ac071..215bbb52f12 100644
--- a/usr.sbin/amd/amd/mntfs.c
+++ b/usr.sbin/amd/amd/mntfs.c
@@ -32,12 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)mntfs.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: mntfs.c,v 1.5 2003/06/02 23:36:51 millert Exp $";
-#endif /* not lint */
-
-
#include "am.h"
extern qelem mfhead;
diff --git a/usr.sbin/amd/amd/nfs_ops.c b/usr.sbin/amd/amd/nfs_ops.c
index 2a4a0d18117..239146f4ceb 100644
--- a/usr.sbin/amd/amd/nfs_ops.c
+++ b/usr.sbin/amd/amd/nfs_ops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_ops.c,v 1.18 2003/06/02 23:36:51 millert Exp $ */
+/* $OpenBSD: nfs_ops.c,v 1.19 2009/10/27 23:59:50 deraadt Exp $ */
/*-
* Copyright (c) 1990 Jan-Simon Pendry
@@ -34,11 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)nfs_ops.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$OpenBSD: nfs_ops.c,v 1.18 2003/06/02 23:36:51 millert Exp $";
-#endif /* not lint */
-
#include "am.h"
#include <sys/stat.h>
diff --git a/usr.sbin/amd/amd/opts.c b/usr.sbin/amd/amd/opts.c
index afd15bfe5ad..6452d637e4e 100644
--- a/usr.sbin/amd/amd/opts.c
+++ b/usr.sbin/amd/amd/opts.c
@@ -32,11 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)opts.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: opts.c,v 1.9 2003/06/02 23:36:51 millert Exp $";
-#endif /* not lint */
-
#include "am.h"
/*
diff --git a/usr.sbin/amd/amd/restart.c b/usr.sbin/amd/amd/restart.c
index a360e077079..2387e362259 100644
--- a/usr.sbin/amd/amd/restart.c
+++ b/usr.sbin/amd/amd/restart.c
@@ -32,11 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-/*static char sccsid[] = "from: @(#)restart.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: restart.c,v 1.4 2003/06/02 23:36:51 millert Exp $";
-#endif /* not lint */
-
#include "am.h"
/*
diff --git a/usr.sbin/amd/amq/amq.c b/usr.sbin/amd/amq/amq.c
index befac15f7db..706be15435f 100644
--- a/usr.sbin/amd/amq/amq.c
+++ b/usr.sbin/amd/amq/amq.c
@@ -32,26 +32,13 @@
* SUCH DAMAGE.
*
* from: @(#)amq.c 8.1 (Berkeley) 6/7/93
- * $Id: amq.c,v 1.12 2007/02/18 08:34:38 jmc Exp $
+ * $Id: amq.c,v 1.13 2009/10/27 23:59:50 deraadt Exp $
*/
/*
* Automounter query tool
*/
-#ifndef lint
-char copyright[] = "\
-@(#)Copyright (c) 1990 Jan-Simon Pendry\n\
-@(#)Copyright (c) 1990 Imperial College of Science, Technology & Medicine\n\
-@(#)Copyright (c) 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char rcsid[] = "$Id: amq.c,v 1.12 2007/02/18 08:34:38 jmc Exp $";
-static char sccsid[] = "@(#)amq.c 8.1 (Berkeley) 6/7/93";
-#endif /* not lint */
-
#include "am.h"
#include "amq.h"
#include <stdio.h>
diff --git a/usr.sbin/amd/fsinfo/fsinfo.c b/usr.sbin/amd/fsinfo/fsinfo.c
index 3c950b32371..b7c3821e3d6 100644
--- a/usr.sbin/amd/fsinfo/fsinfo.c
+++ b/usr.sbin/amd/fsinfo/fsinfo.c
@@ -32,15 +32,9 @@
* SUCH DAMAGE.
*
* from: @(#)fsinfo.c 8.1 (Berkeley) 6/6/93
- * $Id: fsinfo.c,v 1.8 2005/04/15 18:18:07 millert Exp $
+ * $Id: fsinfo.c,v 1.9 2009/10/27 23:59:51 deraadt Exp $
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
/*
* fsinfo
*/
diff --git a/usr.sbin/amd/include/am.h b/usr.sbin/amd/include/am.h
index f4436b08b73..a176b7e8b1f 100644
--- a/usr.sbin/amd/include/am.h
+++ b/usr.sbin/amd/include/am.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: am.h,v 1.11 2003/11/08 19:17:29 jmc Exp $ */
+/* $OpenBSD: am.h,v 1.12 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1990 Jan-Simon Pendry
@@ -118,7 +118,6 @@ extern char *karch; /* "sun4c" */
extern char *cluster; /* "r+d-kluster" */
extern char *endian; /* "big" */
extern char *auto_dir; /* "/a" */
-extern char copyright[]; /* Copyright info */
extern char version[]; /* Version info */
typedef struct am_ops am_ops;
diff --git a/usr.sbin/amd/mk-amd-map/mk-amd-map.c b/usr.sbin/amd/mk-amd-map/mk-amd-map.c
index 6d9c3336591..bf73019df85 100644
--- a/usr.sbin/amd/mk-amd-map/mk-amd-map.c
+++ b/usr.sbin/amd/mk-amd-map/mk-amd-map.c
@@ -32,26 +32,13 @@
* SUCH DAMAGE.
*
* from: @(#)mk-amd-map.c 8.1 (Berkeley) 6/28/93
- * $Id: mk-amd-map.c,v 1.9 2007/03/20 04:00:32 tedu Exp $
+ * $Id: mk-amd-map.c,v 1.10 2009/10/27 23:59:51 deraadt Exp $
*/
/*
* Convert a file map into an ndbm map
*/
-#ifndef lint
-char copyright[] = "\
-@(#)Copyright (c) 1990, 1993 Jan-Simon Pendry\n\
-@(#)Copyright (c) 1990 Imperial College of Science, Technology & Medicine\n\
-@(#)Copyright (c) 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char rcsid[] = "$Id: mk-amd-map.c,v 1.9 2007/03/20 04:00:32 tedu Exp $";
-static char sccsid[] = "@(#)mk-amd-map.c 8.1 (Berkeley) 6/28/93";
-#endif /* not lint */
-
#include "am.h"
#ifndef SIGINT
diff --git a/usr.sbin/chroot/chroot.c b/usr.sbin/chroot/chroot.c
index c7a5aca5e97..c9cd972a652 100644
--- a/usr.sbin/chroot/chroot.c
+++ b/usr.sbin/chroot/chroot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chroot.c,v 1.12 2005/05/23 22:52:04 henning Exp $ */
+/* $OpenBSD: chroot.c,v 1.13 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -29,20 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)chroot.c 8.1 (Berkeley) 6/9/93";
-#else
-static const char rcsid[] = "$OpenBSD: chroot.c,v 1.12 2005/05/23 22:52:04 henning Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <ctype.h>
#include <err.h>
diff --git a/usr.sbin/config/cmd.c b/usr.sbin/config/cmd.c
index d4a078d9352..3afe52373ae 100644
--- a/usr.sbin/config/cmd.c
+++ b/usr.sbin/config/cmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd.c,v 1.16 2009/06/03 21:42:16 beck Exp $ */
+/* $OpenBSD: cmd.c,v 1.17 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1999-2001 Mats O Jansson. All rights reserved.
@@ -24,10 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef LINT
-static char rcsid[] = "$OpenBSD: cmd.c,v 1.16 2009/06/03 21:42:16 beck Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/device.h>
#include <sys/time.h>
diff --git a/usr.sbin/config/exec.c b/usr.sbin/config/exec.c
index bcbbd5acacd..8bcfb7c5caa 100644
--- a/usr.sbin/config/exec.c
+++ b/usr.sbin/config/exec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec.c,v 1.6 2003/08/16 14:45:46 henning Exp $ */
+/* $OpenBSD: exec.c,v 1.7 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1999 Mats O Jansson. All rights reserved.
@@ -28,10 +28,6 @@
#include <sys/types.h>
#include <stdio.h>
-#ifndef LINT
-static char rcsid[] = "$OpenBSD: exec.c,v 1.6 2003/08/16 14:45:46 henning Exp $";
-#endif
-
#ifdef AOUT_SUPPORT
int aout_check(char *);
void aout_loadkernel(char *);
diff --git a/usr.sbin/config/exec_aout.c b/usr.sbin/config/exec_aout.c
index 00409258092..6b538f246a0 100644
--- a/usr.sbin/config/exec_aout.c
+++ b/usr.sbin/config/exec_aout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec_aout.c,v 1.9 2009/01/19 20:07:58 miod Exp $ */
+/* $OpenBSD: exec_aout.c,v 1.10 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1999 Mats O Jansson. All rights reserved.
@@ -24,10 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef LINT
-static char rcsid[] = "$OpenBSD: exec_aout.c,v 1.9 2009/01/19 20:07:58 miod Exp $";
-#endif
-
#include <err.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/usr.sbin/config/exec_ecoff.c b/usr.sbin/config/exec_ecoff.c
index acd0ebfdd26..e7230009272 100644
--- a/usr.sbin/config/exec_ecoff.c
+++ b/usr.sbin/config/exec_ecoff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec_ecoff.c,v 1.9 2003/09/26 17:00:27 deraadt Exp $ */
+/* $OpenBSD: exec_ecoff.c,v 1.10 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1999 Mats O Jansson. All rights reserved.
@@ -24,10 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef LINT
-static char rcsid[] = "$OpenBSD: exec_ecoff.c,v 1.9 2003/09/26 17:00:27 deraadt Exp $";
-#endif
-
#include <err.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/usr.sbin/config/exec_elf.c b/usr.sbin/config/exec_elf.c
index c2bb4ab38b9..f84ef4c9fed 100644
--- a/usr.sbin/config/exec_elf.c
+++ b/usr.sbin/config/exec_elf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec_elf.c,v 1.11 2008/08/12 09:44:26 otto Exp $ */
+/* $OpenBSD: exec_elf.c,v 1.12 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1999 Mats O Jansson. All rights reserved.
@@ -24,10 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef LINT
-static char rcsid[] = "$OpenBSD: exec_elf.c,v 1.11 2008/08/12 09:44:26 otto Exp $";
-#endif
-
#include <err.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index 0a9f027aeac..b25eca58861 100644
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.40 2008/10/03 13:01:26 deraadt Exp $ */
+/* $OpenBSD: main.c,v 1.41 2009/10/27 23:59:51 deraadt Exp $ */
/* $NetBSD: main.c,v 1.22 1997/02/02 21:12:33 thorpej Exp $ */
/*
@@ -41,12 +41,6 @@
* from: @(#)main.c 8.1 (Berkeley) 6/6/93
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/param.h>
diff --git a/usr.sbin/config/misc.c b/usr.sbin/config/misc.c
index 4eea2190c64..9f465baf8b6 100644
--- a/usr.sbin/config/misc.c
+++ b/usr.sbin/config/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.7 2007/09/11 16:30:59 gilles Exp $ */
+/* $OpenBSD: misc.c,v 1.8 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -25,10 +25,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef LINT
-static char rcsid[] = "$OpenBSD: misc.c,v 1.7 2007/09/11 16:30:59 gilles Exp $";
-#endif
-
#include <sys/types.h>
#include <err.h>
#include <stdio.h>
diff --git a/usr.sbin/config/ukc.c b/usr.sbin/config/ukc.c
index 9bb33998742..27d6e3bf506 100644
--- a/usr.sbin/config/ukc.c
+++ b/usr.sbin/config/ukc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ukc.c,v 1.14 2007/06/28 00:52:37 ray Exp $ */
+/* $OpenBSD: ukc.c,v 1.15 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1999-2001 Mats O Jansson. All rights reserved.
@@ -24,10 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef LINT
-static char rcsid[] = "$OpenBSD: ukc.c,v 1.14 2007/06/28 00:52:37 ray Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/device.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/config/ukcutil.c b/usr.sbin/config/ukcutil.c
index c800a7eeb09..7d0d5299f0d 100644
--- a/usr.sbin/config/ukcutil.c
+++ b/usr.sbin/config/ukcutil.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ukcutil.c,v 1.17 2008/03/24 21:35:03 maja Exp $ */
+/* $OpenBSD: ukcutil.c,v 1.18 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1999-2001 Mats O Jansson. All rights reserved.
@@ -24,10 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef LINT
-static char rcsid[] = "$OpenBSD: ukcutil.c,v 1.17 2008/03/24 21:35:03 maja Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/device.h>
diff --git a/usr.sbin/cron/atrun.c b/usr.sbin/cron/atrun.c
index a9b28ee335c..bace65599f2 100644
--- a/usr.sbin/cron/atrun.c
+++ b/usr.sbin/cron/atrun.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: atrun.c,v 1.15 2006/08/13 20:44:00 millert Exp $ */
+/* $OpenBSD: atrun.c,v 1.16 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 2002-2003 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -20,10 +20,6 @@
* Materiel Command, USAF, under agreement number F39502-99-1-0512.
*/
-#if !defined(lint) && !defined(LINT)
-static const char rcsid[] = "$OpenBSD: atrun.c,v 1.15 2006/08/13 20:44:00 millert Exp $";
-#endif
-
#include "cron.h"
#include <limits.h>
#include <sys/resource.h>
diff --git a/usr.sbin/cron/cron.c b/usr.sbin/cron/cron.c
index 208c4865c25..7a4442adf9b 100644
--- a/usr.sbin/cron/cron.c
+++ b/usr.sbin/cron/cron.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cron.c,v 1.40 2009/01/29 22:50:16 sobrado Exp $ */
+/* $OpenBSD: cron.c,v 1.41 2009/10/27 23:59:51 deraadt Exp $ */
/* Copyright 1988,1990,1993,1994 by Paul Vixie
* All rights reserved
@@ -21,10 +21,6 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if !defined(lint) && !defined(LINT)
-static const char rcsid[] = "$OpenBSD: cron.c,v 1.40 2009/01/29 22:50:16 sobrado Exp $";
-#endif
-
#define MAIN_PROGRAM
#include "cron.h"
diff --git a/usr.sbin/cron/database.c b/usr.sbin/cron/database.c
index 3a571adc0ec..eb18c75090f 100644
--- a/usr.sbin/cron/database.c
+++ b/usr.sbin/cron/database.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: database.c,v 1.17 2007/03/28 16:49:25 millert Exp $ */
+/* $OpenBSD: database.c,v 1.18 2009/10/27 23:59:51 deraadt Exp $ */
/* Copyright 1988,1990,1993,1994 by Paul Vixie
* All rights reserved
@@ -21,10 +21,6 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if !defined(lint) && !defined(LINT)
-static char const rcsid[] = "$OpenBSD: database.c,v 1.17 2007/03/28 16:49:25 millert Exp $";
-#endif
-
/* vix 26jan87 [RCS has the log]
*/
diff --git a/usr.sbin/cron/do_command.c b/usr.sbin/cron/do_command.c
index d5892b9cd90..693e166cb87 100644
--- a/usr.sbin/cron/do_command.c
+++ b/usr.sbin/cron/do_command.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: do_command.c,v 1.32 2007/05/25 17:50:41 millert Exp $ */
+/* $OpenBSD: do_command.c,v 1.33 2009/10/27 23:59:51 deraadt Exp $ */
/* Copyright 1988,1990,1993,1994 by Paul Vixie
* All rights reserved
@@ -21,10 +21,6 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if !defined(lint) && !defined(LINT)
-static char const rcsid[] = "$OpenBSD: do_command.c,v 1.32 2007/05/25 17:50:41 millert Exp $";
-#endif
-
#include "cron.h"
static void child_process(entry *, user *);
diff --git a/usr.sbin/cron/entry.c b/usr.sbin/cron/entry.c
index 0d5b3357305..2574577b9d8 100644
--- a/usr.sbin/cron/entry.c
+++ b/usr.sbin/cron/entry.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: entry.c,v 1.30 2005/01/30 20:44:50 millert Exp $ */
+/* $OpenBSD: entry.c,v 1.31 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright 1988,1990,1993,1994 by Paul Vixie
@@ -22,10 +22,6 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if !defined(lint) && !defined(LINT)
-static char const rcsid[] = "$OpenBSD: entry.c,v 1.30 2005/01/30 20:44:50 millert Exp $";
-#endif
-
/* vix 26jan87 [RCS'd; rest of log is in RCS file]
* vix 01jan87 [added line-level error recovery]
* vix 31dec86 [added /step to the from-to range, per bob@acornrc]
diff --git a/usr.sbin/cron/env.c b/usr.sbin/cron/env.c
index 3d92bf37d72..2b71b3e9578 100644
--- a/usr.sbin/cron/env.c
+++ b/usr.sbin/cron/env.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: env.c,v 1.21 2008/02/29 23:33:29 deraadt Exp $ */
+/* $OpenBSD: env.c,v 1.22 2009/10/27 23:59:51 deraadt Exp $ */
/* Copyright 1988,1990,1993,1994 by Paul Vixie
* All rights reserved
@@ -21,10 +21,6 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if !defined(lint) && !defined(LINT)
-static char const rcsid[] = "$OpenBSD: env.c,v 1.21 2008/02/29 23:33:29 deraadt Exp $";
-#endif
-
#include "cron.h"
char **
diff --git a/usr.sbin/cron/job.c b/usr.sbin/cron/job.c
index 43915ce147f..2bc2c049122 100644
--- a/usr.sbin/cron/job.c
+++ b/usr.sbin/cron/job.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: job.c,v 1.7 2004/06/17 22:11:55 millert Exp $ */
+/* $OpenBSD: job.c,v 1.8 2009/10/27 23:59:51 deraadt Exp $ */
/* Copyright 1988,1990,1993,1994 by Paul Vixie
* All rights reserved
@@ -21,10 +21,6 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if !defined(lint) && !defined(LINT)
-static char const rcsid[] = "$OpenBSD: job.c,v 1.7 2004/06/17 22:11:55 millert Exp $";
-#endif
-
#include "cron.h"
typedef struct _job {
diff --git a/usr.sbin/cron/misc.c b/usr.sbin/cron/misc.c
index d97345a06a5..6d978d7de3f 100644
--- a/usr.sbin/cron/misc.c
+++ b/usr.sbin/cron/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.39 2008/01/05 16:59:06 chl Exp $ */
+/* $OpenBSD: misc.c,v 1.40 2009/10/27 23:59:51 deraadt Exp $ */
/* Copyright 1988,1990,1993,1994 by Paul Vixie
* All rights reserved
@@ -21,10 +21,6 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if !defined(lint) && !defined(LINT)
-static char const rcsid[] = "$OpenBSD: misc.c,v 1.39 2008/01/05 16:59:06 chl Exp $";
-#endif
-
/* vix 26jan87 [RCS has the rest of the log]
* vix 30dec86 [written]
*/
diff --git a/usr.sbin/cron/popen.c b/usr.sbin/cron/popen.c
index f02c2bb36ba..5cef5ddd791 100644
--- a/usr.sbin/cron/popen.c
+++ b/usr.sbin/cron/popen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: popen.c,v 1.20 2006/04/03 01:31:11 djm Exp $ */
+/* $OpenBSD: popen.c,v 1.21 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
@@ -37,14 +37,6 @@
* globbing stuff since we don't need it. also execvp instead of execv.
*/
-#ifndef lint
-#if 0
-static const sccsid[] = "@(#)popen.c 8.3 (Berkeley) 4/6/94";
-#else
-static const char rcsid[] = "$OpenBSD: popen.c,v 1.20 2006/04/03 01:31:11 djm Exp $";
-#endif
-#endif /* not lint */
-
#include "cron.h"
#define MAX_ARGV 100
diff --git a/usr.sbin/cron/user.c b/usr.sbin/cron/user.c
index facc0b18c33..29643f424bb 100644
--- a/usr.sbin/cron/user.c
+++ b/usr.sbin/cron/user.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: user.c,v 1.7 2004/06/17 22:11:55 millert Exp $ */
+/* $OpenBSD: user.c,v 1.8 2009/10/27 23:59:51 deraadt Exp $ */
/* Copyright 1988,1990,1993,1994 by Paul Vixie
* All rights reserved
@@ -21,10 +21,6 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#if !defined(lint) && !defined(LINT)
-static const char rcsid[] = "$OpenBSD: user.c,v 1.7 2004/06/17 22:11:55 millert Exp $";
-#endif
-
/* vix 26jan87 [log is in RCS file]
*/
diff --git a/usr.sbin/dev_mkdb/dev_mkdb.c b/usr.sbin/dev_mkdb/dev_mkdb.c
index 5048b999404..f979a50fc72 100644
--- a/usr.sbin/dev_mkdb/dev_mkdb.c
+++ b/usr.sbin/dev_mkdb/dev_mkdb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dev_mkdb.c,v 1.10 2005/04/04 09:03:07 deraadt Exp $ */
+/* $OpenBSD: dev_mkdb.c,v 1.11 2009/10/27 23:59:51 deraadt Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)dev_mkdb.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$Id: dev_mkdb.c,v 1.10 2005/04/04 09:03:07 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c
index 4b41f31890a..732ebd245e9 100644
--- a/usr.sbin/edquota/edquota.c
+++ b/usr.sbin/edquota/edquota.c
@@ -30,17 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)edquota.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: edquota.c,v 1.48 2007/10/17 20:02:33 deraadt Exp $";
-#endif /* not lint */
-
/*
* Disk quota editor.
*/
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index 2b0c9fd4a6c..12b42897c9b 100644
--- a/usr.sbin/inetd/inetd.c
+++ b/usr.sbin/inetd/inetd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: inetd.c,v 1.130 2008/07/28 15:42:07 claudio Exp $ */
+/* $OpenBSD: inetd.c,v 1.131 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1983,1991 The Regents of the University of California.
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static const char sccsid[] = "from: @(#)inetd.c 5.30 (Berkeley) 6/3/91";*/
-static const char rcsid[] = "$OpenBSD: inetd.c,v 1.130 2008/07/28 15:42:07 claudio Exp $";
-#endif /* not lint */
-
/*
* Inetd - Internet super-server
*
diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c
index 52c139dec09..8280b5b52a4 100644
--- a/usr.sbin/iostat/iostat.c
+++ b/usr.sbin/iostat/iostat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iostat.c,v 1.25 2007/02/18 20:41:34 jmc Exp $ */
+/* $OpenBSD: iostat.c,v 1.26 2009/10/27 23:59:51 deraadt Exp $ */
/* $NetBSD: iostat.c,v 1.10 1996/10/25 18:21:58 scottr Exp $ */
/*
@@ -62,21 +62,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1986, 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)iostat.c 8.2 (Berkeley) 1/26/94";
-#else
-static char *rcsid = "$NetBSD: iostat.c,v 1.10 1996/10/25 18:21:58 scottr Exp $"
-;
-#endif
-#endif /* not lint */
-
#include <sys/dkstat.h>
#include <sys/time.h>
diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c
index 0dd803ea300..7f4c8cf56a7 100644
--- a/usr.sbin/kgmon/kgmon.c
+++ b/usr.sbin/kgmon/kgmon.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kgmon.c,v 1.14 2007/11/26 09:28:34 martynas Exp $ */
+/* $OpenBSD: kgmon.c,v 1.15 2009/10/27 23:59:51 deraadt Exp $ */
/*
* Copyright (c) 1983, 1992, 1993
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1983, 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)kgmon.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$OpenBSD: kgmon.c,v 1.14 2007/11/26 09:28:34 martynas Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/file.h>
#include <sys/sysctl.h>
diff --git a/usr.sbin/kvm_mkdb/kvm_mkdb.c b/usr.sbin/kvm_mkdb/kvm_mkdb.c
index cb412cb5ed4..e33d110bcee 100644
--- a/usr.sbin/kvm_mkdb/kvm_mkdb.c
+++ b/usr.sbin/kvm_mkdb/kvm_mkdb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm_mkdb.c,v 1.16 2005/04/14 22:21:24 djm Exp $ */
+/* $OpenBSD: kvm_mkdb.c,v 1.17 2009/10/27 23:59:51 deraadt Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -29,20 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "from: @(#)kvm_mkdb.c 8.3 (Berkeley) 5/4/95";
-#else
-static const char rcsid[] = "$OpenBSD: kvm_mkdb.c,v 1.16 2005/04/14 22:21:24 djm Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.sbin/kvm_mkdb/nlist.c b/usr.sbin/kvm_mkdb/nlist.c
index d29339f8a8c..ff72014e63d 100644
--- a/usr.sbin/kvm_mkdb/nlist.c
+++ b/usr.sbin/kvm_mkdb/nlist.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nlist.c,v 1.37 2007/09/02 15:19:38 deraadt Exp $ */
+/* $OpenBSD: nlist.c,v 1.38 2009/10/27 23:59:51 deraadt Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "from: @(#)nlist.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: nlist.c,v 1.37 2007/09/02 15:19:38 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <a.out.h>
diff --git a/usr.sbin/kvm_mkdb/testdb.c b/usr.sbin/kvm_mkdb/testdb.c
index 2a7f325240c..c4c52ac5188 100644
--- a/usr.sbin/kvm_mkdb/testdb.c
+++ b/usr.sbin/kvm_mkdb/testdb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: testdb.c,v 1.7 2004/11/24 17:57:16 millert Exp $ */
+/* $OpenBSD: testdb.c,v 1.8 2009/10/27 23:59:51 deraadt Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "from: @(#)testdb.c 8.1 (Berkeley) 6/6/93";
-#else
-static char *rcsid = "$OpenBSD: testdb.c,v 1.7 2004/11/24 17:57:16 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c
index 3635ab3f129..bc7c88cf981 100644
--- a/usr.sbin/lpr/common_source/common.c
+++ b/usr.sbin/lpr/common_source/common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: common.c,v 1.32 2007/09/02 15:19:38 deraadt Exp $ */
+/* $OpenBSD: common.c,v 1.33 2009/10/27 23:59:51 deraadt Exp $ */
/* $NetBSD: common.c,v 1.21 2000/08/09 14:28:50 itojun Exp $ */
/*
@@ -35,14 +35,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)common.c 8.5 (Berkeley) 4/28/95";
-#else
-static const char rcsid[] = "$OpenBSD: common.c,v 1.32 2007/09/02 15:19:38 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/usr.sbin/lpr/common_source/common_vars.c b/usr.sbin/lpr/common_source/common_vars.c
index 44251400310..a7cdb5fb494 100644
--- a/usr.sbin/lpr/common_source/common_vars.c
+++ b/usr.sbin/lpr/common_source/common_vars.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: common_vars.c,v 1.3 2003/06/02 23:36:53 millert Exp $ */
+/* $OpenBSD: common_vars.c,v 1.4 2009/10/27 23:59:51 deraadt Exp $ */
/* $NetBSD: common.c,v 1.15 1999/09/26 10:32:27 mrg Exp $ */
/*
@@ -35,10 +35,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: common_vars.c,v 1.3 2003/06/02 23:36:53 millert Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include "pathnames.h"
diff --git a/usr.sbin/lpr/common_source/displayq.c b/usr.sbin/lpr/common_source/displayq.c
index d4b5f6f0ac8..2f37e6c758e 100644
--- a/usr.sbin/lpr/common_source/displayq.c
+++ b/usr.sbin/lpr/common_source/displayq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: displayq.c,v 1.30 2009/03/03 04:42:48 stevesk Exp $ */
+/* $OpenBSD: displayq.c,v 1.31 2009/10/27 23:59:51 deraadt Exp $ */
/* $NetBSD: displayq.c,v 1.21 2001/08/30 00:51:50 itojun Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)displayq.c 8.4 (Berkeley) 4/28/95";
-#else
-static const char rcsid[] = "$OpenBSD: displayq.c,v 1.30 2009/03/03 04:42:48 stevesk Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/file.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/lpr/common_source/rmjob.c b/usr.sbin/lpr/common_source/rmjob.c
index cc3373a6d67..3fb97b1281c 100644
--- a/usr.sbin/lpr/common_source/rmjob.c
+++ b/usr.sbin/lpr/common_source/rmjob.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rmjob.c,v 1.17 2007/04/07 21:12:12 stevesk Exp $ */
+/* $OpenBSD: rmjob.c,v 1.18 2009/10/27 23:59:51 deraadt Exp $ */
/* $NetBSD: rmjob.c,v 1.16 2000/04/16 14:43:58 mrg Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)rmjob.c 8.2 (Berkeley) 4/28/95";
-#else
-static const char rcsid[] = "$OpenBSD: rmjob.c,v 1.17 2007/04/07 21:12:12 stevesk Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <signal.h>
diff --git a/usr.sbin/lpr/common_source/startdaemon.c b/usr.sbin/lpr/common_source/startdaemon.c
index c264340b1fe..ca646693bb4 100644
--- a/usr.sbin/lpr/common_source/startdaemon.c
+++ b/usr.sbin/lpr/common_source/startdaemon.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: startdaemon.c,v 1.12 2007/05/01 16:32:06 stevesk Exp $ */
+/* $OpenBSD: startdaemon.c,v 1.13 2009/10/27 23:59:51 deraadt Exp $ */
/* $NetBSD: startdaemon.c,v 1.10 1998/07/18 05:04:39 lukem Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)startdaemon.c 8.2 (Berkeley) 4/17/94";
-#else
-static const char rcsid[] = "$OpenBSD: startdaemon.c,v 1.12 2007/05/01 16:32:06 stevesk Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/un.h>
diff --git a/usr.sbin/lpr/filters/lpf.c b/usr.sbin/lpr/filters/lpf.c
index 1a6f79d3da3..31f60b9f295 100644
--- a/usr.sbin/lpr/filters/lpf.c
+++ b/usr.sbin/lpr/filters/lpf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lpf.c,v 1.11 2004/04/14 20:52:20 millert Exp $ */
+/* $OpenBSD: lpf.c,v 1.12 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: lpf.c,v 1.8 2000/04/29 00:12:32 abs Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)lpf.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: lpf.c,v 1.11 2004/04/14 20:52:20 millert Exp $";
-#endif
-#endif /* not lint */
-
/*
* filter which reads the output of nroff and converts lines
* with ^H's to overwritten lines. Thus this works like 'ul'
diff --git a/usr.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c
index 04a8ef4bb41..6d787774d2a 100644
--- a/usr.sbin/lpr/lpc/cmds.c
+++ b/usr.sbin/lpr/lpc/cmds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmds.c,v 1.19 2007/04/07 21:57:26 stevesk Exp $ */
+/* $OpenBSD: cmds.c,v 1.20 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: cmds.c,v 1.12 1997/10/05 15:12:06 mrg Exp $ */
/*
@@ -31,20 +31,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)cmds.c 8.2 (Berkeley) 4/28/95";
-#else
-static const char rcsid[] = "$OpenBSD: cmds.c,v 1.19 2007/04/07 21:57:26 stevesk Exp $";
-#endif
-#endif /* not lint */
-
/*
* lpc -- line printer control program -- commands:
*/
diff --git a/usr.sbin/lpr/lpc/cmdtab.c b/usr.sbin/lpr/lpc/cmdtab.c
index 688996ed2ea..b9420b7f530 100644
--- a/usr.sbin/lpr/lpc/cmdtab.c
+++ b/usr.sbin/lpr/lpc/cmdtab.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmdtab.c,v 1.5 2003/06/02 23:36:53 millert Exp $ */
+/* $OpenBSD: cmdtab.c,v 1.6 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: cmdtab.c,v 1.4 1995/11/15 22:27:34 pk Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)cmdtab.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: cmdtab.c,v 1.5 2003/06/02 23:36:53 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/cdefs.h>
#include "lpc.h"
diff --git a/usr.sbin/lpr/lpc/lpc.c b/usr.sbin/lpr/lpc/lpc.c
index ac389b731ee..833a3369479 100644
--- a/usr.sbin/lpr/lpc/lpc.c
+++ b/usr.sbin/lpr/lpc/lpc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lpc.c,v 1.17 2004/09/30 18:20:06 millert Exp $ */
+/* $OpenBSD: lpc.c,v 1.18 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: lpc.c,v 1.11 2001/11/14 03:01:15 enami Exp $ */
/*
@@ -31,20 +31,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)lpc.c 8.3 (Berkeley) 4/28/95";
-#else
-static const char rcsid[] = "$OpenBSD: lpc.c,v 1.17 2004/09/30 18:20:06 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <dirent.h>
diff --git a/usr.sbin/lpr/lpd/key.c b/usr.sbin/lpr/lpd/key.c
index eb22e300d51..be14b708fe7 100644
--- a/usr.sbin/lpr/lpd/key.c
+++ b/usr.sbin/lpr/lpd/key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: key.c,v 1.6 2003/06/02 23:36:53 millert Exp $ */
+/* $OpenBSD: key.c,v 1.7 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: key.c,v 1.3 1997/10/20 08:08:28 scottr Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)key.c 8.3 (Berkeley) 4/2/94";
-#else
-static const char rcsid[] = "$OpenBSD: key.c,v 1.6 2003/06/02 23:36:53 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/types.h>
diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c
index 32314723374..9995eb222ad 100644
--- a/usr.sbin/lpr/lpd/lpd.c
+++ b/usr.sbin/lpr/lpd/lpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lpd.c,v 1.49 2008/05/26 06:30:35 otto Exp $ */
+/* $OpenBSD: lpd.c,v 1.50 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: lpd.c,v 1.33 2002/01/21 14:42:29 wiz Exp $ */
/*
@@ -31,20 +31,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)lpd.c 8.7 (Berkeley) 5/10/95";
-#else
-static const char rcsid[] = "$OpenBSD: lpd.c,v 1.49 2008/05/26 06:30:35 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* lpd -- line printer daemon.
*
diff --git a/usr.sbin/lpr/lpd/lpdchar.c b/usr.sbin/lpr/lpd/lpdchar.c
index a70dd2b1541..7ea79be211d 100644
--- a/usr.sbin/lpr/lpd/lpdchar.c
+++ b/usr.sbin/lpr/lpd/lpdchar.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lpdchar.c,v 1.5 2003/06/02 23:36:53 millert Exp $ */
+/* $OpenBSD: lpdchar.c,v 1.6 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: lpdchar.c,v 1.5 1997/07/17 05:44:32 mikel Exp $ */
/*
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)lpdchar.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: lpdchar.c,v 1.5 2003/06/02 23:36:53 millert Exp $";
-#endif
-#endif /* not lint */
-
/*
* Character set for line printer daemon
*/
diff --git a/usr.sbin/lpr/lpd/modes.c b/usr.sbin/lpr/lpd/modes.c
index 337de4736c9..b59fda51ad7 100644
--- a/usr.sbin/lpr/lpd/modes.c
+++ b/usr.sbin/lpr/lpd/modes.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: modes.c,v 1.6 2003/06/02 23:36:53 millert Exp $ */
+/* $OpenBSD: modes.c,v 1.7 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: modes.c,v 1.3 1997/10/20 08:08:31 scottr Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)modes.c 8.3 (Berkeley) 4/2/94";
-#else
-static const char rcsid[] = "$OpenBSD: modes.c,v 1.6 2003/06/02 23:36:53 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/types.h>
#include <stddef.h>
diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c
index 5df200c0ca3..6e46375afef 100644
--- a/usr.sbin/lpr/lpd/printjob.c
+++ b/usr.sbin/lpr/lpd/printjob.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: printjob.c,v 1.44 2007/09/10 14:29:53 tobias Exp $ */
+/* $OpenBSD: printjob.c,v 1.45 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: printjob.c,v 1.31 2002/01/21 14:42:30 wiz Exp $ */
/*
@@ -31,17 +31,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static const char sccsid[] = "@(#)printjob.c 8.7 (Berkeley) 5/10/95";
-#endif /* not lint */
-
-
/*
* printjob -- print jobs in the queue.
*
diff --git a/usr.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c
index d1a9b3b24a4..5ab57f223d2 100644
--- a/usr.sbin/lpr/lpd/recvjob.c
+++ b/usr.sbin/lpr/lpd/recvjob.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: recvjob.c,v 1.24 2008/09/02 00:14:23 deraadt Exp $ */
+/* $OpenBSD: recvjob.c,v 1.25 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: recvjob.c,v 1.14 2001/12/04 22:52:44 christos Exp $ */
/*
@@ -31,20 +31,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)recvjob.c 8.2 (Berkeley) 4/27/95";
-#else
-static const char rcsid[] = "$OpenBSD: recvjob.c,v 1.24 2008/09/02 00:14:23 deraadt Exp $";
-#endif
-#endif /* not lint */
-
/*
* Receive printer jobs from the network, queue them and
* start the printer daemon.
diff --git a/usr.sbin/lpr/lpd/ttcompat.c b/usr.sbin/lpr/lpd/ttcompat.c
index cf4f40d5684..ad5ac839f35 100644
--- a/usr.sbin/lpr/lpd/ttcompat.c
+++ b/usr.sbin/lpr/lpd/ttcompat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ttcompat.c,v 1.6 2003/06/02 23:36:53 millert Exp $ */
+/* $OpenBSD: ttcompat.c,v 1.7 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: ttcompat.c,v 1.9 1995/11/15 22:50:00 pk Exp $ */
/*
@@ -36,10 +36,6 @@
* originally from /sys/kern/tty_compat.c
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: ttcompat.c,v 1.6 2003/06/02 23:36:53 millert Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/types.h>
diff --git a/usr.sbin/lpr/lpq/lpq.c b/usr.sbin/lpr/lpq/lpq.c
index a1be85efb4a..5db0762eef4 100644
--- a/usr.sbin/lpr/lpq/lpq.c
+++ b/usr.sbin/lpr/lpq/lpq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lpq.c,v 1.18 2008/05/26 06:30:36 otto Exp $ */
+/* $OpenBSD: lpq.c,v 1.19 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: lpq.c,v 1.9 1999/12/07 14:54:47 mrg Exp $ */
/*
@@ -31,20 +31,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)lpq.c 8.3 (Berkeley) 5/10/95";
-#else
-static const char rcsid[] = "$OpenBSD: lpq.c,v 1.18 2008/05/26 06:30:36 otto Exp $";
-#endif
-#endif /* not lint */
-
/*
* Spool Queue examination program
*
diff --git a/usr.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c
index 83ffd06631b..831758cb882 100644
--- a/usr.sbin/lpr/lpr/lpr.c
+++ b/usr.sbin/lpr/lpr/lpr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lpr.c,v 1.41 2007/04/07 21:57:27 stevesk Exp $ */
+/* $OpenBSD: lpr.c,v 1.42 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: lpr.c,v 1.19 2000/10/11 20:23:52 is Exp $ */
/*
@@ -36,20 +36,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)lpr.c 8.4 (Berkeley) 4/28/95";
-#else
-static const char rcsid[] = "$OpenBSD: lpr.c,v 1.41 2007/04/07 21:57:27 stevesk Exp $";
-#endif
-#endif /* not lint */
-
/*
* lpr -- off line print
*
diff --git a/usr.sbin/lpr/lprm/lprm.c b/usr.sbin/lpr/lprm/lprm.c
index 2130a486079..0087be7c1f0 100644
--- a/usr.sbin/lpr/lprm/lprm.c
+++ b/usr.sbin/lpr/lprm/lprm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lprm.c,v 1.17 2007/02/16 13:34:58 jmc Exp $ */
+/* $OpenBSD: lprm.c,v 1.18 2009/10/27 23:59:52 deraadt Exp $ */
/* $$NetBSD: lprm.c,v 1.9 1999/08/16 03:12:32 simonb Exp $ */
/*
@@ -31,20 +31,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)lprm.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: lprm.c,v 1.17 2007/02/16 13:34:58 jmc Exp $";
-#endif
-#endif /* not lint */
-
/*
* lprm - remove the current user's spool entry
*
diff --git a/usr.sbin/lpr/lptest/lptest.c b/usr.sbin/lpr/lptest/lptest.c
index cca90fd067b..a8970c55071 100644
--- a/usr.sbin/lpr/lptest/lptest.c
+++ b/usr.sbin/lpr/lptest/lptest.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lptest.c,v 1.7 2003/06/02 23:36:53 millert Exp $ */
+/* $OpenBSD: lptest.c,v 1.8 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: lptest.c,v 1.6 1996/12/09 09:57:50 mrg Exp $ */
/*
@@ -31,20 +31,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)lptest.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: lptest.c,v 1.7 2003/06/02 23:36:53 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdlib.h>
#include <stdio.h>
diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c
index 894699eef0b..f1f2fffe3e1 100644
--- a/usr.sbin/lpr/pac/pac.c
+++ b/usr.sbin/lpr/pac/pac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pac.c,v 1.18 2007/09/02 15:19:39 deraadt Exp $ */
+/* $OpenBSD: pac.c,v 1.19 2009/10/27 23:59:52 deraadt Exp $ */
/* $NetBSD: pac.c,v 1.14 2000/04/27 13:40:18 msaitoh Exp $ */
/*
@@ -31,20 +31,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)pac.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: pac.c,v 1.18 2007/09/02 15:19:39 deraadt Exp $";
-#endif
-#endif /* not lint */
-
/*
* Do Printer accounting summary.
* Currently, usage is
diff --git a/usr.sbin/mopd/common/cmp.c b/usr.sbin/mopd/common/cmp.c
index 6942cb29dd5..74b1a83179b 100644
--- a/usr.sbin/mopd/common/cmp.c
+++ b/usr.sbin/mopd/common/cmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmp.c,v 1.8 2006/04/17 13:17:07 maja Exp $ */
+/* $OpenBSD: cmp.c,v 1.9 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: cmp.c,v 1.8 2006/04/17 13:17:07 maja Exp $";
-#endif
-
#include "os.h"
int
diff --git a/usr.sbin/mopd/common/device.c b/usr.sbin/mopd/common/device.c
index f916877112e..394719a8777 100644
--- a/usr.sbin/mopd/common/device.c
+++ b/usr.sbin/mopd/common/device.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: device.c,v 1.13 2006/04/17 16:23:01 deraadt Exp $ */
+/* $OpenBSD: device.c,v 1.14 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: device.c,v 1.13 2006/04/17 16:23:01 deraadt Exp $";
-#endif
-
#include "os.h"
#include "common/common.h"
#include "common/mopdef.h"
diff --git a/usr.sbin/mopd/common/dl.c b/usr.sbin/mopd/common/dl.c
index b9562916fb4..87cf6b87e28 100644
--- a/usr.sbin/mopd/common/dl.c
+++ b/usr.sbin/mopd/common/dl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dl.c,v 1.7 2006/04/17 13:17:07 maja Exp $ */
+/* $OpenBSD: dl.c,v 1.8 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: dl.c,v 1.7 2006/04/17 13:17:07 maja Exp $";
-#endif
-
#include "os.h"
#include "common/get.h"
#include "common/print.h"
diff --git a/usr.sbin/mopd/common/file.c b/usr.sbin/mopd/common/file.c
index c01566c21d3..b6838378c8b 100644
--- a/usr.sbin/mopd/common/file.c
+++ b/usr.sbin/mopd/common/file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: file.c,v 1.12 2006/05/11 05:18:38 maja Exp $ */
+/* $OpenBSD: file.c,v 1.13 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1995-96 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: file.c,v 1.12 2006/05/11 05:18:38 maja Exp $";
-#endif
-
#include "os.h"
#include "common/common.h"
#include "common/mopdef.h"
diff --git a/usr.sbin/mopd/common/get.c b/usr.sbin/mopd/common/get.c
index c3398fc46cb..f1329138603 100644
--- a/usr.sbin/mopd/common/get.c
+++ b/usr.sbin/mopd/common/get.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: get.c,v 1.7 2006/04/17 13:17:07 maja Exp $ */
+/* $OpenBSD: get.c,v 1.8 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-2006 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: get.c,v 1.7 2006/04/17 13:17:07 maja Exp $";
-#endif
-
#include <sys/types.h>
#include "common/mopdef.h"
diff --git a/usr.sbin/mopd/common/loop-bsd.c b/usr.sbin/mopd/common/loop-bsd.c
index 303cd15da11..9822038ae1b 100644
--- a/usr.sbin/mopd/common/loop-bsd.c
+++ b/usr.sbin/mopd/common/loop-bsd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: loop-bsd.c,v 1.12 2006/10/11 20:56:59 deraadt Exp $ */
+/* $OpenBSD: loop-bsd.c,v 1.13 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: loop-bsd.c,v 1.12 2006/10/11 20:56:59 deraadt Exp $";
-#endif
-
#include <errno.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.sbin/mopd/common/mopdef.c b/usr.sbin/mopd/common/mopdef.c
index d6850597428..45237cbf372 100644
--- a/usr.sbin/mopd/common/mopdef.c
+++ b/usr.sbin/mopd/common/mopdef.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mopdef.c,v 1.7 2006/04/17 13:17:07 maja Exp $ */
+/* $OpenBSD: mopdef.c,v 1.8 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1995 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: mopdef.c,v 1.7 2006/04/17 13:17:07 maja Exp $";
-#endif
-
#include <sys/types.h>
#define MOPDEF_SURPESS_EXTERN
diff --git a/usr.sbin/mopd/common/nma.c b/usr.sbin/mopd/common/nma.c
index 2e89bce5026..31884aa101a 100644
--- a/usr.sbin/mopd/common/nma.c
+++ b/usr.sbin/mopd/common/nma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nma.c,v 1.6 2006/04/17 13:17:07 maja Exp $ */
+/* $OpenBSD: nma.c,v 1.7 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1995 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: nma.c,v 1.6 2006/04/17 13:17:07 maja Exp $";
-#endif
-
#include <stddef.h>
#include "common/nmadef.h"
diff --git a/usr.sbin/mopd/common/pf.c b/usr.sbin/mopd/common/pf.c
index 7a1be9ca41a..e01cf27bec6 100644
--- a/usr.sbin/mopd/common/pf.c
+++ b/usr.sbin/mopd/common/pf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf.c,v 1.14 2006/04/20 08:52:52 maja Exp $ */
+/* $OpenBSD: pf.c,v 1.15 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -28,11 +28,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: pf.c,v 1.14 2006/04/20 08:52:52 maja Exp $";
-#endif
-
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
diff --git a/usr.sbin/mopd/common/print.c b/usr.sbin/mopd/common/print.c
index f6d0cf13dcd..0b881938f73 100644
--- a/usr.sbin/mopd/common/print.c
+++ b/usr.sbin/mopd/common/print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print.c,v 1.11 2006/04/20 08:52:52 maja Exp $ */
+/* $OpenBSD: print.c,v 1.12 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-96 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: print.c,v 1.11 2006/04/20 08:52:52 maja Exp $";
-#endif
-
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr.sbin/mopd/common/put.c b/usr.sbin/mopd/common/put.c
index 693fe3e646a..39da5d47293 100644
--- a/usr.sbin/mopd/common/put.c
+++ b/usr.sbin/mopd/common/put.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: put.c,v 1.7 2006/04/17 13:17:07 maja Exp $ */
+/* $OpenBSD: put.c,v 1.8 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-2006 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: put.c,v 1.7 2006/04/17 13:17:07 maja Exp $";
-#endif
-
#include <stddef.h>
#include <sys/types.h>
#include <time.h>
diff --git a/usr.sbin/mopd/common/rc.c b/usr.sbin/mopd/common/rc.c
index e390d10f718..5a38ba4088f 100644
--- a/usr.sbin/mopd/common/rc.c
+++ b/usr.sbin/mopd/common/rc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rc.c,v 1.7 2006/11/10 23:02:08 maja Exp $ */
+/* $OpenBSD: rc.c,v 1.8 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: rc.c,v 1.7 2006/11/10 23:02:08 maja Exp $";
-#endif
-
#include "os.h"
#include "common/get.h"
#include "common/print.h"
diff --git a/usr.sbin/mopd/mopa.out/mopa.out.c b/usr.sbin/mopd/mopa.out/mopa.out.c
index a0d6d2f2d11..adbc3d1d515 100644
--- a/usr.sbin/mopd/mopa.out/mopa.out.c
+++ b/usr.sbin/mopd/mopa.out/mopa.out.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mopa.out.c,v 1.9 2009/07/11 13:42:32 sobrado Exp $ */
+/* $OpenBSD: mopa.out.c,v 1.10 2009/10/27 23:59:52 deraadt Exp $ */
/* mopa.out - Convert a Unix format kernel into something that
* can be transferred via MOP.
@@ -47,10 +47,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: mopa.out.c,v 1.9 2009/07/11 13:42:32 sobrado Exp $";
-#endif
-
#include "os.h"
#include "common/common.h"
#include "common/mopdef.h"
diff --git a/usr.sbin/mopd/mopchk/mopchk.c b/usr.sbin/mopd/mopchk/mopchk.c
index 85b529c0dda..28b8806ef70 100644
--- a/usr.sbin/mopd/mopchk/mopchk.c
+++ b/usr.sbin/mopd/mopchk/mopchk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mopchk.c,v 1.13 2009/07/11 13:42:32 sobrado Exp $ */
+/* $OpenBSD: mopchk.c,v 1.14 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1995-96 Mats O Jansson. All rights reserved.
@@ -24,10 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: mopchk.c,v 1.13 2009/07/11 13:42:32 sobrado Exp $";
-#endif
-
/*
* mopchk - MOP Check Utility
*
diff --git a/usr.sbin/mopd/mopd/mopd.c b/usr.sbin/mopd/mopd/mopd.c
index 4d5684ccb48..a093c4610ce 100644
--- a/usr.sbin/mopd/mopd/mopd.c
+++ b/usr.sbin/mopd/mopd/mopd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mopd.c,v 1.16 2009/07/11 13:42:32 sobrado Exp $ */
+/* $OpenBSD: mopd.c,v 1.17 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-96 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: mopd.c,v 1.16 2009/07/11 13:42:32 sobrado Exp $";
-#endif
-
/*
* mopd - MOP Dump/Load Daemon
*
diff --git a/usr.sbin/mopd/mopd/process.c b/usr.sbin/mopd/mopd/process.c
index 67e2d68918d..524fdd49705 100644
--- a/usr.sbin/mopd/mopd/process.c
+++ b/usr.sbin/mopd/mopd/process.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: process.c,v 1.17 2006/04/29 16:26:56 maja Exp $ */
+/* $OpenBSD: process.c,v 1.18 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] =
- "$OpenBSD: process.c,v 1.17 2006/04/29 16:26:56 maja Exp $";
-#endif
-
#include "os.h"
#include "common/common.h"
#include "common/mopdef.h"
diff --git a/usr.sbin/mopd/mopprobe/mopprobe.c b/usr.sbin/mopd/mopprobe/mopprobe.c
index 6987c40346d..d7219a28319 100644
--- a/usr.sbin/mopd/mopprobe/mopprobe.c
+++ b/usr.sbin/mopd/mopprobe/mopprobe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mopprobe.c,v 1.11 2009/07/11 13:42:32 sobrado Exp $ */
+/* $OpenBSD: mopprobe.c,v 1.12 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-96 Mats O Jansson. All rights reserved.
@@ -24,10 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: mopprobe.c,v 1.11 2009/07/11 13:42:32 sobrado Exp $";
-#endif
-
/*
* mopprobe - MOP Probe Utility
*
diff --git a/usr.sbin/mopd/moptrace/moptrace.c b/usr.sbin/mopd/moptrace/moptrace.c
index 6278b927504..8083fc5959b 100644
--- a/usr.sbin/mopd/moptrace/moptrace.c
+++ b/usr.sbin/mopd/moptrace/moptrace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: moptrace.c,v 1.10 2009/07/11 13:42:32 sobrado Exp $ */
+/* $OpenBSD: moptrace.c,v 1.11 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -24,10 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: moptrace.c,v 1.10 2009/07/11 13:42:32 sobrado Exp $";
-#endif
-
/*
* moptrace - MOP Trace Utility
*
diff --git a/usr.sbin/mopd/otherOS/loop-linux2.c b/usr.sbin/mopd/otherOS/loop-linux2.c
index 50c3eeb4834..1fc9827c3ca 100644
--- a/usr.sbin/mopd/otherOS/loop-linux2.c
+++ b/usr.sbin/mopd/otherOS/loop-linux2.c
@@ -22,10 +22,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$Id: loop-linux2.c,v 1.6 2006/04/17 16:23:01 deraadt Exp $";
-#endif
-
#include <errno.h>
#include <stdlib.h>
#include <strings.h>
diff --git a/usr.sbin/mopd/otherOS/loop.c b/usr.sbin/mopd/otherOS/loop.c
index 72fc6540f20..58f06bbd3a7 100644
--- a/usr.sbin/mopd/otherOS/loop.c
+++ b/usr.sbin/mopd/otherOS/loop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: loop.c,v 1.7 2006/04/17 16:23:01 deraadt Exp $ */
+/* $OpenBSD: loop.c,v 1.8 2009/10/27 23:59:52 deraadt Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -24,10 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: loop.c,v 1.7 2006/04/17 16:23:01 deraadt Exp $";
-#endif
-
#include "os.h"
#include "common/common.h"
#include "common/mopdef.h"
diff --git a/usr.sbin/mopd/otherOS/pf-snit.c b/usr.sbin/mopd/otherOS/pf-snit.c
index bb54a32a529..c9c88ac41e2 100644
--- a/usr.sbin/mopd/otherOS/pf-snit.c
+++ b/usr.sbin/mopd/otherOS/pf-snit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf-snit.c,v 1.7 2006/04/17 16:23:01 deraadt Exp $ */
+/* $OpenBSD: pf-snit.c,v 1.8 2009/10/27 23:59:53 deraadt Exp $ */
/*
* Copyright (c) 1993-96 Mats O Jansson. All rights reserved.
@@ -24,10 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: pf-snit.c,v 1.7 2006/04/17 16:23:01 deraadt Exp $";
-#endif
-
#include <stdio.h>
#include <sys/types.h>
#include <sys/time.h>
diff --git a/usr.sbin/mrinfo/mrinfo.c b/usr.sbin/mrinfo/mrinfo.c
index 376f0450502..9dc0a6fdfba 100644
--- a/usr.sbin/mrinfo/mrinfo.c
+++ b/usr.sbin/mrinfo/mrinfo.c
@@ -74,14 +74,6 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] =
- "@(#) $OpenBSD: mrinfo.c,v 1.22 2007/09/02 15:19:39 deraadt Exp $";
-/* original rcsid:
- "@(#) Header: mrinfo.c,v 1.6 93/04/08 15:14:16 van Exp (LBL)";
-*/
-#endif
-
#include <string.h>
#include <netdb.h>
#include <sys/time.h>
diff --git a/usr.sbin/mrouted/main.c b/usr.sbin/mrouted/main.c
index 70cdc3679f4..a217940a862 100644
--- a/usr.sbin/mrouted/main.c
+++ b/usr.sbin/mrouted/main.c
@@ -24,11 +24,6 @@
#include <fcntl.h>
#include <util.h>
-#ifndef lint
-static char rcsid[] =
- "@(#) $Id: main.c,v 1.17 2007/02/18 21:04:14 jmc Exp $";
-#endif
-
extern char *configfilename;
char versionstring[100];
diff --git a/usr.sbin/mtrace/mtrace.c b/usr.sbin/mtrace/mtrace.c
index 86148eb7211..82b3f6b0131 100644
--- a/usr.sbin/mtrace/mtrace.c
+++ b/usr.sbin/mtrace/mtrace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mtrace.c,v 1.27 2009/04/16 20:13:13 sobrado Exp $ */
+/* $OpenBSD: mtrace.c,v 1.28 2009/10/27 23:59:53 deraadt Exp $ */
/* $NetBSD: mtrace.c,v 1.5 1995/12/10 10:57:15 mycroft Exp $ */
/*
@@ -51,11 +51,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] =
- "@(#) $Id: mtrace.c,v 1.27 2009/04/16 20:13:13 sobrado Exp $";
-#endif
-
#include <netdb.h>
#include <sys/time.h>
#include <memory.h>
diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c
index 6d0017dde53..adc121c0088 100644
--- a/usr.sbin/mtree/compare.c
+++ b/usr.sbin/mtree/compare.c
@@ -1,5 +1,5 @@
/* $NetBSD: compare.c,v 1.11 1996/09/05 09:56:48 mycroft Exp $ */
-/* $OpenBSD: compare.c,v 1.21 2005/08/10 00:42:09 millert Exp $ */
+/* $OpenBSD: compare.c,v 1.22 2009/10/27 23:59:53 deraadt Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)compare.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: compare.c,v 1.21 2005/08/10 00:42:09 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/usr.sbin/mtree/crc.c b/usr.sbin/mtree/crc.c
index 026c657f303..c33b8ac061b 100644
--- a/usr.sbin/mtree/crc.c
+++ b/usr.sbin/mtree/crc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crc.c,v 1.2 2004/08/01 18:32:20 deraadt Exp $ */
+/* $OpenBSD: crc.c,v 1.3 2009/10/27 23:59:53 deraadt Exp $ */
/* $NetBSD: crc.c,v 1.7 1996/02/27 21:29:53 jtc Exp $ */
/*-
@@ -33,15 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)crc.c 8.1 (Berkeley) 6/17/93";
-static char rcsid[] = "$NetBSD: crc.c,v 1.7 1996/02/27 21:29:53 jtc Exp $";
-#else
-static char rcsid[] = "$OpenBSD: crc.c,v 1.2 2004/08/01 18:32:20 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <unistd.h>
diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c
index 28a05d5a4db..21319a6fb4f 100644
--- a/usr.sbin/mtree/create.c
+++ b/usr.sbin/mtree/create.c
@@ -1,5 +1,5 @@
/* $NetBSD: create.c,v 1.11 1996/09/05 09:24:19 mycroft Exp $ */
-/* $OpenBSD: create.c,v 1.25 2005/08/10 00:42:09 millert Exp $ */
+/* $OpenBSD: create.c,v 1.26 2009/10/27 23:59:53 deraadt Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)create.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: create.c,v 1.25 2005/08/10 00:42:09 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <time.h>
diff --git a/usr.sbin/mtree/mtree.c b/usr.sbin/mtree/mtree.c
index 8e0f9a38413..af746d68342 100644
--- a/usr.sbin/mtree/mtree.c
+++ b/usr.sbin/mtree/mtree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mtree.c,v 1.19 2008/05/17 23:31:52 sobrado Exp $ */
+/* $OpenBSD: mtree.c,v 1.20 2009/10/27 23:59:53 deraadt Exp $ */
/* $NetBSD: mtree.c,v 1.7 1996/09/05 23:29:22 thorpej Exp $ */
/*-
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1989, 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)mtree.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: mtree.c,v 1.19 2008/05/17 23:31:52 sobrado Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <errno.h>
diff --git a/usr.sbin/mtree/spec.c b/usr.sbin/mtree/spec.c
index 27958df5375..2bf0a42c962 100644
--- a/usr.sbin/mtree/spec.c
+++ b/usr.sbin/mtree/spec.c
@@ -1,5 +1,5 @@
/* $NetBSD: spec.c,v 1.6 1995/03/07 21:12:12 cgd Exp $ */
-/* $OpenBSD: spec.c,v 1.24 2008/06/13 20:47:29 espie Exp $ */
+/* $OpenBSD: spec.c,v 1.25 2009/10/27 23:59:53 deraadt Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)spec.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: spec.c,v 1.24 2008/06/13 20:47:29 espie Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <pwd.h>
diff --git a/usr.sbin/mtree/verify.c b/usr.sbin/mtree/verify.c
index 9c46384c569..763e5b9b53c 100644
--- a/usr.sbin/mtree/verify.c
+++ b/usr.sbin/mtree/verify.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: verify.c,v 1.18 2009/01/09 19:55:27 stsp Exp $ */
+/* $OpenBSD: verify.c,v 1.19 2009/10/27 23:59:53 deraadt Exp $ */
/* $NetBSD: verify.c,v 1.10 1995/03/07 21:26:28 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)verify.c 8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] = "$OpenBSD: verify.c,v 1.18 2009/01/09 19:55:27 stsp Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <dirent.h>
diff --git a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
index 2e630d9ed41..3f7926abe1c 100644
--- a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
+++ b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netgroup_mkdb.c,v 1.14 2008/05/17 23:31:52 sobrado Exp $ */
+/* $OpenBSD: netgroup_mkdb.c,v 1.15 2009/10/27 23:59:53 deraadt Exp $ */
/*
* Copyright (c) 1994 Christos Zoulas
@@ -30,9 +30,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-#ifndef lint
-static char *rcsid = "$OpenBSD: netgroup_mkdb.c,v 1.14 2008/05/17 23:31:52 sobrado Exp $";
-#endif
#include <sys/types.h>
#include <sys/param.h>
diff --git a/usr.sbin/netgroup_mkdb/str.c b/usr.sbin/netgroup_mkdb/str.c
index e312103435a..748041b63e4 100644
--- a/usr.sbin/netgroup_mkdb/str.c
+++ b/usr.sbin/netgroup_mkdb/str.c
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char *rcsid = "$Id: str.c,v 1.3 2005/05/16 03:12:59 deraadt Exp $";
-#endif
-
/*
* Counted strings
*/
diff --git a/usr.sbin/netgroup_mkdb/util.c b/usr.sbin/netgroup_mkdb/util.c
index d315831c57d..1b4439d2fdc 100644
--- a/usr.sbin/netgroup_mkdb/util.c
+++ b/usr.sbin/netgroup_mkdb/util.c
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char *rcsid = "$Id: util.c,v 1.4 2005/05/16 03:12:59 deraadt Exp $";
-#endif
-
#include <err.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.sbin/portmap/portmap.c b/usr.sbin/portmap/portmap.c
index b76e8aee894..1eb21d78827 100644
--- a/usr.sbin/portmap/portmap.c
+++ b/usr.sbin/portmap/portmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: portmap.c,v 1.37 2009/05/20 20:37:43 thib Exp $ */
+/* $OpenBSD: portmap.c,v 1.38 2009/10/27 23:59:53 deraadt Exp $ */
/*-
* Copyright (c) 1996, 1997 Theo de Raadt (OpenBSD). All rights reserved.
@@ -30,25 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1990 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "from: @(#)portmap.c 5.4 (Berkeley) 4/19/91";
-#else
-static char rcsid[] = "$OpenBSD: portmap.c,v 1.37 2009/05/20 20:37:43 thib Exp $";
-#endif
-#endif /* not lint */
-
-/*
-@(#)portmap.c 2.3 88/08/11 4.0 RPCSRC
-static char sccsid[] = "@(#)portmap.c 1.32 87/08/06 Copyr 1984 Sun Micro";
-*/
-
/*
* portmap.c, Implements the program,version to port number mapping for
* rpc.
diff --git a/usr.sbin/pppd/auth.c b/usr.sbin/pppd/auth.c
index f303847e2f4..eb377517fdb 100644
--- a/usr.sbin/pppd/auth.c
+++ b/usr.sbin/pppd/auth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.c,v 1.30 2003/09/26 06:01:42 pvalchev Exp $ */
+/* $OpenBSD: auth.c,v 1.31 2009/10/27 23:59:53 deraadt Exp $ */
/*
* auth.c - PPP authentication and phase control.
@@ -73,14 +73,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: auth.c,v 1.37 1998/03/26 04:46:03 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: auth.c,v 1.30 2003/09/26 06:01:42 pvalchev Exp $";
-#endif
-#endif
-
#include <stdio.h>
#include <stddef.h>
#include <stdlib.h>
diff --git a/usr.sbin/pppd/cbcp.c b/usr.sbin/pppd/cbcp.c
index e89214f23b5..18d961a4296 100644
--- a/usr.sbin/pppd/cbcp.c
+++ b/usr.sbin/pppd/cbcp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cbcp.c,v 1.6 2004/11/03 03:33:11 danh Exp $ */
+/* $OpenBSD: cbcp.c,v 1.7 2009/10/27 23:59:53 deraadt Exp $ */
/*
* cbcp - Call Back Configuration Protocol.
@@ -30,14 +30,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: cbcp.c,v 1.2 1997/04/30 05:50:26 paulus Exp";
-#else
-static char rcsid[] = "$OpenBSD: cbcp.c,v 1.6 2004/11/03 03:33:11 danh Exp $";
-#endif
-#endif
-
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
diff --git a/usr.sbin/pppd/ccp.c b/usr.sbin/pppd/ccp.c
index 05526283776..70c205a0d80 100644
--- a/usr.sbin/pppd/ccp.c
+++ b/usr.sbin/pppd/ccp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ccp.c,v 1.12 2003/04/04 20:25:07 deraadt Exp $ */
+/* $OpenBSD: ccp.c,v 1.13 2009/10/27 23:59:53 deraadt Exp $ */
/*
* ccp.c - PPP Compression Control Protocol.
@@ -35,14 +35,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: ccp.c,v 1.22 1998/03/25 01:25:02 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: ccp.c,v 1.12 2003/04/04 20:25:07 deraadt Exp $";
-#endif
-#endif
-
#include <string.h>
#include <syslog.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/pppd/chap.c b/usr.sbin/pppd/chap.c
index 2eddac898bd..830b849d2ae 100644
--- a/usr.sbin/pppd/chap.c
+++ b/usr.sbin/pppd/chap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chap.c,v 1.12 2003/04/04 20:25:07 deraadt Exp $ */
+/* $OpenBSD: chap.c,v 1.13 2009/10/27 23:59:53 deraadt Exp $ */
/*
* chap.c - Challenge Handshake Authentication Protocol.
@@ -51,14 +51,6 @@
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: chap.c,v 1.15 1997/11/27 06:07:48 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: chap.c,v 1.12 2003/04/04 20:25:07 deraadt Exp $";
-#endif
-#endif
-
/*
* TODO:
*/
diff --git a/usr.sbin/pppd/chap_ms.c b/usr.sbin/pppd/chap_ms.c
index f808f09477e..d5cc0e342a6 100644
--- a/usr.sbin/pppd/chap_ms.c
+++ b/usr.sbin/pppd/chap_ms.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chap_ms.c,v 1.9 2004/06/29 22:04:44 millert Exp $ */
+/* $OpenBSD: chap_ms.c,v 1.10 2009/10/27 23:59:53 deraadt Exp $ */
/*
* chap_ms.c - Microsoft MS-CHAP compatible implementation.
@@ -41,14 +41,6 @@
* You should also use DOMAIN\\USERNAME as described in README.MSCHAP80
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: chap_ms.c,v 1.8 1998/04/01 00:15:43 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: chap_ms.c,v 1.9 2004/06/29 22:04:44 millert Exp $";
-#endif
-#endif
-
#ifdef CHAPMS
#include <stdio.h>
diff --git a/usr.sbin/pppd/chat/chat.c b/usr.sbin/pppd/chat/chat.c
index bcb7fad4a9f..1ac55b272b9 100644
--- a/usr.sbin/pppd/chat/chat.c
+++ b/usr.sbin/pppd/chat/chat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chat.c,v 1.26 2009/08/08 18:36:34 jmc Exp $ */
+/* $OpenBSD: chat.c,v 1.27 2009/10/27 23:59:53 deraadt Exp $ */
/*
* Chat -- a program for automatic session establishment (i.e. dial
@@ -79,14 +79,6 @@
*
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: chat.c,v 1.19 1998/03/24 23:57:48 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: chat.c,v 1.26 2009/08/08 18:36:34 jmc Exp $";
-#endif
-#endif
-
#include <stdio.h>
#include <ctype.h>
#include <time.h>
diff --git a/usr.sbin/pppd/demand.c b/usr.sbin/pppd/demand.c
index fb1f8180b7c..7f951fbae49 100644
--- a/usr.sbin/pppd/demand.c
+++ b/usr.sbin/pppd/demand.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: demand.c,v 1.8 2002/09/13 00:12:10 deraadt Exp $ */
+/* $OpenBSD: demand.c,v 1.9 2009/10/27 23:59:53 deraadt Exp $ */
/*
* demand.c - Support routines for demand-dialling.
@@ -35,14 +35,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: demand.c,v 1.7 1997/11/27 06:08:26 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: demand.c,v 1.8 2002/09/13 00:12:10 deraadt Exp $";
-#endif
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.sbin/pppd/fsm.c b/usr.sbin/pppd/fsm.c
index 0f572a7e178..0a95205bf4d 100644
--- a/usr.sbin/pppd/fsm.c
+++ b/usr.sbin/pppd/fsm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fsm.c,v 1.7 2002/07/01 19:31:37 deraadt Exp $ */
+/* $OpenBSD: fsm.c,v 1.8 2009/10/27 23:59:53 deraadt Exp $ */
/*
* fsm.c - {Link, IP} Control Protocol Finite State Machine.
@@ -42,14 +42,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: fsm.c,v 1.13 1997/04/30 05:52:17 paulus Exp";
-#else
-static char rcsid[] = "$OpenBSD: fsm.c,v 1.7 2002/07/01 19:31:37 deraadt Exp $";
-#endif
-#endif
-
/*
* TODO:
* Randomize fsm id on link/init.
diff --git a/usr.sbin/pppd/ipcp.c b/usr.sbin/pppd/ipcp.c
index 30de2b92ed6..34c921bf256 100644
--- a/usr.sbin/pppd/ipcp.c
+++ b/usr.sbin/pppd/ipcp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipcp.c,v 1.11 2003/07/18 22:58:56 david Exp $ */
+/* $OpenBSD: ipcp.c,v 1.12 2009/10/27 23:59:53 deraadt Exp $ */
/*
* ipcp.c - PPP IP Control Protocol.
@@ -42,14 +42,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: ipcp.c,v 1.34 1998/04/28 23:38:09 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: ipcp.c,v 1.11 2003/07/18 22:58:56 david Exp $";
-#endif
-#endif
-
/*
* TODO:
*/
diff --git a/usr.sbin/pppd/lcp.c b/usr.sbin/pppd/lcp.c
index a12c56c9162..278ea6cc637 100644
--- a/usr.sbin/pppd/lcp.c
+++ b/usr.sbin/pppd/lcp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lcp.c,v 1.9 2002/07/01 19:31:37 deraadt Exp $ */
+/* $OpenBSD: lcp.c,v 1.10 2009/10/27 23:59:53 deraadt Exp $ */
/*
* lcp.c - PPP Link Control Protocol.
@@ -42,14 +42,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: lcp.c,v 1.31 1997/11/27 06:08:44 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: lcp.c,v 1.9 2002/07/01 19:31:37 deraadt Exp $";
-#endif
-#endif
-
/*
* TODO:
*/
diff --git a/usr.sbin/pppd/magic.c b/usr.sbin/pppd/magic.c
index 39044c4b89e..265e55d572a 100644
--- a/usr.sbin/pppd/magic.c
+++ b/usr.sbin/pppd/magic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: magic.c,v 1.8 2002/07/01 19:31:37 deraadt Exp $ */
+/* $OpenBSD: magic.c,v 1.9 2009/10/27 23:59:53 deraadt Exp $ */
/*
* magic.c - PPP Magic Number routines.
@@ -42,14 +42,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: magic.c,v 1.7 1998/03/25 03:07:49 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: magic.c,v 1.8 2002/07/01 19:31:37 deraadt Exp $";
-#endif
-#endif
-
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
diff --git a/usr.sbin/pppd/main.c b/usr.sbin/pppd/main.c
index 5703590365c..55290d782db 100644
--- a/usr.sbin/pppd/main.c
+++ b/usr.sbin/pppd/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.47 2007/09/02 15:19:39 deraadt Exp $ */
+/* $OpenBSD: main.c,v 1.48 2009/10/27 23:59:53 deraadt Exp $ */
/*
* main.c - Point-to-Point Protocol main module
@@ -42,14 +42,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: main.c,v 1.49 1998/05/05 05:24:17 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.47 2007/09/02 15:19:39 deraadt Exp $";
-#endif
-#endif
-
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
diff --git a/usr.sbin/pppd/options.c b/usr.sbin/pppd/options.c
index 8dd3d7680e5..8dbcc133da2 100644
--- a/usr.sbin/pppd/options.c
+++ b/usr.sbin/pppd/options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options.c,v 1.23 2007/10/17 20:10:44 chl Exp $ */
+/* $OpenBSD: options.c,v 1.24 2009/10/27 23:59:53 deraadt Exp $ */
/*
* options.c - handles option processing for PPP.
@@ -42,14 +42,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: options.c,v 1.42 1998/03/26 04:46:06 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: options.c,v 1.23 2007/10/17 20:10:44 chl Exp $";
-#endif
-#endif
-
#include <ctype.h>
#include <stdio.h>
#include <errno.h>
diff --git a/usr.sbin/pppd/pppstats/pppstats.c b/usr.sbin/pppd/pppstats/pppstats.c
index 3c5923e23a1..0d0fde8840c 100644
--- a/usr.sbin/pppd/pppstats/pppstats.c
+++ b/usr.sbin/pppd/pppstats/pppstats.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pppstats.c,v 1.9 2007/02/18 21:20:08 jmc Exp $ */
+/* $OpenBSD: pppstats.c,v 1.10 2009/10/27 23:59:53 deraadt Exp $ */
/*
* print PPP statistics:
@@ -47,14 +47,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: pppstats.c,v 1.22 1998/03/31 23:48:03 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: pppstats.c,v 1.9 2007/02/18 21:20:08 jmc Exp $";
-#endif
-#endif
-
#include <stdio.h>
#include <stddef.h>
#include <stdlib.h>
diff --git a/usr.sbin/pppd/sys-bsd.c b/usr.sbin/pppd/sys-bsd.c
index 8be3b23f524..a13ed05b4a6 100644
--- a/usr.sbin/pppd/sys-bsd.c
+++ b/usr.sbin/pppd/sys-bsd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sys-bsd.c,v 1.25 2008/10/08 18:42:21 claudio Exp $ */
+/* $OpenBSD: sys-bsd.c,v 1.26 2009/10/27 23:59:53 deraadt Exp $ */
/*
* sys-bsd.c - System-dependent procedures for setting up
@@ -74,14 +74,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: sys-bsd.c,v 1.31 1998/04/02 12:04:19 paulus Exp $";
-#else
-static char rcsid[] = "$OpenBSD: sys-bsd.c,v 1.25 2008/10/08 18:42:21 claudio Exp $";
-#endif
-#endif
-
/*
* TODO:
*/
diff --git a/usr.sbin/pppd/upap.c b/usr.sbin/pppd/upap.c
index 191569bf4ef..4c8d32135c9 100644
--- a/usr.sbin/pppd/upap.c
+++ b/usr.sbin/pppd/upap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: upap.c,v 1.9 2002/07/01 19:31:37 deraadt Exp $ */
+/* $OpenBSD: upap.c,v 1.10 2009/10/27 23:59:53 deraadt Exp $ */
/*
* upap.c - User/Password Authentication Protocol.
@@ -42,14 +42,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-#if 0
-static char rcsid[] = "Id: upap.c,v 1.11 1997/04/30 05:59:56 paulus Exp";
-#else
-static char rcsid[] = "$OpenBSD: upap.c,v 1.9 2002/07/01 19:31:37 deraadt Exp $";
-#endif
-#endif
-
/*
* TODO:
*/
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index 266212f7456..6f92e801753 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pstat.c,v 1.76 2009/05/31 19:31:23 thib Exp $ */
+/* $OpenBSD: pstat.c,v 1.77 2009/10/27 23:59:53 deraadt Exp $ */
/* $NetBSD: pstat.c,v 1.27 1996/10/23 22:50:06 cgd Exp $ */
/*-
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-from: static char sccsid[] = "@(#)pstat.c 8.9 (Berkeley) 2/16/94";
-#else
-static char *rcsid = "$OpenBSD: pstat.c,v 1.76 2009/05/31 19:31:23 thib Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/buf.h>
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c
index 3393b06fba0..1a8e492d7fb 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pwd_mkdb.c,v 1.41 2009/10/04 18:11:35 ajacoutot Exp $ */
+/* $OpenBSD: pwd_mkdb.c,v 1.42 2009/10/27 23:59:54 deraadt Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -31,20 +31,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1991, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "from: @(#)pwd_mkdb.c 8.5 (Berkeley) 4/20/94";
-#else
-static const char rcsid[] = "$OpenBSD: pwd_mkdb.c,v 1.41 2009/10/04 18:11:35 ajacoutot Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c
index 047c89879c3..a9044ff8bbe 100644
--- a/usr.sbin/quot/quot.c
+++ b/usr.sbin/quot/quot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: quot.c,v 1.19 2008/03/17 20:30:17 sobrado Exp $ */
+/* $OpenBSD: quot.c,v 1.20 2009/10/27 23:59:54 deraadt Exp $ */
/*
* Copyright (C) 1991, 1994 Wolfgang Solfrank.
@@ -31,10 +31,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$Id: quot.c,v 1.19 2008/03/17 20:30:17 sobrado Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/time.h>
diff --git a/usr.sbin/quotaon/quotaon.c b/usr.sbin/quotaon/quotaon.c
index 5c08a047057..cbfce7e737b 100644
--- a/usr.sbin/quotaon/quotaon.c
+++ b/usr.sbin/quotaon/quotaon.c
@@ -30,17 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)quotaon.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: quotaon.c,v 1.22 2007/02/18 23:04:56 jmc Exp $";
-#endif /* not lint */
-
/*
* Turn quota on/off for a filesystem.
*/
diff --git a/usr.sbin/rarpd/arptab.c b/usr.sbin/rarpd/arptab.c
index be73e146cf7..e846bba1a8d 100644
--- a/usr.sbin/rarpd/arptab.c
+++ b/usr.sbin/rarpd/arptab.c
@@ -30,16 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1984, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)arp.c 8.2 (Berkeley) 1/2/94";
-#endif /* not lint */
-
/*
* set arp table entries
*/
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index 3ae0eab4a33..bdfadfb5bde 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rarpd.c,v 1.48 2008/05/17 23:31:52 sobrado Exp $ */
+/* $OpenBSD: rarpd.c,v 1.49 2009/10/27 23:59:54 deraadt Exp $ */
/* $NetBSD: rarpd.c,v 1.25 1998/04/23 02:48:33 mrg Exp $ */
/*
@@ -21,16 +21,6 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1990 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char rcsid[] = "$OpenBSD: rarpd.c,v 1.48 2008/05/17 23:31:52 sobrado Exp $";
-#endif
-
/*
* rarpd - Reverse ARP Daemon
diff --git a/usr.sbin/rbootd/bpf.c b/usr.sbin/rbootd/bpf.c
index 139dc6035e0..8b986ca7081 100644
--- a/usr.sbin/rbootd/bpf.c
+++ b/usr.sbin/rbootd/bpf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bpf.c,v 1.16 2004/05/10 20:50:21 canacar Exp $ */
+/* $OpenBSD: bpf.c,v 1.17 2009/10/27 23:59:54 deraadt Exp $ */
/* $NetBSD: bpf.c,v 1.5.2.1 1995/11/14 08:45:42 thorpej Exp $ */
/*
@@ -43,11 +43,6 @@
* Author: Jeff Forys, University of Utah CSS
*/
-#ifndef lint
-/*static char sccsid[] = "@(#)bpf.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: bpf.c,v 1.16 2004/05/10 20:50:21 canacar Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/usr.sbin/rbootd/conf.c b/usr.sbin/rbootd/conf.c
index d076431bdbb..90e53369f33 100644
--- a/usr.sbin/rbootd/conf.c
+++ b/usr.sbin/rbootd/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.6 2004/05/01 00:39:22 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.7 2009/10/27 23:59:54 deraadt Exp $ */
/* $NetBSD: conf.c,v 1.5 1995/10/06 05:12:13 thorpej Exp $ */
/*
@@ -43,11 +43,6 @@
* Author: Jeff Forys, University of Utah CSS
*/
-#ifndef lint
-/*static char sccsid[] = "@(#)conf.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: conf.c,v 1.6 2004/05/01 00:39:22 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/rbootd/parseconf.c b/usr.sbin/rbootd/parseconf.c
index 025cc104d23..cb9c282f4e6 100644
--- a/usr.sbin/rbootd/parseconf.c
+++ b/usr.sbin/rbootd/parseconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parseconf.c,v 1.9 2005/09/22 14:24:51 jmc Exp $ */
+/* $OpenBSD: parseconf.c,v 1.10 2009/10/27 23:59:54 deraadt Exp $ */
/* $NetBSD: parseconf.c,v 1.4 1995/10/06 05:12:16 thorpej Exp $ */
/*
@@ -43,11 +43,6 @@
* Author: Jeff Forys, University of Utah CSS
*/
-#ifndef lint
-/*static char sccsid[] = "@(#)parseconf.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: parseconf.c,v 1.9 2005/09/22 14:24:51 jmc Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.sbin/rbootd/rbootd.c b/usr.sbin/rbootd/rbootd.c
index 0ad8f8cc3e5..5f3695d8aa6 100644
--- a/usr.sbin/rbootd/rbootd.c
+++ b/usr.sbin/rbootd/rbootd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rbootd.c,v 1.22 2005/09/22 14:24:51 jmc Exp $ */
+/* $OpenBSD: rbootd.c,v 1.23 2009/10/27 23:59:54 deraadt Exp $ */
/* $NetBSD: rbootd.c,v 1.5 1995/10/06 05:12:17 thorpej Exp $ */
/*
@@ -43,17 +43,6 @@
* Author: Jeff Forys, University of Utah CSS
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "@(#)rbootd.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: rbootd.c,v 1.22 2005/09/22 14:24:51 jmc Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/rbootd/rmpproto.c b/usr.sbin/rbootd/rmpproto.c
index b6adab5bc25..809cf83ac43 100644
--- a/usr.sbin/rbootd/rmpproto.c
+++ b/usr.sbin/rbootd/rmpproto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rmpproto.c,v 1.9 2003/06/02 23:36:54 millert Exp $ */
+/* $OpenBSD: rmpproto.c,v 1.10 2009/10/27 23:59:54 deraadt Exp $ */
/* $NetBSD: rmpproto.c,v 1.5.2.1 1995/11/14 08:45:44 thorpej Exp $ */
/*
@@ -43,11 +43,6 @@
* Author: Jeff Forys, University of Utah CSS
*/
-#ifndef lint
-/*static char sccsid[] = "@(#)rmpproto.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: rmpproto.c,v 1.9 2003/06/02 23:36:54 millert Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/usr.sbin/rbootd/utils.c b/usr.sbin/rbootd/utils.c
index 428c85b9d68..eb22f6d870e 100644
--- a/usr.sbin/rbootd/utils.c
+++ b/usr.sbin/rbootd/utils.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: utils.c,v 1.9 2004/05/01 00:39:22 deraadt Exp $ */
+/* $OpenBSD: utils.c,v 1.10 2009/10/27 23:59:54 deraadt Exp $ */
/* $NetBSD: utils.c,v 1.5.2.1 1995/11/14 08:45:46 thorpej Exp $ */
/*
@@ -43,11 +43,6 @@
* Author: Jeff Forys, University of Utah CSS
*/
-#ifndef lint
-/*static char sccsid[] = "@(#)utils.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: utils.c,v 1.9 2004/05/01 00:39:22 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <fcntl.h>
diff --git a/usr.sbin/rdate/rdate.c b/usr.sbin/rdate/rdate.c
index 2ab9981419c..2f768d5f23c 100644
--- a/usr.sbin/rdate/rdate.c
+++ b/usr.sbin/rdate/rdate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rdate.c,v 1.23 2008/07/09 19:41:56 sobrado Exp $ */
+/* $OpenBSD: rdate.c,v 1.24 2009/10/27 23:59:54 deraadt Exp $ */
/* $NetBSD: rdate.c,v 1.4 1996/03/16 12:37:45 pk Exp $ */
/*
@@ -38,13 +38,6 @@
* Time is returned as the number of seconds since
* midnight January 1st 1900.
*/
-#ifndef lint
-#if 0
-from: static char rcsid[] = "$NetBSD: rdate.c,v 1.3 1996/02/22 06:59:18 thorpej Exp $";
-#else
-static const char rcsid[] = "$OpenBSD: rdate.c,v 1.23 2008/07/09 19:41:56 sobrado Exp $";
-#endif
-#endif /* lint */
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/usr.sbin/rdate/rfc868time.c b/usr.sbin/rdate/rfc868time.c
index f87a65f855d..59e83100832 100644
--- a/usr.sbin/rdate/rfc868time.c
+++ b/usr.sbin/rdate/rfc868time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rfc868time.c,v 1.6 2004/02/16 21:25:41 jakob Exp $ */
+/* $OpenBSD: rfc868time.c,v 1.7 2009/10/27 23:59:54 deraadt Exp $ */
/* $NetBSD: rdate.c,v 1.4 1996/03/16 12:37:45 pk Exp $ */
/*
@@ -39,14 +39,6 @@
* midnight January 1st 1900.
*/
-#ifndef lint
-#if 0
-from: static char rcsid[] = "$NetBSD: rdate.c,v 1.3 1996/02/22 06:59:18 thorpej Exp $";
-#else
-static const char rcsid[] = "$OpenBSD: rfc868time.c,v 1.6 2004/02/16 21:25:41 jakob Exp $";
-#endif
-#endif /* lint */
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/time.h>
diff --git a/usr.sbin/repquota/repquota.c b/usr.sbin/repquota/repquota.c
index c347b3ee8b2..39ecebde192 100644
--- a/usr.sbin/repquota/repquota.c
+++ b/usr.sbin/repquota/repquota.c
@@ -30,17 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)repquota.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: repquota.c,v 1.29 2007/09/07 14:23:55 mbalmer Exp $";
-#endif /* not lint */
-
/*
* Quota report
*/
diff --git a/usr.sbin/rmt/rmt.c b/usr.sbin/rmt/rmt.c
index cc5e196dc0c..6da32686053 100644
--- a/usr.sbin/rmt/rmt.c
+++ b/usr.sbin/rmt/rmt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rmt.c,v 1.12 2005/03/07 16:08:19 henning Exp $ */
+/* $OpenBSD: rmt.c,v 1.13 2009/10/27 23:59:54 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -29,17 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)rmt.c 5.6 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: rmt.c,v 1.12 2005/03/07 16:08:19 henning Exp $";
-#endif /* not lint */
-
/*
* rmt
*/
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c
index 0508ebf809d..00ba8e12a0f 100644
--- a/usr.sbin/route6d/route6d.c
+++ b/usr.sbin/route6d/route6d.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: route6d.c,v 1.54 2009/06/26 09:50:12 claudio Exp $ */
+/* $OpenBSD: route6d.c,v 1.55 2009/10/27 23:59:54 deraadt Exp $ */
/* $KAME: route6d.c,v 1.111 2006/10/25 06:38:13 jinmei Exp $ */
/*
@@ -30,10 +30,6 @@
* SUCH DAMAGE.
*/
-#if 0
-static char _rcsid[] = "$OpenBSD: route6d.c,v 1.54 2009/06/26 09:50:12 claudio Exp $";
-#endif
-
#include <stdio.h>
#include <time.h>
diff --git a/usr.sbin/rpc.lockd/test.c b/usr.sbin/rpc.lockd/test.c
index bdcda13ac17..11fb4febdb5 100644
--- a/usr.sbin/rpc.lockd/test.c
+++ b/usr.sbin/rpc.lockd/test.c
@@ -1,12 +1,7 @@
-/* $OpenBSD: test.c,v 1.4 2003/07/06 21:26:14 deraadt Exp $ */
+/* $OpenBSD: test.c,v 1.5 2009/10/27 23:59:54 deraadt Exp $ */
#include <rpc/rpc.h>
#include <rpcsvc/nlm_prot.h>
-#ifndef lint
-/*static char sccsid[] = "from: @(#)nlm_prot.x 1.8 87/09/21 Copyr 1987 Sun Micro";*/
-/*static char sccsid[] = "from: * @(#)nlm_prot.x 2.1 88/08/01 4.0 RPCSRC";*/
-static char rcsid[] = "nlm_prot.x,v 1.1 1994/08/04 19:01:48 wollman Exp";
-#endif /* not lint */
/* Default timeout can be changed using clnt_control() */
static struct timeval TIMEOUT = {0, 0};
diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c
index fc57baa63c8..5a77492d007 100644
--- a/usr.sbin/rwhod/rwhod.c
+++ b/usr.sbin/rwhod/rwhod.c
@@ -27,17 +27,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "@(#)rwhod.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: rwhod.c,v 1.32 2009/06/26 09:44:55 claudio Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/stat.h>
diff --git a/usr.sbin/sa/main.c b/usr.sbin/sa/main.c
index c0342d81173..741f84a9ef3 100644
--- a/usr.sbin/sa/main.c
+++ b/usr.sbin/sa/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.10 2005/05/04 09:02:54 jmc Exp $ */
+/* $OpenBSD: main.c,v 1.11 2009/10/27 23:59:54 deraadt Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
* All rights reserved.
@@ -29,14 +29,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef LINT
-static char copright[] =
-"@(#) Copyright (c) 1994 Christopher G. Demetriou\n\
- All rights reserved.\n";
-
-static char rcsid[] = "$Id: main.c,v 1.10 2005/05/04 09:02:54 jmc Exp $";
-#endif
-
/*
* sa: system accounting
*/
diff --git a/usr.sbin/sa/pdb.c b/usr.sbin/sa/pdb.c
index bce0183ad33..c8e82aed26b 100644
--- a/usr.sbin/sa/pdb.c
+++ b/usr.sbin/sa/pdb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pdb.c,v 1.7 2003/06/28 20:22:21 deraadt Exp $ */
+/* $OpenBSD: pdb.c,v 1.8 2009/10/27 23:59:54 deraadt Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
* All rights reserved.
@@ -29,10 +29,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef LINT
-static char rcsid[] = "$Id: pdb.c,v 1.7 2003/06/28 20:22:21 deraadt Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/acct.h>
#include <err.h>
diff --git a/usr.sbin/sa/usrdb.c b/usr.sbin/sa/usrdb.c
index cad4e043263..cd05b969df0 100644
--- a/usr.sbin/sa/usrdb.c
+++ b/usr.sbin/sa/usrdb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: usrdb.c,v 1.7 2003/06/28 20:22:21 deraadt Exp $ */
+/* $OpenBSD: usrdb.c,v 1.8 2009/10/27 23:59:54 deraadt Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
* All rights reserved.
@@ -29,10 +29,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef LINT
-static char rcsid[] = "$Id: usrdb.c,v 1.7 2003/06/28 20:22:21 deraadt Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/acct.h>
#include <err.h>
diff --git a/usr.sbin/sliplogin/sliplogin.c b/usr.sbin/sliplogin/sliplogin.c
index 2eddab16729..2555671bbf7 100644
--- a/usr.sbin/sliplogin/sliplogin.c
+++ b/usr.sbin/sliplogin/sliplogin.c
@@ -27,17 +27,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1990 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)sliplogin.c 5.6 (Berkeley) 3/2/91";*/
-static char rcsid[] = "$Id: sliplogin.c,v 1.28 2007/09/14 14:29:20 chl Exp $";
-#endif /* not lint */
-
/*
* sliplogin.c
* [MUST BE RUN SUID, SLOPEN DOES A SUSER()!]
diff --git a/usr.sbin/slstats/slstats.c b/usr.sbin/slstats/slstats.c
index 0b98bf08fba..cb07dc07543 100644
--- a/usr.sbin/slstats/slstats.c
+++ b/usr.sbin/slstats/slstats.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: slstats.c,v 1.20 2005/04/04 09:03:08 deraadt Exp $ */
+/* $OpenBSD: slstats.c,v 1.21 2009/10/27 23:59:54 deraadt Exp $ */
/* $NetBSD: slstats.c,v 1.6.6.1 1996/06/07 01:42:30 thorpej Exp $ */
/*
@@ -35,10 +35,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: slstats.c,v 1.20 2005/04/04 09:03:08 deraadt Exp $";
-#endif
-
#define INET
#include <sys/param.h>
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index 57725003bc3..cc9782b75df 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: syslogd.c,v 1.102 2008/09/29 18:42:54 deraadt Exp $ */
+/* $OpenBSD: syslogd.c,v 1.103 2009/10/27 23:59:54 deraadt Exp $ */
/*
* Copyright (c) 1983, 1988, 1993, 1994
@@ -29,20 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1988, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
-#else
-static const char rcsid[] = "$OpenBSD: syslogd.c,v 1.102 2008/09/29 18:42:54 deraadt Exp $";
-#endif
-#endif /* not lint */
-
/*
* syslogd -- log system messages
*
diff --git a/usr.sbin/syslogd/ttymsg.c b/usr.sbin/syslogd/ttymsg.c
index b88a3924b8b..72159af0050 100644
--- a/usr.sbin/syslogd/ttymsg.c
+++ b/usr.sbin/syslogd/ttymsg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ttymsg.c,v 1.3 2004/07/03 23:40:44 djm Exp $ */
+/* $OpenBSD: ttymsg.c,v 1.4 2009/10/27 23:59:54 deraadt Exp $ */
/* $NetBSD: ttymsg.c,v 1.3 1994/11/17 07:17:55 jtc Exp $ */
/*
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)ttymsg.c 8.2 (Berkeley) 11/16/93";
-#endif
-static const char rcsid[] = "$OpenBSD: ttymsg.c,v 1.3 2004/07/03 23:40:44 djm Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/uio.h>
#include <signal.h>
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>
diff --git a/usr.sbin/timed/timed/acksend.c b/usr.sbin/timed/timed/acksend.c
index 5c1bec0d71e..5672d7ee362 100644
--- a/usr.sbin/timed/timed/acksend.c
+++ b/usr.sbin/timed/timed/acksend.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acksend.c,v 1.6 2003/06/02 23:36:55 millert Exp $ */
+/* $OpenBSD: acksend.c,v 1.7 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)acksend.c 5.1 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#include "globals.h"
diff --git a/usr.sbin/timed/timed/byteorder.c b/usr.sbin/timed/timed/byteorder.c
index 89fb602efc6..6bd4f794a98 100644
--- a/usr.sbin/timed/timed/byteorder.c
+++ b/usr.sbin/timed/timed/byteorder.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: byteorder.c,v 1.5 2003/06/02 23:36:55 millert Exp $ */
+/* $OpenBSD: byteorder.c,v 1.6 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)byteorder.c 5.1 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#include "globals.h"
/*
diff --git a/usr.sbin/timed/timed/candidate.c b/usr.sbin/timed/timed/candidate.c
index e16768dd47a..264cc12b583 100644
--- a/usr.sbin/timed/timed/candidate.c
+++ b/usr.sbin/timed/timed/candidate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: candidate.c,v 1.6 2003/06/02 23:36:55 millert Exp $ */
+/* $OpenBSD: candidate.c,v 1.7 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)candidate.c 5.1 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#include "globals.h"
/*
diff --git a/usr.sbin/timed/timed/cksum.c b/usr.sbin/timed/timed/cksum.c
index 06ddda24f7b..b8040c1219e 100644
--- a/usr.sbin/timed/timed/cksum.c
+++ b/usr.sbin/timed/timed/cksum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cksum.c,v 1.5 2003/06/02 23:36:55 millert Exp $ */
+/* $OpenBSD: cksum.c,v 1.6 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)cksum.c 5.2 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#include <sys/types.h>
/*
diff --git a/usr.sbin/timed/timed/correct.c b/usr.sbin/timed/timed/correct.c
index 7c9b3943d21..a159ced26eb 100644
--- a/usr.sbin/timed/timed/correct.c
+++ b/usr.sbin/timed/timed/correct.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: correct.c,v 1.8 2003/06/02 23:36:55 millert Exp $ */
+/* $OpenBSD: correct.c,v 1.9 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)correct.c 5.1 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#include "globals.h"
#include <math.h>
#include <sys/types.h>
diff --git a/usr.sbin/timed/timed/master.c b/usr.sbin/timed/timed/master.c
index 4c95f92a576..dd8896079f0 100644
--- a/usr.sbin/timed/timed/master.c
+++ b/usr.sbin/timed/timed/master.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: master.c,v 1.9 2003/06/02 23:36:55 millert Exp $ */
+/* $OpenBSD: master.c,v 1.10 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)master.c 5.1 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#include "globals.h"
#include <sys/file.h>
#include <sys/types.h>
diff --git a/usr.sbin/timed/timed/measure.c b/usr.sbin/timed/timed/measure.c
index b11194a9164..34fbf792694 100644
--- a/usr.sbin/timed/timed/measure.c
+++ b/usr.sbin/timed/timed/measure.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: measure.c,v 1.13 2003/11/19 20:14:58 millert Exp $ */
+/* $OpenBSD: measure.c,v 1.14 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)measure.c 5.1 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#include "globals.h"
#include <netinet/in_systm.h>
#include <netinet/ip.h>
diff --git a/usr.sbin/timed/timed/networkdelta.c b/usr.sbin/timed/timed/networkdelta.c
index 4c70ba499f5..8962d55cba8 100644
--- a/usr.sbin/timed/timed/networkdelta.c
+++ b/usr.sbin/timed/timed/networkdelta.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: networkdelta.c,v 1.7 2003/06/12 21:09:48 deraadt Exp $ */
+/* $OpenBSD: networkdelta.c,v 1.8 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)networkdelta.c 5.1 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#include "globals.h"
static long median(float, float*, long*, long*, unsigned int);
diff --git a/usr.sbin/timed/timed/readmsg.c b/usr.sbin/timed/timed/readmsg.c
index 512869eba9e..8a71bf18ff0 100644
--- a/usr.sbin/timed/timed/readmsg.c
+++ b/usr.sbin/timed/timed/readmsg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readmsg.c,v 1.15 2003/11/19 19:17:59 dhartmei Exp $ */
+/* $OpenBSD: readmsg.c,v 1.16 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)readmsg.c 5.1 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#include "globals.h"
extern char *tsptype[];
diff --git a/usr.sbin/timed/timed/slave.c b/usr.sbin/timed/timed/slave.c
index 4df32931f75..982fe5b206b 100644
--- a/usr.sbin/timed/timed/slave.c
+++ b/usr.sbin/timed/timed/slave.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: slave.c,v 1.11 2003/08/19 19:41:21 deraadt Exp $ */
+/* $OpenBSD: slave.c,v 1.12 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)slave.c 5.1 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#include "globals.h"
#include <setjmp.h>
#include "pathnames.h"
diff --git a/usr.sbin/timed/timed/timed.c b/usr.sbin/timed/timed/timed.c
index fed9c0f5cc7..bd42eff30c3 100644
--- a/usr.sbin/timed/timed/timed.c
+++ b/usr.sbin/timed/timed/timed.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: timed.c,v 1.28 2008/03/17 16:29:25 sobrado Exp $ */
+/* $OpenBSD: timed.c,v 1.29 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1985, 1993 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)timed.c 5.1 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#define TSPTYPES
#include "globals.h"
#include <net/if.h>
diff --git a/usr.sbin/timed/timedc/cmds.c b/usr.sbin/timed/timedc/cmds.c
index 0f1ef82865e..04bf9d0f2dd 100644
--- a/usr.sbin/timed/timedc/cmds.c
+++ b/usr.sbin/timed/timedc/cmds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmds.c,v 1.20 2008/03/17 16:29:25 sobrado Exp $ */
+/* $OpenBSD: cmds.c,v 1.21 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,12 +29,8 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)cmds.c 5.1 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#ifdef sgi
-#ident "$Revision: 1.20 $"
+#ident "$Revision: 1.21 $"
#endif
#include "timedc.h"
diff --git a/usr.sbin/timed/timedc/cmdtab.c b/usr.sbin/timed/timedc/cmdtab.c
index 7cb957902eb..7c93deeffd5 100644
--- a/usr.sbin/timed/timedc/cmdtab.c
+++ b/usr.sbin/timed/timedc/cmdtab.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmdtab.c,v 1.4 2003/06/02 23:36:55 millert Exp $ */
+/* $OpenBSD: cmdtab.c,v 1.5 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -29,10 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char sccsid[] = "@(#)cmdtab.c 2.7 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#include "timedc.h"
char clockdiffhelp[] = "measures clock differences between machines";
diff --git a/usr.sbin/timed/timedc/timedc.c b/usr.sbin/timed/timedc/timedc.c
index 01c11781c09..94d085dc107 100644
--- a/usr.sbin/timed/timedc/timedc.c
+++ b/usr.sbin/timed/timedc/timedc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: timedc.c,v 1.13 2004/01/23 21:07:38 deraadt Exp $ */
+/* $OpenBSD: timedc.c,v 1.14 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1985, 1993 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)timedc.c 5.1 (Berkeley) 5/11/93";
-#endif /* not lint */
-
#include "timedc.h"
#include <string.h>
#include <signal.h>
diff --git a/usr.sbin/traceroute/traceroute.c b/usr.sbin/traceroute/traceroute.c
index 261988cb384..274ba3a7369 100644
--- a/usr.sbin/traceroute/traceroute.c
+++ b/usr.sbin/traceroute/traceroute.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: traceroute.c,v 1.67 2009/06/05 00:10:01 claudio Exp $ */
+/* $OpenBSD: traceroute.c,v 1.68 2009/10/27 23:59:57 deraadt Exp $ */
/* $NetBSD: traceroute.c,v 1.10 1995/05/21 15:50:45 mycroft Exp $ */
/*-
@@ -33,20 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)traceroute.c 8.1 (Berkeley) 6/6/93";*/
-#else
-static char rcsid[] = "$OpenBSD: traceroute.c,v 1.67 2009/06/05 00:10:01 claudio Exp $";
-#endif
-#endif /* not lint */
-
/*
* traceroute host - trace the route ip packets follow going to "host".
*
diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c
index af4a4b9c452..bad45a93211 100644
--- a/usr.sbin/traceroute6/traceroute6.c
+++ b/usr.sbin/traceroute6/traceroute6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: traceroute6.c,v 1.45 2008/03/24 16:11:06 deraadt Exp $ */
+/* $OpenBSD: traceroute6.c,v 1.46 2009/10/27 23:59:57 deraadt Exp $ */
/* $KAME: traceroute6.c,v 1.63 2002/10/24 12:53:25 itojun Exp $ */
/*
@@ -62,16 +62,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)traceroute.c 8.1 (Berkeley) 6/6/93";
-#endif /* not lint */
-
/*
* traceroute host - trace the route ip packets follow going to "host".
*
diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c
index 2fcd1dc12d8..f7aece1b50a 100644
--- a/usr.sbin/trpt/trpt.c
+++ b/usr.sbin/trpt/trpt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trpt.c,v 1.24 2008/06/26 05:42:21 ray Exp $ */
+/* $OpenBSD: trpt.c,v 1.25 2009/10/27 23:59:57 deraadt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -59,16 +59,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1983, 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)trpt.c 8.1 (Berkeley) 6/6/93";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/socket.h>
diff --git a/usr.sbin/vipw/vipw.c b/usr.sbin/vipw/vipw.c
index 012800221e6..a20421e047c 100644
--- a/usr.sbin/vipw/vipw.c
+++ b/usr.sbin/vipw/vipw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vipw.c,v 1.14 2007/11/17 16:09:29 millert Exp $ */
+/* $OpenBSD: vipw.c,v 1.15 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1987, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)vipw.c 8.3 (Berkeley) 4/2/94";
-#endif /* not lint */
-
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index 5be7afbeb35..4fdd29a4c38 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ypbind.c,v 1.58 2008/08/02 04:13:37 deraadt Exp $ */
+/* $OpenBSD: ypbind.c,v 1.59 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993, 1996, 1997, 1998 Theo de Raadt <deraadt@openbsd.org>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: ypbind.c,v 1.58 2008/08/02 04:13:37 deraadt Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/yppoll/yppoll.c b/usr.sbin/yppoll/yppoll.c
index 936a01c37d3..227c5ce0242 100644
--- a/usr.sbin/yppoll/yppoll.c
+++ b/usr.sbin/yppoll/yppoll.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yppoll.c,v 1.11 2007/02/18 23:32:02 jmc Exp $ */
+/* $OpenBSD: yppoll.c,v 1.12 2009/10/27 23:59:57 deraadt Exp $ */
/* $NetBSD: yppoll.c,v 1.5 1996/05/13 02:46:36 thorpej Exp $ */
/*
@@ -31,10 +31,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$Id: yppoll.c,v 1.11 2007/02/18 23:32:02 jmc Exp $";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.sbin/ypserv/common/yplib_host.c b/usr.sbin/ypserv/common/yplib_host.c
index d984265de1a..2cca2a0ff38 100644
--- a/usr.sbin/ypserv/common/yplib_host.c
+++ b/usr.sbin/ypserv/common/yplib_host.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yplib_host.c,v 1.15 2006/04/03 05:01:20 deraadt Exp $ */
+/* $OpenBSD: yplib_host.c,v 1.16 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt <deraadt@theos.com>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: yplib_host.c,v 1.15 2006/04/03 05:01:20 deraadt Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/usr.sbin/ypserv/makedbm/db.c b/usr.sbin/ypserv/makedbm/db.c
index a9f08d48c81..b57399f8280 100644
--- a/usr.sbin/ypserv/makedbm/db.c
+++ b/usr.sbin/ypserv/makedbm/db.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db.c,v 1.7 2006/04/03 05:01:22 deraadt Exp $ */
+/* $OpenBSD: db.c,v 1.8 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1997 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: db.c,v 1.7 2006/04/03 05:01:22 deraadt Exp $";
-#endif
-
#include <sys/types.h>
#include <db.h>
#include <fcntl.h>
diff --git a/usr.sbin/ypserv/makedbm/makedbm.c b/usr.sbin/ypserv/makedbm/makedbm.c
index 393779d8883..f819b752efa 100644
--- a/usr.sbin/ypserv/makedbm/makedbm.c
+++ b/usr.sbin/ypserv/makedbm/makedbm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: makedbm.c,v 1.28 2007/02/19 21:42:41 jmc Exp $ */
+/* $OpenBSD: makedbm.c,v 1.29 2009/10/27 23:59:57 deraadt Exp $ */
/*
* Copyright (c) 1994-97 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: makedbm.c,v 1.28 2007/02/19 21:42:41 jmc Exp $";
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
diff --git a/usr.sbin/ypserv/mkalias/mkalias.c b/usr.sbin/ypserv/mkalias/mkalias.c
index 11ede3a250c..55c7e784ede 100644
--- a/usr.sbin/ypserv/mkalias/mkalias.c
+++ b/usr.sbin/ypserv/mkalias/mkalias.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkalias.c,v 1.22 2009/10/20 09:47:03 sobrado Exp $ */
+/* $OpenBSD: mkalias.c,v 1.23 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1997 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: mkalias.c,v 1.22 2009/10/20 09:47:03 sobrado Exp $";
-#endif
-
#include <ctype.h>
#include <fcntl.h>
#include <netdb.h>
diff --git a/usr.sbin/ypserv/mknetid/mknetid.c b/usr.sbin/ypserv/mknetid/mknetid.c
index 0732fa63247..a901ad545aa 100644
--- a/usr.sbin/ypserv/mknetid/mknetid.c
+++ b/usr.sbin/ypserv/mknetid/mknetid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mknetid.c,v 1.16 2009/10/16 09:46:40 sobrado Exp $ */
+/* $OpenBSD: mknetid.c,v 1.17 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: mknetid.c,v 1.16 2009/10/16 09:46:40 sobrado Exp $";
-#endif
-
#include <sys/param.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/usr.sbin/ypserv/revnetgroup/hash.c b/usr.sbin/ypserv/revnetgroup/hash.c
index 40582a2ba65..1d97d45f55f 100644
--- a/usr.sbin/ypserv/revnetgroup/hash.c
+++ b/usr.sbin/ypserv/revnetgroup/hash.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hash.c,v 1.6 2006/04/03 05:01:23 deraadt Exp $ */
+/* $OpenBSD: hash.c,v 1.7 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -39,10 +39,6 @@
#include <sys/types.h>
#include "hash.h"
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: hash.c,v 1.6 2006/04/03 05:01:23 deraadt Exp $";
-#endif
-
/*
* This hash function is stolen directly from the
* Berkeley DB package. It already exists inside libc, but
diff --git a/usr.sbin/ypserv/revnetgroup/parse_netgroup.c b/usr.sbin/ypserv/revnetgroup/parse_netgroup.c
index 831a084b9cc..97ea08458e0 100644
--- a/usr.sbin/ypserv/revnetgroup/parse_netgroup.c
+++ b/usr.sbin/ypserv/revnetgroup/parse_netgroup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse_netgroup.c,v 1.11 2007/02/20 01:44:16 ray Exp $ */
+/* $OpenBSD: parse_netgroup.c,v 1.12 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -46,10 +46,6 @@
#include <unistd.h>
#include "hash.h"
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: parse_netgroup.c,v 1.11 2007/02/20 01:44:16 ray Exp $";
-#endif
-
/*
* Static Variables and functions used by setnetgrent(), getnetgrent() and
* __endnetgrent().
diff --git a/usr.sbin/ypserv/revnetgroup/revnetgroup.c b/usr.sbin/ypserv/revnetgroup/revnetgroup.c
index d6a938e7c8c..97113a9ac78 100644
--- a/usr.sbin/ypserv/revnetgroup/revnetgroup.c
+++ b/usr.sbin/ypserv/revnetgroup/revnetgroup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: revnetgroup.c,v 1.8 2009/10/20 11:01:31 sobrado Exp $ */
+/* $OpenBSD: revnetgroup.c,v 1.9 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1995
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -47,10 +47,6 @@
#include <err.h>
#include "hash.h"
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: revnetgroup.c,v 1.8 2009/10/20 11:01:31 sobrado Exp $";
-#endif
-
/* Default location of netgroup file. */
char *netgroup = "/etc/netgroup";
diff --git a/usr.sbin/ypserv/stdethers/stdethers.c b/usr.sbin/ypserv/stdethers/stdethers.c
index da1b754ef90..6d0e26e7dc5 100644
--- a/usr.sbin/ypserv/stdethers/stdethers.c
+++ b/usr.sbin/ypserv/stdethers/stdethers.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdethers.c,v 1.14 2006/04/03 05:01:23 deraadt Exp $ */
+/* $OpenBSD: stdethers.c,v 1.15 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1995 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: stdethers.c,v 1.14 2006/04/03 05:01:23 deraadt Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/socket.h>
#include <net/if.h>
diff --git a/usr.sbin/ypserv/stdhosts/stdhosts.c b/usr.sbin/ypserv/stdhosts/stdhosts.c
index 292ccb41e47..71787d6a9f0 100644
--- a/usr.sbin/ypserv/stdhosts/stdhosts.c
+++ b/usr.sbin/ypserv/stdhosts/stdhosts.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdhosts.c,v 1.15 2006/04/03 05:01:23 deraadt Exp $ */
+/* $OpenBSD: stdhosts.c,v 1.16 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: stdhosts.c,v 1.15 2006/04/03 05:01:23 deraadt Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/usr.sbin/ypserv/yppush/yppush.c b/usr.sbin/ypserv/yppush/yppush.c
index 0eb6ea8f295..f828d5b88d1 100644
--- a/usr.sbin/ypserv/yppush/yppush.c
+++ b/usr.sbin/ypserv/yppush/yppush.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yppush.c,v 1.26 2008/06/01 21:45:08 sobrado Exp $ */
+/* $OpenBSD: yppush.c,v 1.27 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1995 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: yppush.c,v 1.26 2008/06/01 21:45:08 sobrado Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/resource.h>
diff --git a/usr.sbin/ypserv/yppush/yppush_err.c b/usr.sbin/ypserv/yppush/yppush_err.c
index 074aaed8d75..e678052f9ee 100644
--- a/usr.sbin/ypserv/yppush/yppush_err.c
+++ b/usr.sbin/ypserv/yppush/yppush_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yppush_err.c,v 1.7 2003/07/15 06:10:46 deraadt Exp $ */
+/* $OpenBSD: yppush_err.c,v 1.8 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: yppush_err.c,v 1.7 2003/07/15 06:10:46 deraadt Exp $";
-#endif /* not lint */
-
#include <rpcsvc/yp.h>
#include "yppush.h"
diff --git a/usr.sbin/ypserv/yppush/yppush_proc.c b/usr.sbin/ypserv/yppush/yppush_proc.c
index 8e2309f3834..e147ab6edc4 100644
--- a/usr.sbin/ypserv/yppush/yppush_proc.c
+++ b/usr.sbin/ypserv/yppush/yppush_proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yppush_proc.c,v 1.8 2003/07/15 06:10:46 deraadt Exp $ */
+/* $OpenBSD: yppush_proc.c,v 1.9 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: yppush_proc.c,v 1.8 2003/07/15 06:10:46 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <rpcsvc/yp.h>
#include <stdio.h>
diff --git a/usr.sbin/ypserv/yppush/yppush_svc.c b/usr.sbin/ypserv/yppush/yppush_svc.c
index 60bcc903a9d..d54ac1046b8 100644
--- a/usr.sbin/ypserv/yppush/yppush_svc.c
+++ b/usr.sbin/ypserv/yppush/yppush_svc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yppush_svc.c,v 1.12 2006/04/03 05:01:23 deraadt Exp $ */
+/* $OpenBSD: yppush_svc.c,v 1.13 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: yppush_svc.c,v 1.12 2006/04/03 05:01:23 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/ttycom.h>
#include <sys/socket.h>
diff --git a/usr.sbin/ypserv/ypserv/acl.c b/usr.sbin/ypserv/ypserv/acl.c
index 82f220b12be..23a8a4a5ecd 100644
--- a/usr.sbin/ypserv/ypserv/acl.c
+++ b/usr.sbin/ypserv/ypserv/acl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acl.c,v 1.13 2006/04/03 05:01:23 deraadt Exp $ */
+/* $OpenBSD: acl.c,v 1.14 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: acl.c,v 1.13 2006/04/03 05:01:23 deraadt Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/usr.sbin/ypserv/ypserv/ypserv.c b/usr.sbin/ypserv/ypserv/ypserv.c
index fb38c253b1e..bd17d318278 100644
--- a/usr.sbin/ypserv/ypserv/ypserv.c
+++ b/usr.sbin/ypserv/ypserv/ypserv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ypserv.c,v 1.35 2007/02/18 23:34:57 jmc Exp $ */
+/* $OpenBSD: ypserv.c,v 1.36 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: ypserv.c,v 1.35 2007/02/18 23:34:57 jmc Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/ypserv/ypserv/ypserv_db.c b/usr.sbin/ypserv/ypserv/ypserv_db.c
index ffcbe2a0cef..24588d149eb 100644
--- a/usr.sbin/ypserv/ypserv/ypserv_db.c
+++ b/usr.sbin/ypserv/ypserv/ypserv_db.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ypserv_db.c,v 1.25 2007/05/29 21:11:10 maja Exp $ */
+/* $OpenBSD: ypserv_db.c,v 1.26 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: ypserv_db.c,v 1.25 2007/05/29 21:11:10 maja Exp $";
-#endif
-
/*
* major revision/cleanup of Mats' version
* done by Chuck Cranor <chuck@ccrc.wustl.edu>
diff --git a/usr.sbin/ypserv/ypserv/ypserv_proc.c b/usr.sbin/ypserv/ypserv/ypserv_proc.c
index aa5c0cad51d..174ce6006c3 100644
--- a/usr.sbin/ypserv/ypserv/ypserv_proc.c
+++ b/usr.sbin/ypserv/ypserv/ypserv_proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ypserv_proc.c,v 1.26 2006/09/25 05:59:28 otto Exp $ */
+/* $OpenBSD: ypserv_proc.c,v 1.27 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: ypserv_proc.c,v 1.26 2006/09/25 05:59:28 otto Exp $";
-#endif
-
#include <rpc/rpc.h>
#include <rpcsvc/yp.h>
#include "ypv1.h"
diff --git a/usr.sbin/ypserv/yptest/yptest.c b/usr.sbin/ypserv/yptest/yptest.c
index a6d64976c4a..ec9a2b12a42 100644
--- a/usr.sbin/ypserv/yptest/yptest.c
+++ b/usr.sbin/ypserv/yptest/yptest.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yptest.c,v 1.16 2006/04/03 05:01:24 deraadt Exp $ */
+/* $OpenBSD: yptest.c,v 1.17 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: yptest.c,v 1.16 2006/04/03 05:01:24 deraadt Exp $";
-#endif
-
#include <stdio.h>
#include <unistd.h>
#include <string.h>
diff --git a/usr.sbin/ypserv/ypxfr/ypxfr.c b/usr.sbin/ypserv/ypxfr/ypxfr.c
index 4a9a5d87cc3..6e2dc635679 100644
--- a/usr.sbin/ypserv/ypxfr/ypxfr.c
+++ b/usr.sbin/ypserv/ypxfr/ypxfr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ypxfr.c,v 1.36 2008/06/01 21:45:08 sobrado Exp $ */
+/* $OpenBSD: ypxfr.c,v 1.37 2009/10/27 23:59:58 deraadt Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: ypxfr.c,v 1.36 2008/06/01 21:45:08 sobrado Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/socket.h>
diff --git a/usr.sbin/ypset/ypset.c b/usr.sbin/ypset/ypset.c
index 3013210b408..59d9736659b 100644
--- a/usr.sbin/ypset/ypset.c
+++ b/usr.sbin/ypset/ypset.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ypset.c,v 1.18 2008/07/28 16:22:11 deraadt Exp $ */
+/* $OpenBSD: ypset.c,v 1.19 2009/10/27 23:59:58 deraadt Exp $ */
/* $NetBSD: ypset.c,v 1.8 1996/05/13 02:46:33 thorpej Exp $ */
/*
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: ypset.c,v 1.18 2008/07/28 16:22:11 deraadt Exp $";
-#endif
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/socket.h>