From bee79b64921d9dfeec791bcfa71ccd99d00ae66c Mon Sep 17 00:00:00 2001
From: Keith Bostic <bostic@ucbvax.Berkeley.EDU>
Date: Mon, 14 Mar 1988 03:53:40 -0800
Subject: [PATCH] add Berkeley specific header

SCCS-vsn: usr.sbin/sendmail/src/READ_ME 4.4
SCCS-vsn: usr.sbin/sendmail/src/alias.c 5.14
SCCS-vsn: usr.sbin/sendmail/src/arpadate.c 5.7
SCCS-vsn: usr.sbin/sendmail/src/clock.c 5.5
SCCS-vsn: usr.sbin/sendmail/src/collect.c 5.3
SCCS-vsn: usr.sbin/sendmail/src/conf.c 5.15
SCCS-vsn: usr.sbin/sendmail/src/conf.h 5.9
SCCS-vsn: usr.sbin/sendmail/src/convtime.c 5.2
SCCS-vsn: usr.sbin/sendmail/src/deliver.c 5.16
SCCS-vsn: usr.sbin/sendmail/src/envelope.c 5.13
SCCS-vsn: usr.sbin/sendmail/src/err.c 5.8
SCCS-vsn: usr.sbin/sendmail/src/headers.c 5.9
SCCS-vsn: usr.sbin/sendmail/src/macro.c 5.4
SCCS-vsn: usr.sbin/sendmail/src/mailstats.h 5.2
SCCS-vsn: usr.sbin/sendmail/src/main.c 5.15
SCCS-vsn: usr.sbin/sendmail/src/parseaddr.c 5.8
SCCS-vsn: usr.sbin/sendmail/src/queue.c 5.23
SCCS-vsn: usr.sbin/sendmail/src/readcf.c 5.11
SCCS-vsn: usr.sbin/sendmail/src/recipient.c 5.11
SCCS-vsn: usr.sbin/sendmail/src/savemail.c 5.8
SCCS-vsn: usr.sbin/sendmail/src/sendmail.h 5.11
SCCS-vsn: usr.sbin/sendmail/src/srvrsmtp.c 5.21
SCCS-vsn: usr.sbin/sendmail/src/stab.c 5.4
SCCS-vsn: usr.sbin/sendmail/src/stats.c 5.9
SCCS-vsn: usr.sbin/sendmail/src/sysexits.c 5.3
SCCS-vsn: usr.sbin/sendmail/src/trace.c 5.4
SCCS-vsn: usr.sbin/sendmail/src/usersmtp.c 5.9
SCCS-vsn: usr.sbin/sendmail/src/util.c 5.11
SCCS-vsn: usr.sbin/sendmail/src/version.c 5.59
---
 usr/src/usr.sbin/sendmail/src/READ_ME     | 20 +++++++----
 usr/src/usr.sbin/sendmail/src/alias.c     | 39 +++++++++++---------
 usr/src/usr.sbin/sendmail/src/arpadate.c  | 26 ++++++++------
 usr/src/usr.sbin/sendmail/src/clock.c     | 26 ++++++++------
 usr/src/usr.sbin/sendmail/src/collect.c   | 26 ++++++++------
 usr/src/usr.sbin/sendmail/src/conf.c      | 26 ++++++++------
 usr/src/usr.sbin/sendmail/src/conf.h      | 29 ++++++++-------
 usr/src/usr.sbin/sendmail/src/convtime.c  | 26 ++++++++------
 usr/src/usr.sbin/sendmail/src/deliver.c   | 26 ++++++++------
 usr/src/usr.sbin/sendmail/src/envelope.c  | 26 ++++++++------
 usr/src/usr.sbin/sendmail/src/err.c       | 26 ++++++++------
 usr/src/usr.sbin/sendmail/src/headers.c   | 26 ++++++++------
 usr/src/usr.sbin/sendmail/src/macro.c     | 26 ++++++++------
 usr/src/usr.sbin/sendmail/src/mailstats.h | 28 +++++++++------
 usr/src/usr.sbin/sendmail/src/main.c      | 30 +++++++++-------
 usr/src/usr.sbin/sendmail/src/parseaddr.c | 26 ++++++++------
 usr/src/usr.sbin/sendmail/src/queue.c     | 42 ++++++++++++----------
 usr/src/usr.sbin/sendmail/src/readcf.c    | 26 ++++++++------
 usr/src/usr.sbin/sendmail/src/recipient.c | 26 ++++++++------
 usr/src/usr.sbin/sendmail/src/savemail.c  | 26 ++++++++------
 usr/src/usr.sbin/sendmail/src/sendmail.h  | 31 +++++++++-------
 usr/src/usr.sbin/sendmail/src/srvrsmtp.c  | 42 ++++++++++++----------
 usr/src/usr.sbin/sendmail/src/stab.c      | 26 ++++++++------
 usr/src/usr.sbin/sendmail/src/stats.c     | 26 ++++++++------
 usr/src/usr.sbin/sendmail/src/sysexits.c  | 26 ++++++++------
 usr/src/usr.sbin/sendmail/src/trace.c     | 26 ++++++++------
 usr/src/usr.sbin/sendmail/src/usersmtp.c  | 44 ++++++++++++-----------
 usr/src/usr.sbin/sendmail/src/util.c      | 26 ++++++++------
 usr/src/usr.sbin/sendmail/src/version.c   | 28 +++++++++------
 29 files changed, 498 insertions(+), 329 deletions(-)

