summaryrefslogtreecommitdiff
path: root/usr.sbin/lpr
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/lpr')
-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
21 files changed, 21 insertions, 244 deletions
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