From ca5d3c4e6a5fe0da6dd8fce7798f3cc59b83cfae Mon Sep 17 00:00:00 2001
From: millert <millert@openbsd.org>
Date: Fri, 17 Jan 1997 16:12:33 +0000
Subject: [PATCH] Add OpenBSD tags (was in wrong dir for previous commit)

---
 usr.sbin/lpr/filters/Makefile | 3 ++-
 usr.sbin/lpr/filters/lpf.c    | 6 ++++++
 usr.sbin/lpr/lpc/Makefile     | 3 ++-
 usr.sbin/lpr/lpc/cmds.c       | 6 ++++++
 usr.sbin/lpr/lpc/cmdtab.c     | 6 ++++++
 usr.sbin/lpr/lpc/extern.h     | 2 ++
 usr.sbin/lpr/lpc/lpc.c        | 6 ++++++
 usr.sbin/lpr/lpc/lpc.h        | 2 ++
 usr.sbin/lpr/lpd/Makefile     | 3 ++-
 usr.sbin/lpr/lpd/extern.h     | 2 ++
 usr.sbin/lpr/lpd/key.c        | 4 ++--
 usr.sbin/lpr/lpd/lpd.c        | 6 +++++-
 usr.sbin/lpr/lpd/lpdchar.c    | 6 ++++++
 usr.sbin/lpr/lpd/modes.c      | 3 ++-
 usr.sbin/lpr/lpd/recvjob.c    | 6 ++++++
 usr.sbin/lpr/lpd/ttcompat.c   | 6 ++++++
 usr.sbin/lpr/lpq/Makefile     | 3 ++-
 usr.sbin/lpr/lpq/lpq.c        | 6 ++++++
 usr.sbin/lpr/lpr/Makefile     | 3 ++-
 usr.sbin/lpr/lpr/lpr.c        | 6 +++++-
 usr.sbin/lpr/lprm/Makefile    | 1 +
 usr.sbin/lpr/lprm/lprm.c      | 6 ++++++
 usr.sbin/lpr/lptest/Makefile  | 3 ++-
 usr.sbin/lpr/lptest/lptest.c  | 6 +++++-
 usr.sbin/lpr/pac/Makefile     | 3 ++-
 usr.sbin/lpr/pac/pac.c        | 6 +++++-
 26 files changed, 99 insertions(+), 14 deletions(-)

diff --git a/usr.sbin/lpr/filters/Makefile b/usr.sbin/lpr/filters/Makefile
index c9d5c4f0215..be835074fbb 100644
--- a/usr.sbin/lpr/filters/Makefile
+++ b/usr.sbin/lpr/filters/Makefile
@@ -1,4 +1,5 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
+#	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
+#	$OpenBSD: Makefile,v 1.2 1997/01/17 16:12:33 millert Exp $
 
 PROG=	lpf
 NOMAN=	noman
diff --git a/usr.sbin/lpr/filters/lpf.c b/usr.sbin/lpr/filters/lpf.c
index d96414690ea..4b9561693eb 100644
--- a/usr.sbin/lpr/filters/lpf.c
+++ b/usr.sbin/lpr/filters/lpf.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: lpf.c,v 1.3 1997/01/17 16:12:33 millert Exp $	*/
+
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -38,7 +40,11 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)lpf.c	8.1 (Berkeley) 6/6/93";
+#else
+static char rcsid[] = "$OpenBSD: lpf.c,v 1.3 1997/01/17 16:12:33 millert Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile
index c6cefebe698..419c5f33bb4 100644
--- a/usr.sbin/lpr/lpc/Makefile
+++ b/usr.sbin/lpr/lpc/Makefile
@@ -1,4 +1,5 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
+#	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
+#	$OpenBSD: Makefile,v 1.2 1997/01/17 16:12:34 millert Exp $
 
 PROG=	lpc
 CFLAGS+=-I${.CURDIR}/../common_source