diff --git a/usr/src/usr.sbin/sendmail/src/READ_ME b/usr/src/usr.sbin/sendmail/src/READ_ME
index 4289351091..7e79f7acf3 100644
--- a/usr/src/usr.sbin/sendmail/src/READ_ME
+++ b/usr/src/usr.sbin/sendmail/src/READ_ME
@@ -1,14 +1,20 @@
 #
+# Copyright (c) 1988 Regents of the University of California.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms are permitted
+# provided that this notice is preserved and that due credit is given
+# to the University of California at Berkeley. The name of the University
+# may not be used to endorse or promote products derived from this
+# software without specific prior written permission. This software
+# is provided ``as is'' without express or implied warranty.
+#
+#	@(#)READ_ME	4.4 (Berkeley) %G%
+#
 #  Sendmail
 #  Copyright (c) 1983  Eric P. Allman
 #  Berkeley, California
 #
-#  Copyright (c) 1983 Regents of the University of California.
-#  All rights reserved.  The Berkeley software License Agreement
-#  specifies the terms and conditions for redistribution.
-#
-#	@(#)READ_ME	4.3 (Berkeley) %G%
-#
 This directory contains the source files for sendmail.
 
 For installation instructions, please read the document ../doc/op.me:
@@ -70,4 +76,4 @@ version.c	A master file for Version.c -- it may not exist in
 
 Eric Allman
 
-(Version 4.3, last update %G% 16:58:23)
+(Version 4.4, last update %G% 19:51:24)
diff --git a/usr/src/usr.sbin/sendmail/src/alias.c b/usr/src/usr.sbin/sendmail/src/alias.c
index ae8ef57175..56c8f0f0fe 100644
--- a/usr/src/usr.sbin/sendmail/src/alias.c
+++ b/usr/src/usr.sbin/sendmail/src/alias.c
@@ -1,12 +1,26 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
+
+#ifndef lint
+#ifdef DBM
+static char sccsid[] = "@(#)alias.c	5.14 (Berkeley) %G% (with DBM)";
+#else
+static char sccsid[] = "@(#)alias.c	5.14 (Berkeley) %G% (without DBM)";
+#endif
+#endif /* not lint */
 
 # include <pwd.h>
 # include <sys/types.h>
@@ -18,15 +32,6 @@
 # include <sys/file.h>
 # endif FLOCK
 
