summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
Diffstat (limited to 'libexec')
-rw-r--r--libexec/Makefile.inc3
-rw-r--r--libexec/atrun/Makefile2
-rw-r--r--libexec/atrun/atrun.h2
-rw-r--r--libexec/comsat/Makefile3
-rw-r--r--libexec/comsat/comsat.82
-rw-r--r--libexec/comsat/comsat.c4
-rw-r--r--libexec/fingerd/Makefile3
-rw-r--r--libexec/fingerd/pathnames.h3
-rw-r--r--libexec/ftpd/extern.h1
-rw-r--r--libexec/ftpd/logwtmp.c3
-rw-r--r--libexec/getty/Makefile3
-rw-r--r--libexec/getty/extern.h3
-rw-r--r--libexec/getty/getty.82
-rw-r--r--libexec/getty/gettytab.52
-rw-r--r--libexec/getty/gettytab.h3
-rw-r--r--libexec/getty/init.c4
-rw-r--r--libexec/getty/main.c4
-rw-r--r--libexec/getty/pathnames.h3
-rw-r--r--libexec/getty/subr.c4
-rw-r--r--libexec/getty/ttys.52
-rw-r--r--libexec/identd/Makefile2
-rw-r--r--libexec/identd/error.h3
-rw-r--r--libexec/identd/identd.c2
-rw-r--r--libexec/identd/identd.h3
-rw-r--r--libexec/identd/openbsd.c3
-rw-r--r--libexec/identd/parse.c2
-rw-r--r--libexec/identd/version.c2
-rw-r--r--libexec/ld.so/strdup.c2
-rw-r--r--libexec/ld.so/test/A.C2
-rw-r--r--libexec/ld.so/test/B.C2
-rw-r--r--libexec/ld.so/test/a.h2
-rw-r--r--libexec/ld.so/test/dltest.c15
-rw-r--r--libexec/ld.so/test/ldt.c2
-rw-r--r--libexec/ld.so/test/libbar.c2
-rw-r--r--libexec/ld.so/test/libdep.c4
-rw-r--r--libexec/ld.so/test/libfoo.c2
-rw-r--r--libexec/ld.so/test/tst.C2
-rw-r--r--libexec/lockspool/lockspool.12
-rw-r--r--libexec/login_lchpass/Makefile2
-rw-r--r--libexec/mail.local/mail.local.82
-rw-r--r--libexec/mail.local/pathnames.h3
-rw-r--r--libexec/rexecd/Makefile3
-rw-r--r--libexec/rexecd/rexecd.82
-rw-r--r--libexec/rexecd/rexecd.c4
-rw-r--r--libexec/rlogind/Makefile3
-rw-r--r--libexec/rlogind/pathnames.h3
-rw-r--r--libexec/rlogind/rlogind.82
-rw-r--r--libexec/rlogind/rlogind.c4
-rw-r--r--libexec/rpc.rquotad/Makefile2
-rw-r--r--libexec/rpc.rstatd/Makefile2
-rw-r--r--libexec/rpc.rstatd/rstatd.c4
-rw-r--r--libexec/rpc.rusersd/Makefile2
-rw-r--r--libexec/rpc.rusersd/rusers_proc.c4
-rw-r--r--libexec/rpc.rusersd/rusersd.c4
-rw-r--r--libexec/rpc.rwalld/Makefile2
-rw-r--r--libexec/rpc.rwalld/rwalld.c4
-rw-r--r--libexec/rpc.sprayd/Makefile2
-rw-r--r--libexec/rpc.sprayd/sprayd.c5
-rw-r--r--libexec/rshd/Makefile3
-rw-r--r--libexec/rshd/rshd.82
-rw-r--r--libexec/rshd/rshd.c4
-rw-r--r--libexec/smtpd/Makefile.inc2
-rw-r--r--libexec/smtpd/smtpd/smtpd.82
-rw-r--r--libexec/smtpd/smtpfwdd/smtpfwdd.82
-rw-r--r--libexec/smtpd/src/Makefile2
-rw-r--r--libexec/smtpd/src/Makefile.default2
-rw-r--r--libexec/smtpd/src/Makefile.minimal2
-rw-r--r--libexec/smtpd/src/Makefile.nochecks2
-rw-r--r--libexec/smtpd/src/accumlog.c3
-rw-r--r--libexec/smtpd/src/address_check.c3
-rw-r--r--libexec/smtpd/src/antirelay_check_rules_example2
-rw-r--r--libexec/smtpd/src/antispam_check_rules.example2
-rw-r--r--libexec/smtpd/src/contrib/smtpfilter.c3
-rw-r--r--libexec/smtpd/src/smtp.h3
-rw-r--r--libexec/smtpd/src/smtpd.c5
-rw-r--r--libexec/smtpd/src/smtpd.h3
-rw-r--r--libexec/smtpd/src/smtpd_check_rules.example2
-rw-r--r--libexec/smtpd/src/smtpfwdd.c5
-rw-r--r--libexec/tftpd/Makefile3
-rw-r--r--libexec/uucpd/Makefile3
-rw-r--r--libexec/uucpd/pathnames.h3
-rw-r--r--libexec/uucpd/uucpd.c4
82 files changed, 164 insertions, 72 deletions
diff --git a/libexec/Makefile.inc b/libexec/Makefile.inc
index 285a038ec5f..84b5d423730 100644
--- a/libexec/Makefile.inc
+++ b/libexec/Makefile.inc
@@ -1,4 +1,3 @@
-# from: @(#)Makefile.inc 5.1 (Berkeley) 5/11/90
-# $Id: Makefile.inc,v 1.1 1995/10/18 08:43:14 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.2 2001/01/28 19:34:26 niklas Exp $
BINDIR?= /usr/libexec
diff --git a/libexec/atrun/Makefile b/libexec/atrun/Makefile
index e611f0a76bd..56d0eefc128 100644
--- a/libexec/atrun/Makefile
+++ b/libexec/atrun/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1995/10/18 08:43:14 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 2001/01/28 19:34:27 niklas Exp $
PROG= atrun
BINDIR= /usr/libexec
diff --git a/libexec/atrun/atrun.h b/libexec/atrun/atrun.h
index 2b7b8446ec1..d6a9feb9701 100644
--- a/libexec/atrun/atrun.h
+++ b/libexec/atrun/atrun.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: atrun.h,v 1.3 2001/01/28 19:34:27 niklas Exp $*/
/*
* Copyright (c) 1993 Christopher G. Demetriou
* All rights reserved.
@@ -27,7 +28,6 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: atrun.h,v 1.2 1997/03/01 23:39:44 millert Exp $
*/
#define ATRUN_MAXLOAD 1.5
diff --git a/libexec/comsat/Makefile b/libexec/comsat/Makefile
index 3150d964f27..ad3d5a7e005 100644
--- a/libexec/comsat/Makefile
+++ b/libexec/comsat/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $Id: Makefile,v 1.1 1995/10/18 08:43:15 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 2001/01/28 19:34:27 niklas Exp $
PROG= comsat
MAN= comsat.8
diff --git a/libexec/comsat/comsat.8 b/libexec/comsat/comsat.8
index 99bc12fadf8..95de4c549e8 100644
--- a/libexec/comsat/comsat.8
+++ b/libexec/comsat/comsat.8
@@ -1,3 +1,4 @@
+.\" $OpenBSD: comsat.8,v 1.4 2001/01/28 19:34:27 niklas Exp $
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)comsat.8 8.1 (Berkeley) 6/4/93
-.\" $Id: comsat.8,v 1.3 2000/09/08 18:03:26 aaron Exp $
.\"
.Dd June 4, 1993
.Dt COMSAT 8
diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c
index 654828607da..7310cb286e9 100644
--- a/libexec/comsat/comsat.c
+++ b/libexec/comsat/comsat.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: comsat.c,v 1.15 2001/01/28 19:34:27 niklas Exp $ */
+
/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
@@ -39,7 +41,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)comsat.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$Id: comsat.c,v 1.14 2001/01/17 19:21:48 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: comsat.c,v 1.15 2001/01/28 19:34:27 niklas Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/libexec/fingerd/Makefile b/libexec/fingerd/Makefile
index 808fbfbbc03..5faf097338a 100644
--- a/libexec/fingerd/Makefile
+++ b/libexec/fingerd/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $Id: Makefile,v 1.2 1996/07/16 17:55:42 millert Exp $
+# $OpenBSD: Makefile,v 1.3 2001/01/28 19:34:27 niklas Exp $
PROG= fingerd
MAN= fingerd.8
diff --git a/libexec/fingerd/pathnames.h b/libexec/fingerd/pathnames.h
index 0c78b6b3554..8fb12a8c856 100644
--- a/libexec/fingerd/pathnames.h
+++ b/libexec/fingerd/pathnames.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: pathnames.h,v 1.3 2001/01/28 19:34:27 niklas Exp $*/
+
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,7 +33,6 @@
* SUCH DAMAGE.
*
* from: @(#)pathnames.h 8.1 (Berkeley) 6/4/93
- * $Id: pathnames.h,v 1.2 1996/07/16 17:55:43 millert Exp $
*/
#define _PATH_FINGER "/usr/bin/finger"
diff --git a/libexec/ftpd/extern.h b/libexec/ftpd/extern.h
index 131164b1f68..73b43bcf4d6 100644
--- a/libexec/ftpd/extern.h
+++ b/libexec/ftpd/extern.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: extern.h,v 1.6 2001/01/28 19:34:27 niklas Exp $ */
/* $NetBSD: extern.h,v 1.2 1995/04/11 02:44:49 cgd Exp $ */
/*
diff --git a/libexec/ftpd/logwtmp.c b/libexec/ftpd/logwtmp.c
index 36c761210c9..168f394e151 100644
--- a/libexec/ftpd/logwtmp.c
+++ b/libexec/ftpd/logwtmp.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: logwtmp.c,v 1.4 2001/01/28 19:34:27 niklas Exp $ */
/* $NetBSD: logwtmp.c,v 1.4 1995/04/11 02:44:58 cgd Exp $ */
/*
@@ -38,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)logwtmp.c 8.1 (Berkeley) 6/4/93";
#else
-static char rcsid[] = "$NetBSD: logwtmp.c,v 1.4 1995/04/11 02:44:58 cgd Exp $";
+static char rcsid[] = "$OpenBSD: logwtmp.c,v 1.4 2001/01/28 19:34:27 niklas Exp $";
#endif
#endif /* not lint */
diff --git a/libexec/getty/Makefile b/libexec/getty/Makefile
index abb9e252437..7d5dd670ec1 100644
--- a/libexec/getty/Makefile
+++ b/libexec/getty/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $Id: Makefile,v 1.1 1995/10/18 08:43:16 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 2001/01/28 19:34:28 niklas Exp $
PROG= getty
SRCS= main.c init.c subr.c
diff --git a/libexec/getty/extern.h b/libexec/getty/extern.h
index 9d95d611272..9bf59caa4dc 100644
--- a/libexec/getty/extern.h
+++ b/libexec/getty/extern.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: extern.h,v 1.3 2001/01/28 19:34:28 niklas Exp $*/
+
/*
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
@@ -31,7 +33,6 @@
* SUCH DAMAGE.
*
* from: @(#)extern.h 8.1 (Berkeley) 6/4/93
- * $Id: extern.h,v 1.2 1996/05/22 12:10:12 deraadt Exp $
*/
struct delayval;
diff --git a/libexec/getty/getty.8 b/libexec/getty/getty.8
index 88f960d927b..c1b878c8611 100644
--- a/libexec/getty/getty.8
+++ b/libexec/getty/getty.8
@@ -1,3 +1,4 @@
+.\" $OpenBSD: getty.8,v 1.8 2001/01/28 19:34:28 niklas Exp $
.\" Copyright (c) 1980, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)getty.8 8.1 (Berkeley) 6/4/93
-.\" $Id: getty.8,v 1.7 2000/09/08 18:03:27 aaron Exp $
.\"
.Dd June 4, 1993
.Dt GETTY 8
diff --git a/libexec/getty/gettytab.5 b/libexec/getty/gettytab.5
index dae50edda10..1ae6314900a 100644
--- a/libexec/getty/gettytab.5
+++ b/libexec/getty/gettytab.5
@@ -1,3 +1,4 @@
+.\" $OpenBSD: gettytab.5,v 1.13 2001/01/28 19:34:28 niklas Exp $
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)gettytab.5 8.4 (Berkeley) 4/19/94
-.\" $Id: gettytab.5,v 1.12 2000/09/08 03:36:34 aaron Exp $
.\"
.Dd April 19, 1994
.Dt GETTYTAB 5
diff --git a/libexec/getty/gettytab.h b/libexec/getty/gettytab.h
index 8f95ffd9654..aeab6128486 100644
--- a/libexec/getty/gettytab.h
+++ b/libexec/getty/gettytab.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: gettytab.h,v 1.4 2001/01/28 19:34:28 niklas Exp $*/
+
/*
* Copyright (c) 1983, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -31,7 +33,6 @@
* SUCH DAMAGE.
*
* from: @(#)gettytab.h 8.2 (Berkeley) 3/30/94
- * $Id: gettytab.h,v 1.3 1998/02/27 22:01:24 brian Exp $
*/
/*
diff --git a/libexec/getty/init.c b/libexec/getty/init.c
index 3353bd016a1..c00b2368cee 100644
--- a/libexec/getty/init.c
+++ b/libexec/getty/init.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: init.c,v 1.4 2001/01/28 19:34:28 niklas Exp $ */
+
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)init.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$Id: init.c,v 1.3 1996/12/10 07:58:33 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: init.c,v 1.4 2001/01/28 19:34:28 niklas Exp $";
#endif /* not lint */
/*
diff --git a/libexec/getty/main.c b/libexec/getty/main.c
index 00b0717dc68..4783404a78c 100644
--- a/libexec/getty/main.c
+++ b/libexec/getty/main.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: main.c,v 1.17 2001/01/28 19:34:28 niklas Exp $ */
+
/*-
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
@@ -39,7 +41,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)main.c 8.1 (Berkeley) 6/20/93";*/
-static char rcsid[] = "$Id: main.c,v 1.16 2001/01/19 18:02:26 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.17 2001/01/28 19:34:28 niklas Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/libexec/getty/pathnames.h b/libexec/getty/pathnames.h
index 67f40d6bd28..e8e9bbf36b5 100644
--- a/libexec/getty/pathnames.h
+++ b/libexec/getty/pathnames.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: pathnames.h,v 1.2 2001/01/28 19:34:28 niklas Exp $*/
+
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,7 +33,6 @@
* SUCH DAMAGE.
*
* from: @(#)pathnames.h 8.1 (Berkeley) 6/4/93
- * $Id: pathnames.h,v 1.1 1995/10/18 08:43:17 deraadt Exp $
*/
#include <paths.h>
diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c
index 2f1c5390d43..a8a562abe00 100644
--- a/libexec/getty/subr.c
+++ b/libexec/getty/subr.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: subr.c,v 1.11 2001/01/28 19:34:28 niklas Exp $ */
+
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -33,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)subr.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$Id: subr.c,v 1.10 2000/10/06 22:51:42 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: subr.c,v 1.11 2001/01/28 19:34:28 niklas Exp $";
#endif /* not lint */
/*
diff --git a/libexec/getty/ttys.5 b/libexec/getty/ttys.5
index 49a810a71ad..a842d06fe02 100644
--- a/libexec/getty/ttys.5
+++ b/libexec/getty/ttys.5
@@ -1,3 +1,4 @@
+.\" $OpenBSD: ttys.5,v 1.6 2001/01/28 19:34:28 niklas Exp $
.\" Copyright (c) 1985, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)ttys.5 8.1 (Berkeley) 6/4/93
-.\" $Id: ttys.5,v 1.5 2000/09/08 18:03:28 aaron Exp $
.\"
.Dd June 4, 1993
.Dt TTYS 5
diff --git a/libexec/identd/Makefile b/libexec/identd/Makefile
index 08b49134b43..f96361c8bae 100644
--- a/libexec/identd/Makefile
+++ b/libexec/identd/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 2000/04/10 20:39:05 ericj Exp $
+# $OpenBSD: Makefile,v 1.6 2001/01/28 19:34:28 niklas Exp $
PROG= identd
SRCS= identd.c openbsd.c parse.c version.c
diff --git a/libexec/identd/error.h b/libexec/identd/error.h
index 4810ac4ff59..c27ee5e823c 100644
--- a/libexec/identd/error.h
+++ b/libexec/identd/error.h
@@ -1,5 +1,6 @@
+/* $OpenBSD: error.h,v 1.3 2001/01/28 19:34:28 niklas Exp $*/
+
/*
-** $Id: error.h,v 1.2 1997/07/23 20:36:27 kstailey Exp $
**
** error.h Error handling macros
**
diff --git a/libexec/identd/identd.c b/libexec/identd/identd.c
index 20cc5104d28..5fe8c11f0e0 100644
--- a/libexec/identd/identd.c
+++ b/libexec/identd/identd.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: identd.c,v 1.15 2001/01/28 19:34:28 niklas Exp $ */
+
/*
* This program is in the public domain and may be used freely by anyone
* who wants to.
diff --git a/libexec/identd/identd.h b/libexec/identd/identd.h
index 6dd71f293d7..073a5929557 100644
--- a/libexec/identd/identd.h
+++ b/libexec/identd/identd.h
@@ -1,5 +1,6 @@
+/* $OpenBSD: identd.h,v 1.6 2001/01/28 19:34:29 niklas Exp $*/
+
/*
-** $Id: identd.h,v 1.5 2000/06/18 04:43:28 beck Exp $
**
** identd.h Common variables for the Pidentd daemon
**
diff --git a/libexec/identd/openbsd.c b/libexec/identd/openbsd.c
index e1110b4d02d..0334b93c008 100644
--- a/libexec/identd/openbsd.c
+++ b/libexec/identd/openbsd.c
@@ -1,10 +1,11 @@
+/* $OpenBSD: openbsd.c,v 1.15 2001/01/28 19:34:29 niklas Exp $ */
+
/*
* This program is in the public domain and may be used freely by anyone
* who wants to.
*
* Please send bug fixes/bug reports to: Peter Eriksson <pen@lysator.liu.se>
*
- * $Id: openbsd.c,v 1.14 2000/06/18 04:43:28 beck Exp $
* This version elminates the kmem search in favour of a kernel sysctl to
* get the user id associated with a connection - Bob Beck <beck@obtuse.com>
*/
diff --git a/libexec/identd/parse.c b/libexec/identd/parse.c
index 4adb647c13e..1e9e45d8317 100644
--- a/libexec/identd/parse.c
+++ b/libexec/identd/parse.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: parse.c,v 1.20 2001/01/28 19:34:29 niklas Exp $ */
+
/*
* This program is in the public domain and may be used freely by anyone
* who wants to.
diff --git a/libexec/identd/version.c b/libexec/identd/version.c
index 3513bf4a50d..9e11de16c4b 100644
--- a/libexec/identd/version.c
+++ b/libexec/identd/version.c
@@ -1,2 +1,2 @@
-/* $Id: version.c,v 1.1 1995/10/18 08:43:18 deraadt Exp $ */
+/* $OpenBSD: version.c,v 1.2 2001/01/28 19:34:29 niklas Exp $ */
char *version = "2.1.2";
diff --git a/libexec/ld.so/strdup.c b/libexec/ld.so/strdup.c
index e7737d39e67..9b84c6398ae 100644
--- a/libexec/ld.so/strdup.c
+++ b/libexec/ld.so/strdup.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: strdup.c,v 1.2 2001/01/28 19:34:29 niklas Exp $ */
+
void * _dl_malloc(int);
diff --git a/libexec/ld.so/test/A.C b/libexec/ld.so/test/A.C
index afacc0a102b..aaf9aa3127b 100644
--- a/libexec/ld.so/test/A.C
+++ b/libexec/ld.so/test/A.C
@@ -1,3 +1,5 @@
+/* $OpenBSD: A.C,v 1.3 2001/01/28 19:34:29 niklas Exp $ */
+
#include "iostream.h"
#include "a.h"
diff --git a/libexec/ld.so/test/B.C b/libexec/ld.so/test/B.C
index 8b60a608631..db3c8ea2d55 100644
--- a/libexec/ld.so/test/B.C
+++ b/libexec/ld.so/test/B.C
@@ -1,3 +1,5 @@
+/* $OpenBSD: B.C,v 1.2 2001/01/28 19:34:29 niklas Exp $ */
+
#include "iostream.h"
#include "a.h"
AA e("e");;
diff --git a/libexec/ld.so/test/a.h b/libexec/ld.so/test/a.h
index 1bd9be63ad8..c70443765fd 100644
--- a/libexec/ld.so/test/a.h
+++ b/libexec/ld.so/test/a.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: a.h,v 1.3 2001/01/28 19:34:29 niklas Exp $ */
+
class B {
public:
B();
diff --git a/libexec/ld.so/test/dltest.c b/libexec/ld.so/test/dltest.c
index 2a3fd3e6150..7d722b43188 100644
--- a/libexec/ld.so/test/dltest.c
+++ b/libexec/ld.so/test/dltest.c
@@ -1,11 +1,19 @@
+/* $OpenBSD: dltest.c,v 1.2 2001/01/28 19:34:29 niklas Exp $ */
+
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <dlfcn.h>
#include <ctype.h>
+#include <elf_abi.h>
+#include <machine/reloc.h>
+#include <nlist.h>
+#include "../powerpc/archdep.h"
+#include "../resolve.h"
typedef void (*func_t)(const char *);
+#define DL_NOW 0
void
dltest(const char *s)
{
@@ -15,6 +23,7 @@ dltest(const char *s)
}
putchar('\n');
}
+struct elf_object *foo;
main(int argc, char **argv)
{
@@ -55,6 +64,7 @@ main(int argc, char **argv)
}
}
+ printf("opening library %s for function %s\n", libname, funcname);
handle = dlopen(libname, mode);
if(handle == NULL) {
fprintf(stderr, "%s: dlopen: '%s'\n", libname, dlerror());
@@ -77,15 +87,18 @@ main(int argc, char **argv)
(*fptr)(param);
+#ifdef __mips__
dlctl(handle, DL_DUMP_MAP, NULL);
+#endif /* __mips__ */
dlclose(handle);
printf("After 'dlclose()'\n");
+#ifdef __mips__
dlctl(handle, DL_DUMP_MAP, NULL);
+#endif /* __mips__ */
return(0);
}
-
diff --git a/libexec/ld.so/test/ldt.c b/libexec/ld.so/test/ldt.c
index 6ba2abff044..74d9643e55b 100644
--- a/libexec/ld.so/test/ldt.c
+++ b/libexec/ld.so/test/ldt.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: ldt.c,v 1.2 2001/01/28 19:34:29 niklas Exp $ */
+
#include <stdio.h>
main()
{
diff --git a/libexec/ld.so/test/libbar.c b/libexec/ld.so/test/libbar.c
index 10a3ce8a589..1ad13f83127 100644
--- a/libexec/ld.so/test/libbar.c
+++ b/libexec/ld.so/test/libbar.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: libbar.c,v 1.2 2001/01/28 19:34:29 niklas Exp $ */
+
#include <stdio.h>
extern void dltest(const char *);
diff --git a/libexec/ld.so/test/libdep.c b/libexec/ld.so/test/libdep.c
index f85a3f30820..364e7e81eba 100644
--- a/libexec/ld.so/test/libdep.c
+++ b/libexec/ld.so/test/libdep.c
@@ -1,4 +1,8 @@
+/* $OpenBSD: libdep.c,v 1.2 2001/01/28 19:34:29 niklas Exp $ */
+
#include <stdio.h>
+const char *const libname = "libdep.so";
+
void
dep(const char *s)
diff --git a/libexec/ld.so/test/libfoo.c b/libexec/ld.so/test/libfoo.c
index e1034d778d3..6ac55551988 100644
--- a/libexec/ld.so/test/libfoo.c
+++ b/libexec/ld.so/test/libfoo.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: libfoo.c,v 1.2 2001/01/28 19:34:29 niklas Exp $ */
+
#include <stdio.h>
extern void dltest(const char *s);
diff --git a/libexec/ld.so/test/tst.C b/libexec/ld.so/test/tst.C
index fa7703c6892..9bdb1ba958e 100644
--- a/libexec/ld.so/test/tst.C
+++ b/libexec/ld.so/test/tst.C
@@ -1,3 +1,5 @@
+/* $OpenBSD: tst.C,v 1.3 2001/01/28 19:34:29 niklas Exp $ */
+
#include "iostream.h"
#include "a.h"
diff --git a/libexec/lockspool/lockspool.1 b/libexec/lockspool/lockspool.1
index df208723eb9..1fec8e58339 100644
--- a/libexec/lockspool/lockspool.1
+++ b/libexec/lockspool/lockspool.1
@@ -1,3 +1,5 @@
+.\" $OpenBSD: lockspool.1,v 1.5 2001/01/28 19:34:30 niklas Exp $
+.\"
.\"
.\" Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
.\" All rights reserved.
diff --git a/libexec/login_lchpass/Makefile b/libexec/login_lchpass/Makefile
index 187695d098a..80c545afea7 100644
--- a/libexec/login_lchpass/Makefile
+++ b/libexec/login_lchpass/Makefile
@@ -1,3 +1,5 @@
+# $OpenBSD: Makefile,v 1.2 2001/01/28 19:34:30 niklas Exp $
+
# BSDI $From: Makefile,v 1.2 1997/08/08 18:58:22 prb Exp $
PROG= login_lchpass
diff --git a/libexec/mail.local/mail.local.8 b/libexec/mail.local/mail.local.8
index a5ef7ddd3c4..6e35f5fd229 100644
--- a/libexec/mail.local/mail.local.8
+++ b/libexec/mail.local/mail.local.8
@@ -1,3 +1,4 @@
+.\" $OpenBSD: mail.local.8,v 1.22 2001/01/28 19:34:30 niklas Exp $
.\" Copyright (c) 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)mail.local.8 6.8 (Berkeley) 4/27/91
-.\" $Id: mail.local.8,v 1.21 2000/11/09 17:53:35 aaron Exp $
.\"
.Dd April 27, 1991
.Dt MAIL.LOCAL 8
diff --git a/libexec/mail.local/pathnames.h b/libexec/mail.local/pathnames.h
index db5c1b2941b..e8787bdd6db 100644
--- a/libexec/mail.local/pathnames.h
+++ b/libexec/mail.local/pathnames.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: pathnames.h,v 1.4 2001/01/28 19:34:30 niklas Exp $*/
+
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +33,6 @@
* SUCH DAMAGE.
*
* from: @(#)pathnames.h 5.3 (Berkeley) 1/17/91
- * $Id: pathnames.h,v 1.3 1998/08/15 21:04:35 millert Exp $
*/
#include <paths.h>
diff --git a/libexec/rexecd/Makefile b/libexec/rexecd/Makefile
index 31fd9cc2060..75ae9ad6d46 100644
--- a/libexec/rexecd/Makefile
+++ b/libexec/rexecd/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.3 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.3 1997/03/26 00:34:36 deraadt Exp $
+# $OpenBSD: Makefile,v 1.4 2001/01/28 19:34:30 niklas Exp $
PROG= rexecd
MAN= rexecd.8
diff --git a/libexec/rexecd/rexecd.8 b/libexec/rexecd/rexecd.8
index 43022dcc330..e2e420daee6 100644
--- a/libexec/rexecd/rexecd.8
+++ b/libexec/rexecd/rexecd.8
@@ -1,3 +1,4 @@
+.\" $OpenBSD: rexecd.8,v 1.8 2001/01/28 19:34:30 niklas Exp $
.\" Copyright (c) 1983, 1991 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)rexecd.8 6.5 (Berkeley) 3/16/91
-.\" $Id: rexecd.8,v 1.7 2000/10/30 17:46:11 aaron Exp $
.\"
.Dd March 16, 1991
.Dt REXECD 8
diff --git a/libexec/rexecd/rexecd.c b/libexec/rexecd/rexecd.c
index 54bc9d05ff0..2bbcd115b4d 100644
--- a/libexec/rexecd/rexecd.c
+++ b/libexec/rexecd/rexecd.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: rexecd.c,v 1.16 2001/01/28 19:34:30 niklas Exp $ */
+
/*
* Copyright (c) 1983 The Regents of the University of California.
* All rights reserved.
@@ -39,7 +41,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)rexecd.c 5.12 (Berkeley) 2/25/91";*/
-static char rcsid[] = "$Id: rexecd.c,v 1.15 2001/01/25 19:22:16 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rexecd.c,v 1.16 2001/01/28 19:34:30 niklas Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/libexec/rlogind/Makefile b/libexec/rlogind/Makefile
index 1bd5fc8fe67..f86e9a15f86 100644
--- a/libexec/rlogind/Makefile
+++ b/libexec/rlogind/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $Id: Makefile,v 1.4 2000/09/03 18:41:14 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2001/01/28 19:34:31 niklas Exp $
PROG= rlogind
SRCS= rlogind.c
diff --git a/libexec/rlogind/pathnames.h b/libexec/rlogind/pathnames.h
index fceb3f19649..ff54fe91a24 100644
--- a/libexec/rlogind/pathnames.h
+++ b/libexec/rlogind/pathnames.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: pathnames.h,v 1.2 2001/01/28 19:34:31 niklas Exp $*/
+
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,7 +33,6 @@
* SUCH DAMAGE.
*
* from: @(#)pathnames.h 8.1 (Berkeley) 6/4/93
- * $Id: pathnames.h,v 1.1 1995/10/18 08:43:20 deraadt Exp $
*/
#include <paths.h>
diff --git a/libexec/rlogind/rlogind.8 b/libexec/rlogind/rlogind.8
index 5f133594dee..dcd8c5da0ff 100644
--- a/libexec/rlogind/rlogind.8
+++ b/libexec/rlogind/rlogind.8
@@ -1,3 +1,4 @@
+.\" $OpenBSD: rlogind.8,v 1.7 2001/01/28 19:34:31 niklas Exp $
.\" Copyright (c) 1983, 1989, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)rlogind.8 8.1 (Berkeley) 6/4/93
-.\" $Id: rlogind.8,v 1.6 2000/10/30 17:46:13 aaron Exp $
.\"
.Dd June 4, 1993
.Dt RLOGIND 8
diff --git a/libexec/rlogind/rlogind.c b/libexec/rlogind/rlogind.c
index 57458e25856..4ea1f079b0c 100644
--- a/libexec/rlogind/rlogind.c
+++ b/libexec/rlogind/rlogind.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: rlogind.c,v 1.27 2001/01/28 19:34:31 niklas Exp $ */
+
/*-
* Copyright (c) 1983, 1988, 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -39,7 +41,7 @@ static char copyright[] =
#ifndef lint
/* from: static char sccsid[] = "@(#)rlogind.c 8.1 (Berkeley) 6/4/93"; */
-static char *rcsid = "$Id: rlogind.c,v 1.26 2001/01/19 18:01:03 deraadt Exp $";
+static char *rcsid = "$OpenBSD: rlogind.c,v 1.27 2001/01/28 19:34:31 niklas Exp $";
#endif /* not lint */
/*
diff --git a/libexec/rpc.rquotad/Makefile b/libexec/rpc.rquotad/Makefile
index 19d56244701..beb4703aed6 100644
--- a/libexec/rpc.rquotad/Makefile
+++ b/libexec/rpc.rquotad/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1995/10/18 08:43:20 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 2001/01/28 19:34:31 niklas Exp $
PROG = rpc.rquotad
SRCS = rquotad.c
diff --git a/libexec/rpc.rstatd/Makefile b/libexec/rpc.rstatd/Makefile
index dbb5e1389c9..8fd7dbd3ac8 100644
--- a/libexec/rpc.rstatd/Makefile
+++ b/libexec/rpc.rstatd/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 2000/09/03 18:41:15 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2001/01/28 19:34:31 niklas Exp $
PROG = rpc.rstatd
.PATH: ${.CURDIR}/../../usr.bin/vmstat
diff --git a/libexec/rpc.rstatd/rstatd.c b/libexec/rpc.rstatd/rstatd.c
index f1cd71e99aa..1621a79b520 100644
--- a/libexec/rpc.rstatd/rstatd.c
+++ b/libexec/rpc.rstatd/rstatd.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: rstatd.c,v 1.5 2001/01/28 19:34:31 niklas Exp $ */
+
/*-
* Copyright (c) 1993, John Brezak
* All rights reserved.
@@ -32,7 +34,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Id: rstatd.c,v 1.4 2001/01/17 19:23:26 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rstatd.c,v 1.5 2001/01/28 19:34:31 niklas Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/libexec/rpc.rusersd/Makefile b/libexec/rpc.rusersd/Makefile
index db658c28292..e40273f2879 100644
--- a/libexec/rpc.rusersd/Makefile
+++ b/libexec/rpc.rusersd/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1995/10/18 08:43:21 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 2001/01/28 19:34:31 niklas Exp $
PROG = rpc.rusersd
SRCS = rusersd.c rusers_proc.c
diff --git a/libexec/rpc.rusersd/rusers_proc.c b/libexec/rpc.rusersd/rusers_proc.c
index b344db0952f..93c3bb09939 100644
--- a/libexec/rpc.rusersd/rusers_proc.c
+++ b/libexec/rpc.rusersd/rusers_proc.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: rusers_proc.c,v 1.8 2001/01/28 19:34:31 niklas Exp $ */
+
/*-
* Copyright (c) 1993 John Brezak
* All rights reserved.
@@ -27,7 +29,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Id: rusers_proc.c,v 1.7 2001/01/17 19:23:27 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rusers_proc.c,v 1.8 2001/01/28 19:34:31 niklas Exp $";
#endif /* not lint */
#include <signal.h>
diff --git a/libexec/rpc.rusersd/rusersd.c b/libexec/rpc.rusersd/rusersd.c
index 6d6ebeaa30c..2b3b7d653e7 100644
--- a/libexec/rpc.rusersd/rusersd.c
+++ b/libexec/rpc.rusersd/rusersd.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: rusersd.c,v 1.5 2001/01/28 19:34:32 niklas Exp $ */
+
/*-
* Copyright (c) 1993 John Brezak
* All rights reserved.
@@ -27,7 +29,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Id: rusersd.c,v 1.4 2001/01/17 19:23:27 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rusersd.c,v 1.5 2001/01/28 19:34:32 niklas Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/libexec/rpc.rwalld/Makefile b/libexec/rpc.rwalld/Makefile
index 206ff156098..a092b80f44e 100644
--- a/libexec/rpc.rwalld/Makefile
+++ b/libexec/rpc.rwalld/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1995/10/18 08:43:21 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 2001/01/28 19:34:32 niklas Exp $
PROG = rpc.rwalld
SRCS = rwalld.c
diff --git a/libexec/rpc.rwalld/rwalld.c b/libexec/rpc.rwalld/rwalld.c
index b23ffad5338..7a8f5f7cd01 100644
--- a/libexec/rpc.rwalld/rwalld.c
+++ b/libexec/rpc.rwalld/rwalld.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: rwalld.c,v 1.4 2001/01/28 19:34:32 niklas Exp $ */
+
/*
* Copyright (c) 1993 Christopher G. Demetriou
* All rights reserved.
@@ -28,7 +30,7 @@
*/
#ifndef lint
-static char rcsid[] = "$Id: rwalld.c,v 1.3 2001/01/17 19:23:27 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rwalld.c,v 1.4 2001/01/28 19:34:32 niklas Exp $";
#endif /* not lint */
#include <unistd.h>
diff --git a/libexec/rpc.sprayd/Makefile b/libexec/rpc.sprayd/Makefile
index 433d6df826c..4246ee01989 100644
--- a/libexec/rpc.sprayd/Makefile
+++ b/libexec/rpc.sprayd/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1995/10/18 08:43:22 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 2001/01/28 19:34:32 niklas Exp $
PROG = rpc.sprayd
SRCS = sprayd.c
diff --git a/libexec/rpc.sprayd/sprayd.c b/libexec/rpc.sprayd/sprayd.c
index 9ed64b49831..d6850b16005 100644
--- a/libexec/rpc.sprayd/sprayd.c
+++ b/libexec/rpc.sprayd/sprayd.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: sprayd.c,v 1.3 2001/01/28 19:34:32 niklas Exp $*/
+
/*
* Copyright (c) 1994 Christos Zoulas
* All rights reserved.
@@ -27,11 +29,10 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: sprayd.c,v 1.2 2001/01/17 19:23:28 deraadt Exp $
*/
#ifndef lint
-static char rcsid[] = "$Id: sprayd.c,v 1.2 2001/01/17 19:23:28 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: sprayd.c,v 1.3 2001/01/28 19:34:32 niklas Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/libexec/rshd/Makefile b/libexec/rshd/Makefile
index 34ceca9eb50..b3d671fdef3 100644
--- a/libexec/rshd/Makefile
+++ b/libexec/rshd/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $Id: Makefile,v 1.5 2000/09/03 18:41:15 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2001/01/28 19:34:32 niklas Exp $
PROG= rshd
SRCS= rshd.c
diff --git a/libexec/rshd/rshd.8 b/libexec/rshd/rshd.8
index aa0717e38bd..51c4d1ad404 100644
--- a/libexec/rshd/rshd.8
+++ b/libexec/rshd/rshd.8
@@ -1,3 +1,4 @@
+.\" $OpenBSD: rshd.8,v 1.10 2001/01/28 19:34:32 niklas Exp $
.\" Copyright (c) 1983, 1989, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -30,7 +31,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)rshd.8 8.1 (Berkeley) 6/4/93
-.\" $Id: rshd.8,v 1.9 2000/10/30 17:46:18 aaron Exp $
.\"
.Dd June 4, 1993
.Dt RSHD 8
diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c
index e84669aa169..33d57572714 100644
--- a/libexec/rshd/rshd.c
+++ b/libexec/rshd/rshd.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: rshd.c,v 1.35 2001/01/28 19:34:32 niklas Exp $ */
+
/*-
* Copyright (c) 1988, 1989, 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -39,7 +41,7 @@ static char copyright[] =
#ifndef lint
/* from: static char sccsid[] = "@(#)rshd.c 8.2 (Berkeley) 4/6/94"; */
-static char *rcsid = "$Id: rshd.c,v 1.34 2000/11/10 17:45:43 itojun Exp $";
+static char *rcsid = "$OpenBSD: rshd.c,v 1.35 2001/01/28 19:34:32 niklas Exp $";
#endif /* not lint */
/*
diff --git a/libexec/smtpd/Makefile.inc b/libexec/smtpd/Makefile.inc
index f74ed75e08b..d7e76fdb140 100644
--- a/libexec/smtpd/Makefile.inc
+++ b/libexec/smtpd/Makefile.inc
@@ -1,3 +1,5 @@
+# $OpenBSD: Makefile.inc,v 1.3 2001/01/28 19:34:33 niklas Exp $
+
##########################################################
## Compile time options, These set defaults ##############
##########################################################
diff --git a/libexec/smtpd/smtpd/smtpd.8 b/libexec/smtpd/smtpd/smtpd.8
index 373767daf82..c98875927f2 100644
--- a/libexec/smtpd/smtpd/smtpd.8
+++ b/libexec/smtpd/smtpd/smtpd.8
@@ -1,4 +1,4 @@
-.\" $Id: smtpd.8,v 1.17 2000/10/30 17:46:19 aaron Exp $
+.\" $OpenBSD: smtpd.8,v 1.18 2001/01/28 19:34:33 niklas Exp $
.Dd December 10, 1997
.Dt SMTPD 8
.Os
diff --git a/libexec/smtpd/smtpfwdd/smtpfwdd.8 b/libexec/smtpd/smtpfwdd/smtpfwdd.8
index 6b3eca03558..5cf3e97e4a6 100644
--- a/libexec/smtpd/smtpfwdd/smtpfwdd.8
+++ b/libexec/smtpd/smtpfwdd/smtpfwdd.8
@@ -1,4 +1,4 @@
-.\" $Id: smtpfwdd.8,v 1.13 2000/10/30 17:46:20 aaron Exp $
+.\" $OpenBSD: smtpfwdd.8,v 1.14 2001/01/28 19:34:33 niklas Exp $
.Dd December 10, 1997
.Dt SMTPFWDD 8
.Os
diff --git a/libexec/smtpd/src/Makefile b/libexec/smtpd/src/Makefile
index a4ccbe7abe4..841a609f966 100644
--- a/libexec/smtpd/src/Makefile
+++ b/libexec/smtpd/src/Makefile
@@ -1,3 +1,5 @@
+# $OpenBSD: Makefile,v 1.4 2001/01/28 19:34:33 niklas Exp $
+
##########################################################
## Where do I get installed? #############################
##########################################################
diff --git a/libexec/smtpd/src/Makefile.default b/libexec/smtpd/src/Makefile.default
index a1bbb66b893..e17166aed73 100644
--- a/libexec/smtpd/src/Makefile.default
+++ b/libexec/smtpd/src/Makefile.default
@@ -1,3 +1,5 @@
+# $OpenBSD: Makefile.default,v 1.3 2001/01/28 19:34:33 niklas Exp $
+
##########################################################
## Where do I get installed? #############################
##########################################################
diff --git a/libexec/smtpd/src/Makefile.minimal b/libexec/smtpd/src/Makefile.minimal
index c15e67bca2f..7e3e2daed7a 100644
--- a/libexec/smtpd/src/Makefile.minimal
+++ b/libexec/smtpd/src/Makefile.minimal
@@ -1,3 +1,5 @@
+# $OpenBSD: Makefile.minimal,v 1.3 2001/01/28 19:34:33 niklas Exp $
+
#######
# Makefile.minimal
# Make a completely minimal smtpd. Doesn't do reverse dns lookups on
diff --git a/libexec/smtpd/src/Makefile.nochecks b/libexec/smtpd/src/Makefile.nochecks
index be66e8bfdb5..a59ee5622f9 100644
--- a/libexec/smtpd/src/Makefile.nochecks
+++ b/libexec/smtpd/src/Makefile.nochecks
@@ -1,3 +1,5 @@
+# $OpenBSD: Makefile.nochecks,v 1.3 2001/01/28 19:34:33 niklas Exp $
+
######
#Makefile.nochecks - set to build smtpd WITHOUT the address checking
#functionality in address_check.c.
diff --git a/libexec/smtpd/src/accumlog.c b/libexec/smtpd/src/accumlog.c
index 8c29cd0ea19..aebe5306c4b 100644
--- a/libexec/smtpd/src/accumlog.c
+++ b/libexec/smtpd/src/accumlog.c
@@ -1,5 +1,6 @@
+/* $OpenBSD: accumlog.c,v 1.2 2001/01/28 19:34:34 niklas Exp $*/
+
/*
- * $Id: accumlog.c,v 1.1 1998/06/03 08:57:05 beck Exp $
*
* Copyright (c) 1998 Obtuse Systems Corporation <info@obtuse.com>
* Copyright (c) 1998 Simon J. Gerraty <sjg@quick.com.au>
diff --git a/libexec/smtpd/src/address_check.c b/libexec/smtpd/src/address_check.c
index 46d31eca70e..64bedfdbbe4 100644
--- a/libexec/smtpd/src/address_check.c
+++ b/libexec/smtpd/src/address_check.c
@@ -1,5 +1,6 @@
+/* $OpenBSD: address_check.c,v 1.4 2001/01/28 19:34:34 niklas Exp $ */
+
/*
- * $Id: address_check.c,v 1.3 1998/06/03 08:57:05 beck Exp $
*
* Copyright (c) 1996, 1997 Obtuse Systems Corporation. All rights
* reserved.
diff --git a/libexec/smtpd/src/antirelay_check_rules_example b/libexec/smtpd/src/antirelay_check_rules_example
index 857a217344e..0bf790b8f71 100644
--- a/libexec/smtpd/src/antirelay_check_rules_example
+++ b/libexec/smtpd/src/antirelay_check_rules_example
@@ -1,3 +1,5 @@
+# $OpenBSD: antirelay_check_rules_example,v 1.2 2001/01/28 19:34:34 niklas Exp $
+
# A simple anti-relay only example. Make sure you don't get used as a third
# party relay to spam other unfortunate people and grind your server
# to a halt dealing with the complaints.
diff --git a/libexec/smtpd/src/antispam_check_rules.example b/libexec/smtpd/src/antispam_check_rules.example
index 9a33347e6e4..1748efba6ce 100644
--- a/libexec/smtpd/src/antispam_check_rules.example
+++ b/libexec/smtpd/src/antispam_check_rules.example
@@ -1,3 +1,5 @@
+# $OpenBSD: antispam_check_rules.example,v 1.3 2001/01/28 19:34:34 niklas Exp $
+
#
# example smtpd_check_rules file. If you compiled smtpd with
# CHECK_ADDRESS=1, this file goes in etc/smtpd_check_rules in your
diff --git a/libexec/smtpd/src/contrib/smtpfilter.c b/libexec/smtpd/src/contrib/smtpfilter.c
index c8fe7e45c56..61eeaade603 100644
--- a/libexec/smtpd/src/contrib/smtpfilter.c
+++ b/libexec/smtpd/src/contrib/smtpfilter.c
@@ -1,10 +1,11 @@
+/* $OpenBSD: smtpfilter.c,v 1.2 2001/01/28 19:34:35 niklas Exp $*/
+
/*
* smtpfilter, Filter for filtering headers during forwarding them between
* smtpfwdd and sendmail. Also logs size of message to syslog; may only
* be invoked with one recipient.
*
* OriginalId: smtpfilter.c,v 1.00 1997/3/28 11:04:08 andre Exp $
- * $Id: smtpfilter.c,v 1.1 1997/12/12 05:50:28 beck Exp $
*/
#define MAX_LINE 1024
diff --git a/libexec/smtpd/src/smtp.h b/libexec/smtpd/src/smtp.h
index aa8007ce56f..255462bc014 100644
--- a/libexec/smtpd/src/smtp.h
+++ b/libexec/smtpd/src/smtp.h
@@ -1,7 +1,8 @@
+/* $OpenBSD: smtp.h,v 1.3 2001/01/28 19:34:34 niklas Exp $ */
+
/*
* Obtuse smtp store/forward daemon include file
*
- * $Id: smtp.h,v 1.2 1998/06/03 08:57:07 beck Exp $
*
* Copyright (c) 1996, 1997 Obtuse Systems Corporation. All rights
* reserved.
diff --git a/libexec/smtpd/src/smtpd.c b/libexec/smtpd/src/smtpd.c
index 66180f425b3..71cfddfd5e3 100644
--- a/libexec/smtpd/src/smtpd.c
+++ b/libexec/smtpd/src/smtpd.c
@@ -1,8 +1,9 @@
+/* $OpenBSD: smtpd.c,v 1.11 2001/01/28 19:34:34 niklas Exp $*/
+
/*
* smtpd, Obtuse SMTP daemon, storing agent. does simple collection of
* mail messages, for later forwarding by smtpfwdd.
*
- * $Id: smtpd.c,v 1.10 2000/08/02 13:45:15 aaron Exp $
*
* Copyright (c) 1996, 1997 Obtuse Systems Corporation. All rights
* reserved.
@@ -40,7 +41,7 @@
char *obtuse_copyright =
"Copyright 1996 - Obtuse Systems Corporation - All rights reserved.";
-char *obtuse_rcsid = "$Id: smtpd.c,v 1.10 2000/08/02 13:45:15 aaron Exp $";
+char *obtuse_rcsid = "$OpenBSD: smtpd.c,v 1.11 2001/01/28 19:34:34 niklas Exp $";
#include <stdarg.h>
#include <stdlib.h>
diff --git a/libexec/smtpd/src/smtpd.h b/libexec/smtpd/src/smtpd.h
index 3c44da82cd6..1df7ebc91a5 100644
--- a/libexec/smtpd/src/smtpd.h
+++ b/libexec/smtpd/src/smtpd.h
@@ -1,6 +1,7 @@
+/* $OpenBSD: smtpd.h,v 1.3 2001/01/28 19:34:34 niklas Exp $ */
+
/* Obtuse smtpd SMTP store daemon header file
*
- * $Id: smtpd.h,v 1.2 1998/06/03 08:57:12 beck Exp $
*
* Copyright (c) 1996, 1997 Obtuse Systems Corporation. All rights
* reserved.
diff --git a/libexec/smtpd/src/smtpd_check_rules.example b/libexec/smtpd/src/smtpd_check_rules.example
index 457e9ceec92..a1a01fc5d07 100644
--- a/libexec/smtpd/src/smtpd_check_rules.example
+++ b/libexec/smtpd/src/smtpd_check_rules.example
@@ -1,3 +1,5 @@
+# $OpenBSD: smtpd_check_rules.example,v 1.2 2001/01/28 19:34:34 niklas Exp $
+
#
# example smtpd_check_rules file. If you compiled smtpd with
# CHECK_ADDRESS=1, this file goes in etc/smtpd_check_rules in your
diff --git a/libexec/smtpd/src/smtpfwdd.c b/libexec/smtpd/src/smtpfwdd.c
index 1d1b0219fd3..dae604e1744 100644
--- a/libexec/smtpd/src/smtpfwdd.c
+++ b/libexec/smtpd/src/smtpfwdd.c
@@ -1,10 +1,11 @@
+/* $OpenBSD: smtpfwdd.c,v 1.6 2001/01/28 19:34:34 niklas Exp $*/
+
/*
* smtpfwdd, Obtuse SMTP forward daemon, master process watches spool
* directory for files spooled by smtpd. On seeing one, spawns a child
* to pick it up and invokes sendmail (or sendmail-like agent) to
* deliver it.
*
- * $Id: smtpfwdd.c,v 1.5 2000/10/19 03:06:40 beck Exp $
*
* Copyright (c) 1996, 1997 Obtuse Systems Corporation. All rights
* reserved.
@@ -41,7 +42,7 @@
*/
char *obtuse_copyright =
"Copyright 1996 - Obtuse Systems Corporation - All rights reserved.";
-char *obtuse_rcsid = "$Id: smtpfwdd.c,v 1.5 2000/10/19 03:06:40 beck Exp $";
+char *obtuse_rcsid = "$OpenBSD: smtpfwdd.c,v 1.6 2001/01/28 19:34:34 niklas Exp $";
#include <stdio.h>
#include <signal.h>
diff --git a/libexec/tftpd/Makefile b/libexec/tftpd/Makefile
index 7fc8cfae3c7..4a7330ef0be 100644
--- a/libexec/tftpd/Makefile
+++ b/libexec/tftpd/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.10 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.1 1995/10/18 08:43:25 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 2001/01/28 19:34:35 niklas Exp $
PROG= tftpd
SRCS= tftpd.c tftpsubs.c
diff --git a/libexec/uucpd/Makefile b/libexec/uucpd/Makefile
index c66538e8f40..223c381358b 100644
--- a/libexec/uucpd/Makefile
+++ b/libexec/uucpd/Makefile
@@ -1,5 +1,4 @@
-# from: @(#)Makefile 5.3 (Berkeley) 6/25/90
-# $Id: Makefile,v 1.4 1998/07/05 18:48:56 deraadt Exp $
+# $OpenBSD: Makefile,v 1.5 2001/01/28 19:34:35 niklas Exp $
CFLAGS+= -DBSDINETD
PROG= uucpd
diff --git a/libexec/uucpd/pathnames.h b/libexec/uucpd/pathnames.h
index a2a1c5a0d37..0cd5c3941c0 100644
--- a/libexec/uucpd/pathnames.h
+++ b/libexec/uucpd/pathnames.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: pathnames.h,v 1.2 2001/01/28 19:34:35 niklas Exp $*/
+
/*
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
@@ -31,7 +33,6 @@
* SUCH DAMAGE.
*
* from: @(#)pathnames.h 5.2 (Berkeley) 6/1/90
- * $Id: pathnames.h,v 1.1 1995/10/18 08:43:25 deraadt Exp $
*/
#include <paths.h>
diff --git a/libexec/uucpd/uucpd.c b/libexec/uucpd/uucpd.c
index 7c2cdf2dbf6..b5bd02f8f77 100644
--- a/libexec/uucpd/uucpd.c
+++ b/libexec/uucpd/uucpd.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: uucpd.c,v 1.18 2001/01/28 19:34:35 niklas Exp $ */
+
/*
* Copyright (c) 1985 The Regents of the University of California.
* All rights reserved.
@@ -42,7 +44,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)uucpd.c 5.10 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: uucpd.c,v 1.17 2001/01/17 19:46:11 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: uucpd.c,v 1.18 2001/01/28 19:34:35 niklas Exp $";
#endif /* not lint */
/*