diff --git a/usr.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c
index bb2e5c83cbb..e6489d11f59 100644
--- a/usr.sbin/lpr/lpc/cmds.c
+++ b/usr.sbin/lpr/lpc/cmds.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: cmds.c,v 1.8 1997/01/17 16:12:35 millert Exp $	*/
+
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -39,7 +41,11 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)cmds.c	8.2 (Berkeley) 4/28/95";
+#else
+static char rcsid[] = "$OpenBSD: cmds.c,v 1.8 1997/01/17 16:12:35 millert Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/lpc/cmdtab.c b/usr.sbin/lpr/lpc/cmdtab.c
index 7619791cdca..6b5a02ad4f0 100644
--- a/usr.sbin/lpr/lpc/cmdtab.c
+++ b/usr.sbin/lpr/lpc/cmdtab.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: cmdtab.c,v 1.2 1997/01/17 16:12:35 millert Exp $	*/
+
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -32,7 +34,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
+#else
+static char rcsid[] = "$OpenBSD: cmdtab.c,v 1.2 1997/01/17 16:12:35 millert Exp $";
+#endif
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/usr.sbin/lpr/lpc/extern.h b/usr.sbin/lpr/lpc/extern.h
index 1b807b132df..88624141133 100644
--- a/usr.sbin/lpr/lpc/extern.h
+++ b/usr.sbin/lpr/lpc/extern.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: extern.h,v 1.2 1997/01/17 16:12:36 millert Exp $	*/
+
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.sbin/lpr/lpc/lpc.c b/usr.sbin/lpr/lpc/lpc.c
index 5f898cbf6d5..9d5e155a695 100644
--- a/usr.sbin/lpr/lpc/lpc.c
+++ b/usr.sbin/lpr/lpc/lpc.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: lpc.c,v 1.5 1997/01/17 16:12:37 millert Exp $	*/
+
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -39,7 +41,11 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)lpc.c	8.3 (Berkeley) 4/28/95";
+#else
+static char rcsid[] = "$OpenBSD: lpc.c,v 1.5 1997/01/17 16:12:37 millert Exp $";
+#endif
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/lpr/lpc/lpc.h b/usr.sbin/lpr/lpc/lpc.h
index 5e7120315f5..bc5378e7ecd 100644
--- a/usr.sbin/lpr/lpc/lpc.h
+++ b/usr.sbin/lpr/lpc/lpc.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: lpc.h,v 1.2 1997/01/17 16:12:38 millert Exp $	*/
+
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile
index 58c4a679b50..5bc1260e801 100644
--- a/usr.sbin/lpr/lpd/Makefile
+++ b/usr.sbin/lpr/lpd/Makefile
@@ -1,4 +1,5 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
+#	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
+#	$OpenBSD: Makefile,v 1.2 1997/01/17 16:12:39 millert Exp $
 
 PROG=	lpd
 CFLAGS+=-I${.CURDIR}/../common_source