-#ifndef lint
-# ifdef DBM
-static char	SccsId[] = "@(#)alias.c	5.13 (Berkeley) %G%	(with DBM)";
-# else DBM
-static char	SccsId[] = "@(#)alias.c	5.13 (Berkeley) %G%	(without DBM)";
-# endif DBM
-#endif not lint
-
-
 /*
 **  ALIAS -- Compute aliases.
 **
diff --git a/usr/src/usr.sbin/sendmail/src/arpadate.c b/usr/src/usr.sbin/sendmail/src/arpadate.c
index b98a1de6cf..9bb3ea9698 100644
--- a/usr/src/usr.sbin/sendmail/src/arpadate.c
+++ b/usr/src/usr.sbin/sendmail/src/arpadate.c
@@ -1,16 +1,22 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
 
 #ifndef lint
-static char	SccsId[] = "@(#)arpadate.c	5.6 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)arpadate.c	5.7 (Berkeley) %G%";
+#endif /* not lint */
 
 # include "conf.h"
 # ifdef USG
diff --git a/usr/src/usr.sbin/sendmail/src/clock.c b/usr/src/usr.sbin/sendmail/src/clock.c
index 75fa36e1b0..50d8defa18 100644
--- a/usr/src/usr.sbin/sendmail/src/clock.c
+++ b/usr/src/usr.sbin/sendmail/src/clock.c
@@ -1,16 +1,22 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
 
 #ifndef lint
-static char	SccsId[] = "@(#)clock.c	5.4 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)clock.c	5.5 (Berkeley) %G%";
+#endif /* not lint */
 
 # include "sendmail.h"
 # include <signal.h>
diff --git a/usr/src/usr.sbin/sendmail/src/collect.c b/usr/src/usr.sbin/sendmail/src/collect.c
index 8a0fc2e23d..d9eaa08330 100644
--- a/usr/src/usr.sbin/sendmail/src/collect.c
+++ b/usr/src/usr.sbin/sendmail/src/collect.c
@@ -1,16 +1,22 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
 
 #ifndef lint
-static char	SccsId[] = "@(#)collect.c	5.2 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)collect.c	5.3 (Berkeley) %G%";
+#endif /* not lint */
 
 # include <errno.h>
 # include "sendmail.h"
diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c
index ba556c86fc..02e47cfb2a 100644
--- a/usr/src/usr.sbin/sendmail/src/conf.c
+++ b/usr/src/usr.sbin/sendmail/src/conf.c
@@ -1,16 +1,22 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
 
 #ifndef lint
-static char	SccsId[] = "@(#)conf.c	5.14 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)conf.c	5.15 (Berkeley) %G%";
+#endif /* not lint */
 
 # include <pwd.h>
 # include <sys/ioctl.h>