diff --git a/usr.sbin/lpr/lpd/extern.h b/usr.sbin/lpr/lpd/extern.h
index cabc92d2296..6da79eed931 100644
--- a/usr.sbin/lpr/lpd/extern.h
+++ b/usr.sbin/lpr/lpd/extern.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: extern.h,v 1.2 1997/01/17 16:12:39 millert Exp $	*/
+
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.sbin/lpr/lpd/key.c b/usr.sbin/lpr/lpd/key.c
index b6ac5c419b1..d024bd72cb1 100644
--- a/usr.sbin/lpr/lpd/key.c
+++ b/usr.sbin/lpr/lpd/key.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: key.c,v 1.1 1995/10/03 15:02:41 hpeyerl Exp $	*/
+/*	$OpenBSD: key.c,v 1.2 1997/01/17 16:12:40 millert Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)key.c	8.3 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$NetBSD: key.c,v 1.1 1995/10/03 15:02:41 hpeyerl Exp $";
+static char rcsid[] = "$OpenBSD: key.c,v 1.2 1997/01/17 16:12:40 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c
index ff9183ccdd7..b00baa2ed8d 100644
--- a/usr.sbin/lpr/lpd/lpd.c
+++ b/usr.sbin/lpr/lpd/lpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lpd.c,v 1.12 1996/12/20 15:58:40 deraadt Exp $ */
+/*	$OpenBSD: lpd.c,v 1.13 1997/01/17 16:12:41 millert Exp $ */
 /*	$NetBSD: lpd.c,v 1.7 1996/04/24 14:54:06 mrg Exp $	*/
 
 /*
@@ -42,7 +42,11 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)lpd.c	8.7 (Berkeley) 5/10/95";
+#else
+static char rcsid[] = "$OpenBSD: lpd.c,v 1.13 1997/01/17 16:12:41 millert Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/lpd/lpdchar.c b/usr.sbin/lpr/lpd/lpdchar.c
index 4a4f5da1ccb..52d43c955a3 100644
--- a/usr.sbin/lpr/lpd/lpdchar.c
+++ b/usr.sbin/lpr/lpd/lpdchar.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: lpdchar.c,v 1.2 1997/01/17 16:12:41 millert Exp $	*/
+
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -32,7 +34,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)lpdchar.c	8.1 (Berkeley) 6/6/93";
+#else
+static char rcsid[] = "$OpenBSD: lpdchar.c,v 1.2 1997/01/17 16:12:41 millert Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/lpd/modes.c b/usr.sbin/lpr/lpd/modes.c
index 9e08017c415..fc47cd9a115 100644
--- a/usr.sbin/lpr/lpd/modes.c
+++ b/usr.sbin/lpr/lpd/modes.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: modes.c,v 1.3 1997/01/17 16:12:42 millert Exp $	*/
 /*	$NetBSD: modes.c,v 1.1 1995/10/03 15:02:45 hpeyerl Exp $	*/
 
 /*-
@@ -37,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)modes.c	8.3 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$NetBSD: modes.c,v 1.1 1995/10/03 15:02:45 hpeyerl Exp $";
+static char rcsid[] = "$OpenBSD: modes.c,v 1.3 1997/01/17 16:12:42 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c
index c8e70f578bd..4989f12a642 100644
--- a/usr.sbin/lpr/lpd/recvjob.c
+++ b/usr.sbin/lpr/lpd/recvjob.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: recvjob.c,v 1.7 1997/01/17 16:12:42 millert Exp $	*/
+
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -39,7 +41,11 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)recvjob.c	8.2 (Berkeley) 4/27/95";
+#else
+static char rcsid[] = "$OpenBSD: recvjob.c,v 1.7 1997/01/17 16:12:42 millert Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/lpd/ttcompat.c b/usr.sbin/lpr/lpd/ttcompat.c
index f368871dbcd..8d8763b2a42 100644
--- a/usr.sbin/lpr/lpd/ttcompat.c
+++ b/usr.sbin/lpr/lpd/ttcompat.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: ttcompat.c,v 1.3 1997/01/17 16:12:43 millert Exp $	*/
+
 /*
  * Copyright (c) 1995
  *	The Regents of the University of California.  All rights reserved.
@@ -37,6 +39,10 @@
  *	originally from /sys/kern/tty_compat.c
  */
 
+#ifndef lint
+static char rcsid[] = "$OpenBSD: ttcompat.c,v 1.3 1997/01/17 16:12:43 millert Exp $";
+#endif /* not lint */
+
 #include <sys/param.h>
 #include <sys/types.h>
 
diff --git a/usr.sbin/lpr/lpq/Makefile b/usr.sbin/lpr/lpq/Makefile
index 1c730c1a4b8..b8227017f7a 100644
--- a/usr.sbin/lpr/lpq/Makefile
+++ b/usr.sbin/lpr/lpq/Makefile
@@ -1,4 +1,5 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
+#	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
+#	$OpenBSD: Makefile,v 1.2 1997/01/17 16:12:44 millert Exp $
 
 PROG=	lpq
 CFLAGS+=-I${.CURDIR}/../common_source
diff --git a/usr.sbin/lpr/lpq/lpq.c b/usr.sbin/lpr/lpq/lpq.c
index 04ee9eb1cf7..62eeb72dc06 100644
--- a/usr.sbin/lpr/lpq/lpq.c
+++ b/usr.sbin/lpr/lpq/lpq.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: lpq.c,v 1.7 1997/01/17 16:12:44 millert Exp $	*/
+
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -39,7 +41,11 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)lpq.c	8.3 (Berkeley) 5/10/95";
+#else
+static char rcsid[] = "$OpenBSD: lpq.c,v 1.7 1997/01/17 16:12:44 millert Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/lpr/Makefile b/usr.sbin/lpr/lpr/Makefile
index 9a3cbfd591e..dcb20b0a30b 100644
--- a/usr.sbin/lpr/lpr/Makefile
+++ b/usr.sbin/lpr/lpr/Makefile
@@ -1,4 +1,5 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
+#	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
+#	$OpenBSD: Makefile,v 1.2 1997/01/17 16:12:45 millert Exp $
 
 PROG=	lpr
 CFLAGS+=-I${.CURDIR}/../common_source
diff --git a/usr.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c
index 4e077a64d9e..1b218b2dcfe 100644
--- a/usr.sbin/lpr/lpr/lpr.c
+++ b/usr.sbin/lpr/lpr/lpr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lpr.c,v 1.11 1996/11/04 18:13:38 millert Exp $ */
+/*	$OpenBSD: lpr.c,v 1.12 1997/01/17 16:12:46 millert Exp $ */
 /*	$NetBSD: lpr.c,v 1.10 1996/03/21 18:12:25 jtc Exp $	*/
 
 /*
@@ -47,7 +47,11 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)lpr.c	8.4 (Berkeley) 4/28/95";
+#else
+static char rcsid[] = "$OpenBSD: lpr.c,v 1.12 1997/01/17 16:12:46 millert Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/lprm/Makefile b/usr.sbin/lpr/lprm/Makefile
index d1362f5cdce..ab6b4f3133f 100644
--- a/usr.sbin/lpr/lprm/Makefile
+++ b/usr.sbin/lpr/lprm/Makefile
@@ -1,4 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+#	$OpenBSD: Makefile,v 1.2 1997/01/17 16:12:47 millert Exp $
 
 PROG=	lprm
 CFLAGS+=-I${.CURDIR}/../common_source
diff --git a/usr.sbin/lpr/lprm/lprm.c b/usr.sbin/lpr/lprm/lprm.c
index a5b5d865310..4c61b0e1ad6 100644
--- a/usr.sbin/lpr/lprm/lprm.c
+++ b/usr.sbin/lpr/lprm/lprm.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: lprm.c,v 1.5 1997/01/17 16:12:47 millert Exp $	*/
+
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -39,7 +41,11 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)lprm.c	8.1 (Berkeley) 6/6/93";
+#else
+static char rcsid[] = "$OpenBSD: lprm.c,v 1.5 1997/01/17 16:12:47 millert Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/lpr/lptest/Makefile b/usr.sbin/lpr/lptest/Makefile
index 6ff8e7fe9c7..ca3431ddbb5 100644
--- a/usr.sbin/lpr/lptest/Makefile
+++ b/usr.sbin/lpr/lptest/Makefile
@@ -1,4 +1,5 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
+#	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
+#	$OpenBSD: Makefile,v 1.2 1997/01/17 16:12:48 millert Exp $
 
 PROG=	lptest
 
diff --git a/usr.sbin/lpr/lptest/lptest.c b/usr.sbin/lpr/lptest/lptest.c
index 7916eb5c240..d8264dce6bb 100644
--- a/usr.sbin/lpr/lptest/lptest.c
+++ b/usr.sbin/lpr/lptest/lptest.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lptest.c,v 1.2 1996/04/21 23:40:46 deraadt Exp $ */
+/*	$OpenBSD: lptest.c,v 1.3 1997/01/17 16:12:48 millert Exp $ */
 /*	$NetBSD: lptest.c,v 1.5 1996/03/21 18:13:20 jtc Exp $	*/
 
 /*
@@ -42,7 +42,11 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)lptest.c	8.1 (Berkeley) 6/6/93";
+#else
+static char rcsid[] = "$OpenBSD: lptest.c,v 1.3 1997/01/17 16:12:48 millert Exp $";
+#endif
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/usr.sbin/lpr/pac/Makefile b/usr.sbin/lpr/pac/Makefile
index e3fb65a3ee0..b986b559419 100644
--- a/usr.sbin/lpr/pac/Makefile
+++ b/usr.sbin/lpr/pac/Makefile
@@ -1,4 +1,5 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
+#	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
+#	$OpenBSD: Makefile,v 1.2 1997/01/17 16:12:49 millert Exp $
 
 PROG=	pac
 CFLAGS+=-I${.CURDIR}/../common_source
diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c
index b40d7000daf..77fb33f2482 100644
--- a/usr.sbin/lpr/pac/pac.c
+++ b/usr.sbin/lpr/pac/pac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pac.c,v 1.7 1996/11/03 23:24:13 millert Exp $ */
+/*	$OpenBSD: pac.c,v 1.8 1997/01/17 16:12:50 millert Exp $ */
 /*	$NetBSD: pac.c,v 1.7 1996/03/21 18:21:20 jtc Exp $	*/
 
 /*
@@ -42,7 +42,11 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)pac.c	8.1 (Berkeley) 6/6/93";
+#else
+static char rcsid[] = "$OpenBSD: pac.c,v 1.8 1997/01/17 16:12:50 millert Exp $";
+#endif
 #endif /* not lint */
 
 /*
-- 
2.20.1