diff --git a/usr/src/usr.sbin/sendmail/src/conf.h b/usr/src/usr.sbin/sendmail/src/conf.h
index f632e549a1..f630dc51fd 100644
--- a/usr/src/usr.sbin/sendmail/src/conf.h
+++ b/usr/src/usr.sbin/sendmail/src/conf.h
@@ -1,21 +1,26 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-**
-**	@(#)conf.h	5.8 (Berkeley) %G%
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *	@(#)conf.h	5.9 (Berkeley) %G%
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ *
+ */
 
 /*
 **  CONF.H -- All user-configurable parameters for sendmail
 */
 
-
-
 /*
 **  Table sizes, etc....
 **	There shouldn't be much need to change these....
diff --git a/usr/src/usr.sbin/sendmail/src/convtime.c b/usr/src/usr.sbin/sendmail/src/convtime.c
index fefce50881..5de96d87fe 100644
--- a/usr/src/usr.sbin/sendmail/src/convtime.c
+++ b/usr/src/usr.sbin/sendmail/src/convtime.c
@@ -1,16 +1,22 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
 
 #ifndef lint
-static char	SccsId[] = "@(#)convtime.c	5.1 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)convtime.c	5.2 (Berkeley) %G%";
+#endif /* not lint */
 
 # include <ctype.h>
 # include "useful.h"
diff --git a/usr/src/usr.sbin/sendmail/src/deliver.c b/usr/src/usr.sbin/sendmail/src/deliver.c
index 18ab346fc6..21040510d4 100644
--- a/usr/src/usr.sbin/sendmail/src/deliver.c
+++ b/usr/src/usr.sbin/sendmail/src/deliver.c
@@ -1,16 +1,22 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
 
 #ifndef lint
-static char	SccsId[] = "@(#)deliver.c	5.15 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)deliver.c	5.16 (Berkeley) %G%";
+#endif /* not lint */
 
 # include <signal.h>
 # include <errno.h>
diff --git a/usr/src/usr.sbin/sendmail/src/envelope.c b/usr/src/usr.sbin/sendmail/src/envelope.c
index 5e17aa55ff..ad856fc6ff 100644
--- a/usr/src/usr.sbin/sendmail/src/envelope.c
+++ b/usr/src/usr.sbin/sendmail/src/envelope.c
@@ -1,16 +1,22 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
 
 #ifndef lint
-static char	SccsId[] = "@(#)envelope.c	5.12 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)envelope.c	5.13 (Berkeley) %G%";
+#endif /* not lint */
 
 #include <pwd.h>
 #include <sys/time.h>
diff --git a/usr/src/usr.sbin/sendmail/src/err.c b/usr/src/usr.sbin/sendmail/src/err.c
index 95f37a2be0..d306e203bf 100644
--- a/usr/src/usr.sbin/sendmail/src/err.c
+++ b/usr/src/usr.sbin/sendmail/src/err.c
@@ -1,16 +1,22 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
 
 #ifndef lint
-static char	SccsId[] = "@(#)err.c	5.7 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)err.c	5.8 (Berkeley) %G%";
+#endif /* not lint */
 
 # include "sendmail.h"
 # include <errno.h>
diff --git a/usr/src/usr.sbin/sendmail/src/headers.c b/usr/src/usr.sbin/sendmail/src/headers.c
index 0f41264ee0..2379508961 100644
--- a/usr/src/usr.sbin/sendmail/src/headers.c
+++ b/usr/src/usr.sbin/sendmail/src/headers.c
@@ -1,16 +1,22 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
 
 #ifndef lint
-static char	SccsId[] = "@(#)headers.c	5.8 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)headers.c	5.9 (Berkeley) %G%";
+#endif /* not lint */
 
 # include <errno.h>
 # include "sendmail.h"
diff --git a/usr/src/usr.sbin/sendmail/src/macro.c b/usr/src/usr.sbin/sendmail/src/macro.c
index 998bbfc199..b2b3413718 100644
--- a/usr/src/usr.sbin/sendmail/src/macro.c
+++ b/usr/src/usr.sbin/sendmail/src/macro.c
@@ -1,16 +1,22 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
 
 #ifndef lint
-static char	SccsId[] = "@(#)macro.c	5.3 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)macro.c	5.4 (Berkeley) %G%";
+#endif /* not lint */
 
 # include "sendmail.h"
 # include "conf.h"
diff --git a/usr/src/usr.sbin/sendmail/src/mailstats.h b/usr/src/usr.sbin/sendmail/src/mailstats.h
index 062770f8e4..452383ac4e 100644
--- a/usr/src/usr.sbin/sendmail/src/mailstats.h
+++ b/usr/src/usr.sbin/sendmail/src/mailstats.h
@@ -1,15 +1,21 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-**
-**	"@(#)mailstats.h	5.1 (Berkeley) %G%";
-**
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *	@(#)mailstats.h	5.2 (Berkeley) %G%
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ *
+ */
 
 /*
 **  Statistics structure.
diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index ff6684265f..92b9a5d245 100644
--- a/usr/src/usr.sbin/sendmail/src/main.c
+++ b/usr/src/usr.sbin/sendmail/src/main.c
@@ -1,22 +1,28 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
 
 #ifndef lint
 char copyright[] =
-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
+"@(#) Copyright (c) 1988 Regents of the University of California.\n\
  All rights reserved.\n";
-#endif not lint
+#endif /* not lint */
 
 #ifndef lint
-static char	SccsId[] = "@(#)main.c	5.14 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)main.c	5.15 (Berkeley) %G%";
+#endif /* not lint */
 
 # define  _DEFINE
 # include <signal.h>
diff --git a/usr/src/usr.sbin/sendmail/src/parseaddr.c b/usr/src/usr.sbin/sendmail/src/parseaddr.c
index 8bc50946ac..28d9faa7e1 100644
--- a/usr/src/usr.sbin/sendmail/src/parseaddr.c
+++ b/usr/src/usr.sbin/sendmail/src/parseaddr.c
@@ -1,16 +1,22 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
 
 #ifndef lint
-static char	SccsId[] = "@(#)parseaddr.c	5.7 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)parseaddr.c	5.8 (Berkeley) %G%";
+#endif /* not lint */
 
 # include "sendmail.h"
 
diff --git a/usr/src/usr.sbin/sendmail/src/queue.c b/usr/src/usr.sbin/sendmail/src/queue.c
index f268dd2e79..8afff20f06 100644
--- a/usr/src/usr.sbin/sendmail/src/queue.c
+++ b/usr/src/usr.sbin/sendmail/src/queue.c
@@ -1,29 +1,35 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
-
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
 
 # include "sendmail.h"
+
+#ifndef lint
+#ifdef QUEUE
+static char sccsid[] = "@(#)queue.c	5.23 (Berkeley) %G% (with queueing)";
+#else
+static char sccsid[] = "@(#)queue.c	5.23 (Berkeley) %G% (without queueing)";
+#endif
+#endif /* not lint */
+
 # include <sys/stat.h>
 # include <sys/dir.h>
 # include <signal.h>
 # include <errno.h>
 
-# ifndef QUEUE
-# ifndef lint
-static char	SccsId[] = "@(#)queue.c	5.22 (Berkeley) %G%	(no queueing)";
-# endif not lint
-# else QUEUE
-
-# ifndef lint
-static char	SccsId[] = "@(#)queue.c	5.22 (Berkeley) %G%";
-# endif not lint
+# ifdef QUEUE
 
 /*
 **  Work queue.
diff --git a/usr/src/usr.sbin/sendmail/src/readcf.c b/usr/src/usr.sbin/sendmail/src/readcf.c
index ad6b08d4b1..6056af3ce9 100644
--- a/usr/src/usr.sbin/sendmail/src/readcf.c
+++ b/usr/src/usr.sbin/sendmail/src/readcf.c
@@ -1,16 +1,22 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
 
 #ifndef lint
-static char	SccsId[] = "@(#)readcf.c	5.10 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)readcf.c	5.11 (Berkeley) %G%";
+#endif /* not lint */
 
 # include "sendmail.h"
 
diff --git a/usr/src/usr.sbin/sendmail/src/recipient.c b/usr/src/usr.sbin/sendmail/src/recipient.c
index 24a1e52e12..4d0cc1b7af 100644
--- a/usr/src/usr.sbin/sendmail/src/recipient.c
+++ b/usr/src/usr.sbin/sendmail/src/recipient.c
@@ -1,16 +1,22 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
 
 #ifndef lint
-static char	SccsId[] = "@(#)recipient.c	5.10 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)recipient.c	5.11 (Berkeley) %G%";
+#endif /* not lint */
 
 # include <pwd.h>
 # include "sendmail.h"
diff --git a/usr/src/usr.sbin/sendmail/src/savemail.c b/usr/src/usr.sbin/sendmail/src/savemail.c
index c880f63648..d9066cf62d 100644
--- a/usr/src/usr.sbin/sendmail/src/savemail.c
+++ b/usr/src/usr.sbin/sendmail/src/savemail.c
@@ -1,16 +1,22 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
 
 #ifndef lint
-static char	SccsId[] = "@(#)savemail.c	5.7 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)savemail.c	5.8 (Berkeley) %G%";
+#endif /* not lint */
 
 # include <pwd.h>
 # include "sendmail.h"
diff --git a/usr/src/usr.sbin/sendmail/src/sendmail.h b/usr/src/usr.sbin/sendmail/src/sendmail.h
index b92f0f633a..38270cf966 100644
--- a/usr/src/usr.sbin/sendmail/src/sendmail.h
+++ b/usr/src/usr.sbin/sendmail/src/sendmail.h
@@ -1,25 +1,30 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-**
-**	@(#)sendmail.h	5.10.1.2 (Berkeley) %G%
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *	@(#)sendmail.h	5.11 (Berkeley) %G%
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ *
+ */
 
 /*
 **  SENDMAIL.H -- Global definitions for sendmail.
 */
 
-
-
 # ifdef _DEFINE
 # define EXTERN
 # ifndef lint
-static char SmailSccsId[] =	"@(#)sendmail.h	5.10.1.2		%G%";
+static char SmailSccsId[] =	"@(#)sendmail.h	5.11		%G%";
 # endif lint
 # else  _DEFINE
 # define EXTERN extern
diff --git a/usr/src/usr.sbin/sendmail/src/srvrsmtp.c b/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
index 8c1215490c..bb6b55762c 100644
--- a/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
+++ b/usr/src/usr.sbin/sendmail/src/srvrsmtp.c
@@ -1,27 +1,33 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
+
+# include "sendmail.h"
 
+#ifndef lint
+#ifdef SMTP
+static char sccsid[] = "@(#)srvrsmtp.c	5.21 (Berkeley) %G% (with SMTP)";
+#else
+static char sccsid[] = "@(#)srvrsmtp.c	5.21 (Berkeley) %G% (without SMTP)";
+#endif
+#endif /* not lint */
 
 # include <errno.h>
-# include "sendmail.h"
 # include <signal.h>
 
-# ifndef SMTP
-# ifndef lint
-static char	SccsId[] = "@(#)srvrsmtp.c	5.20 (Berkeley) %G%	(no SMTP)";
-# endif not lint
-# else SMTP
-
-# ifndef lint
-static char	SccsId[] = "@(#)srvrsmtp.c	5.20 (Berkeley) %G%";
-# endif not lint
+# ifdef SMTP
 
 /*
 **  SMTP -- run the SMTP protocol.
diff --git a/usr/src/usr.sbin/sendmail/src/stab.c b/usr/src/usr.sbin/sendmail/src/stab.c
index 45287fffb0..c94d0132a6 100644
--- a/usr/src/usr.sbin/sendmail/src/stab.c
+++ b/usr/src/usr.sbin/sendmail/src/stab.c
@@ -1,16 +1,22 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
 
 #ifndef lint
-static char	SccsId[] = "@(#)stab.c	5.3 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)stab.c	5.4 (Berkeley) %G%";
+#endif /* not lint */
 
 # include "sendmail.h"
 
diff --git a/usr/src/usr.sbin/sendmail/src/stats.c b/usr/src/usr.sbin/sendmail/src/stats.c
index cf640bed57..2aac120ac4 100644
--- a/usr/src/usr.sbin/sendmail/src/stats.c
+++ b/usr/src/usr.sbin/sendmail/src/stats.c
@@ -1,16 +1,22 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
 
 #ifndef lint
-static char	SccsId[] = "@(#)stats.c	5.8 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)stats.c	5.9 (Berkeley) %G%";
+#endif /* not lint */
 
 # include "sendmail.h"
 # include "mailstats.h"
diff --git a/usr/src/usr.sbin/sendmail/src/sysexits.c b/usr/src/usr.sbin/sendmail/src/sysexits.c
index 6a6ced3c00..c64361ca61 100644
--- a/usr/src/usr.sbin/sendmail/src/sysexits.c
+++ b/usr/src/usr.sbin/sendmail/src/sysexits.c
@@ -1,16 +1,22 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
 
 #ifndef lint
-static char	SccsId[] = "@(#)sysexits.c	5.2 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)sysexits.c	5.3 (Berkeley) %G%";
+#endif /* not lint */
 
 # include <sysexits.h>
 # include "useful.h"
diff --git a/usr/src/usr.sbin/sendmail/src/trace.c b/usr/src/usr.sbin/sendmail/src/trace.c
index 716ecb6881..b5f3101944 100644
--- a/usr/src/usr.sbin/sendmail/src/trace.c
+++ b/usr/src/usr.sbin/sendmail/src/trace.c
@@ -1,16 +1,22 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
 
 #ifndef lint
-static char	SccsId[] = "@(#)trace.c	5.3 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)trace.c	5.4 (Berkeley) %G%";
+#endif /* not lint */
 
 # include "sendmail.h"
 
diff --git a/usr/src/usr.sbin/sendmail/src/usersmtp.c b/usr/src/usr.sbin/sendmail/src/usersmtp.c
index 37d6417095..c5f6fff3cd 100644
--- a/usr/src/usr.sbin/sendmail/src/usersmtp.c
+++ b/usr/src/usr.sbin/sendmail/src/usersmtp.c
@@ -1,29 +1,33 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
 
-
-# include <sysexits.h>
-# include <errno.h>
 # include "sendmail.h"
 
-# ifndef SMTP
-# ifndef lint
-static char	SccsId[] = "@(#)usersmtp.c	5.8 (Berkeley) %G%	(no SMTP)";
-# endif not lint
-# else SMTP
-
-# ifndef lint
-static char	SccsId[] = "@(#)usersmtp.c	5.8 (Berkeley) %G%";
-# endif not lint
+#ifndef lint
+#ifdef SMTP
+static char sccsid[] = "@(#)usersmtp.c	5.9 (Berkeley) %G% (with SMTP)";
+#else
+static char sccsid[] = "@(#)usersmtp.c	5.9 (Berkeley) %G% (without SMTP)";
+#endif
+#endif /* not lint */
 
+# include <sysexits.h>
+# include <errno.h>
 
+# ifdef SMTP
 
 /*
 **  USERSMTP -- run SMTP protocol from the user end.
diff --git a/usr/src/usr.sbin/sendmail/src/util.c b/usr/src/usr.sbin/sendmail/src/util.c
index 9bc9b05300..ee7a466a95 100644
--- a/usr/src/usr.sbin/sendmail/src/util.c
+++ b/usr/src/usr.sbin/sendmail/src/util.c
@@ -1,16 +1,22 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
 
 #ifndef lint
-static char	SccsId[] = "@(#)util.c	5.10 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)util.c	5.11 (Berkeley) %G%";
+#endif /* not lint */
 
 # include <stdio.h>
 # include <pwd.h>
diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index 869fffdc9c..42b5d42198 100644
--- a/usr/src/usr.sbin/sendmail/src/version.c
+++ b/usr/src/usr.sbin/sendmail/src/version.c
@@ -1,15 +1,21 @@
 /*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ *
+ *  Sendmail
+ *  Copyright (c) 1983  Eric P. Allman
+ *  Berkeley, California
+ */
 
 #ifndef lint
-static char	SccsId[] = "@(#)version.c	5.58 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)version.c	5.59 (Berkeley) %G%";
+#endif /* not lint */
 
-char	Version[] = "5.58";
+char	Version[] = "5.59";
-- 
2.20.1