diff options
author | gshapiro <gshapiro@FreeBSD.org> | 2002-08-28 18:12:33 +0000 |
---|---|---|
committer | gshapiro <gshapiro@FreeBSD.org> | 2002-08-28 18:12:33 +0000 |
commit | fd175e74b310673c5249099fd8e0c1b8d1473001 (patch) | |
tree | 6c7f36bdd8cf92a85604cabd36abef7a6d3ca712 /contrib/sendmail | |
parent | cfce8d25d32a0f7a5d6197407e0d2f7640b365ed (diff) | |
download | FreeBSD-src-fd175e74b310673c5249099fd8e0c1b8d1473001.zip FreeBSD-src-fd175e74b310673c5249099fd8e0c1b8d1473001.tar.gz |
Move the $FreeBSD$ CVS labels far enough away from the $Id$ CVS labels so
I don't have to manually resolve conflicts on every import. Ironically,
most of these files have no changes from the vendor version except the
$FreeBSD$ line.
Diffstat (limited to 'contrib/sendmail')
-rw-r--r-- | contrib/sendmail/mail.local/mail.local.8 | 3 | ||||
-rw-r--r-- | contrib/sendmail/mail.local/mail.local.c | 4 | ||||
-rw-r--r-- | contrib/sendmail/mailstats/mailstats.c | 3 | ||||
-rw-r--r-- | contrib/sendmail/makemap/makemap.c | 4 | ||||
-rw-r--r-- | contrib/sendmail/praliases/praliases.c | 4 | ||||
-rw-r--r-- | contrib/sendmail/rmail/rmail.c | 4 | ||||
-rw-r--r-- | contrib/sendmail/smrsh/smrsh.8 | 3 | ||||
-rw-r--r-- | contrib/sendmail/smrsh/smrsh.c | 4 | ||||
-rw-r--r-- | contrib/sendmail/src/aliases.5 | 3 | ||||
-rw-r--r-- | contrib/sendmail/src/conf.c | 4 | ||||
-rw-r--r-- | contrib/sendmail/src/conf.h | 4 | ||||
-rw-r--r-- | contrib/sendmail/src/err.c | 4 | ||||
-rw-r--r-- | contrib/sendmail/src/headers.c | 4 | ||||
-rw-r--r-- | contrib/sendmail/src/mailq.1 | 3 | ||||
-rw-r--r-- | contrib/sendmail/src/mci.c | 4 | ||||
-rw-r--r-- | contrib/sendmail/src/savemail.c | 4 | ||||
-rw-r--r-- | contrib/sendmail/src/sendmail.8 | 3 | ||||
-rw-r--r-- | contrib/sendmail/vacation/vacation.1 | 3 |
18 files changed, 29 insertions, 36 deletions
diff --git a/contrib/sendmail/mail.local/mail.local.8 b/contrib/sendmail/mail.local/mail.local.8 index 2720578..5ded558 100644 --- a/contrib/sendmail/mail.local/mail.local.8 +++ b/contrib/sendmail/mail.local/mail.local.8 @@ -10,8 +10,6 @@ .\" .\" $Id: mail.local.8,v 8.23 2001/04/05 23:27:35 gshapiro Exp $ .\" -.\" $FreeBSD$ -.\" .TH MAIL.LOCAL 8 "$Date: 2001/04/05 23:27:35 $" .SH NAME mail.local @@ -140,3 +138,4 @@ appeared in Version 7 AT&T UNIX as the program .BR mail . +.\" $FreeBSD$ diff --git a/contrib/sendmail/mail.local/mail.local.c b/contrib/sendmail/mail.local/mail.local.c index a8ac285..eb075eb 100644 --- a/contrib/sendmail/mail.local/mail.local.c +++ b/contrib/sendmail/mail.local/mail.local.c @@ -8,6 +8,8 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * + * $FreeBSD$ + * */ #include <sm/gen.h> @@ -31,8 +33,6 @@ SM_IDSTR(id, "@(#)$Id: mail.local.c,v 8.239 2002/05/24 20:56:32 gshapiro Exp $") #include <sm/mbdb.h> #include <sm/sysexits.h> -/* $FreeBSD$ */ - /* ** This is not intended to work on System V derived systems ** such as Solaris or HP-UX, since they use a totally different diff --git a/contrib/sendmail/mailstats/mailstats.c b/contrib/sendmail/mailstats/mailstats.c index e09fcbe..94ac213 100644 --- a/contrib/sendmail/mailstats/mailstats.c +++ b/contrib/sendmail/mailstats/mailstats.c @@ -9,6 +9,7 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * + * $FreeBSD$ * */ @@ -22,8 +23,6 @@ SM_IDSTR(copyright, SM_IDSTR(id, "@(#)$Id: mailstats.c,v 8.98 2002/05/24 23:10:15 gshapiro Exp $") -/* $FreeBSD$ */ - #include <unistd.h> #include <stddef.h> #include <stdlib.h> diff --git a/contrib/sendmail/makemap/makemap.c b/contrib/sendmail/makemap/makemap.c index 29dd47f..350d897 100644 --- a/contrib/sendmail/makemap/makemap.c +++ b/contrib/sendmail/makemap/makemap.c @@ -9,6 +9,8 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * + * $FreeBSD$ + * */ #include <sm/gen.h> @@ -22,8 +24,6 @@ SM_IDSTR(copyright, SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.175 2001/12/28 22:44:01 ca Exp $") -/* $FreeBSD$ */ - #include <sys/types.h> #ifndef ISC_UNIX # include <sys/file.h> diff --git a/contrib/sendmail/praliases/praliases.c b/contrib/sendmail/praliases/praliases.c index ab71ce0..d33a96c 100644 --- a/contrib/sendmail/praliases/praliases.c +++ b/contrib/sendmail/praliases/praliases.c @@ -9,6 +9,8 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * + * $FreeBSD$ + * */ #include <sm/gen.h> @@ -22,8 +24,6 @@ SM_IDSTR(copyright, SM_IDSTR(id, "@(#)$Id: praliases.c,v 8.93 2001/09/11 04:05:07 gshapiro Exp $") -/* $FreeBSD$ */ - #include <sys/types.h> #include <ctype.h> #include <stdlib.h> diff --git a/contrib/sendmail/rmail/rmail.c b/contrib/sendmail/rmail/rmail.c index 3177fd2..5cdc9bb 100644 --- a/contrib/sendmail/rmail/rmail.c +++ b/contrib/sendmail/rmail/rmail.c @@ -8,6 +8,8 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * + * $FreeBSD$ + * */ #include <sm/gen.h> @@ -20,8 +22,6 @@ SM_IDSTR(copyright, SM_IDSTR(id, "@(#)$Id: rmail.c,v 8.61 2001/09/18 21:45:29 gshapiro Exp $") -/* $FreeBSD$ */ - /* * RMAIL -- UUCP mail server. * diff --git a/contrib/sendmail/smrsh/smrsh.8 b/contrib/sendmail/smrsh/smrsh.8 index 6f1fc3e..6796e305 100644 --- a/contrib/sendmail/smrsh/smrsh.8 +++ b/contrib/sendmail/smrsh/smrsh.8 @@ -11,8 +11,6 @@ .\" .\" $Id: smrsh.8,v 8.16 2002/04/25 13:33:40 ca Exp $ .\" -.\" $FreeBSD$ -.\" .TH SMRSH 8 "$Date: 2001/01/24 00:40:47 $" .SH NAME smrsh \- restricted shell for sendmail @@ -87,3 +85,4 @@ to change the default program directory /usr/libexec/sm.bin \- directory for restricted programs .SH SEE ALSO sendmail(8) +.\" $FreeBSD$ diff --git a/contrib/sendmail/smrsh/smrsh.c b/contrib/sendmail/smrsh/smrsh.c index d93cf02..2798f3b 100644 --- a/contrib/sendmail/smrsh/smrsh.c +++ b/contrib/sendmail/smrsh/smrsh.c @@ -9,6 +9,8 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * + * $FreeBSD$ + * */ #include <sm/gen.h> @@ -22,8 +24,6 @@ SM_IDSTR(copyright, SM_IDSTR(id, "@(#)$Id: smrsh.c,v 8.58 2002/05/25 02:41:31 ca Exp $") -/* $FreeBSD$ */ - /* ** SMRSH -- sendmail restricted shell ** diff --git a/contrib/sendmail/src/aliases.5 b/contrib/sendmail/src/aliases.5 index c6c96f9..1678475 100644 --- a/contrib/sendmail/src/aliases.5 +++ b/contrib/sendmail/src/aliases.5 @@ -11,8 +11,6 @@ .\" .\" $Id: aliases.5,v 8.17 2000/12/14 23:09:46 gshapiro Exp $ .\" -.\" $FreeBSD$ -.\" .TH ALIASES 5 "$Date: 2000/12/14 23:09:46 $" .SH NAME aliases @@ -120,3 +118,4 @@ The .B aliases file format appeared in 4.0BSD. +.\" $FreeBSD$ diff --git a/contrib/sendmail/src/conf.c b/contrib/sendmail/src/conf.c index d3f9627..e97b09d 100644 --- a/contrib/sendmail/src/conf.c +++ b/contrib/sendmail/src/conf.c @@ -9,14 +9,14 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * + * $FreeBSD$ + * */ #include <sendmail.h> SM_RCSID("@(#)$Id: conf.c,v 8.972.2.5 2002/08/16 14:56:01 ca Exp $") -/* $FreeBSD$ */ - #include <sendmail/pathnames.h> # include <sys/ioctl.h> diff --git a/contrib/sendmail/src/conf.h b/contrib/sendmail/src/conf.h index fb562f4..f14f3c4 100644 --- a/contrib/sendmail/src/conf.h +++ b/contrib/sendmail/src/conf.h @@ -13,8 +13,6 @@ * $Id: conf.h,v 8.563 2002/06/04 02:13:50 geir Exp $ */ -/* $FreeBSD$ */ - /* ** CONF.H -- All user-configurable parameters for sendmail ** @@ -22,6 +20,8 @@ ** included in the next release. */ +/* $FreeBSD$ */ + #ifndef CONF_H #define CONF_H 1 diff --git a/contrib/sendmail/src/err.c b/contrib/sendmail/src/err.c index 3a75dd5..f4ec686 100644 --- a/contrib/sendmail/src/err.c +++ b/contrib/sendmail/src/err.c @@ -9,14 +9,14 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * + * $FreeBSD$ + * */ #include <sendmail.h> SM_RCSID("@(#)$Id: err.c,v 8.189 2002/01/09 18:52:30 ca Exp $") -/* $FreeBSD$ */ - #if LDAPMAP # include <lber.h> # include <ldap.h> /* for LDAP error codes */ diff --git a/contrib/sendmail/src/headers.c b/contrib/sendmail/src/headers.c index a523a06..385d7a0 100644 --- a/contrib/sendmail/src/headers.c +++ b/contrib/sendmail/src/headers.c @@ -9,12 +9,12 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * + * $FreeBSD$ + * */ #include <sendmail.h> -/* $FreeBSD$ */ - SM_RCSID("@(#)$Id: headers.c,v 8.266.4.1 2002/08/16 14:56:01 ca Exp $") static size_t fix_mime_header __P((char *)); diff --git a/contrib/sendmail/src/mailq.1 b/contrib/sendmail/src/mailq.1 index 6434b92..26d7096 100644 --- a/contrib/sendmail/src/mailq.1 +++ b/contrib/sendmail/src/mailq.1 @@ -11,8 +11,6 @@ .\" .\" $Id: mailq.1,v 8.19 2002/04/12 05:07:58 gshapiro Exp $ .\" -.\" $FreeBSD$ -.\" .TH MAILQ 1 "$Date: 2000/12/23 19:37:48 $" .SH NAME mailq @@ -80,3 +78,4 @@ The .B mailq command appeared in 4.0BSD. +.\" $FreeBSD$ diff --git a/contrib/sendmail/src/mci.c b/contrib/sendmail/src/mci.c index a487196..7d1a4de 100644 --- a/contrib/sendmail/src/mci.c +++ b/contrib/sendmail/src/mci.c @@ -9,10 +9,10 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * + * $FreeBSD$ + * */ -/* $FreeBSD$ */ - #include <sendmail.h> SM_RCSID("@(#)$Id: mci.c,v 8.205 2002/05/24 18:53:48 gshapiro Exp $") diff --git a/contrib/sendmail/src/savemail.c b/contrib/sendmail/src/savemail.c index e354443..61e6bb8 100644 --- a/contrib/sendmail/src/savemail.c +++ b/contrib/sendmail/src/savemail.c @@ -9,10 +9,10 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * + * $FreeBSD$ + * */ -/* $FreeBSD$ */ - #include <sendmail.h> SM_RCSID("@(#)$Id: savemail.c,v 8.299 2002/05/24 20:50:17 gshapiro Exp $") diff --git a/contrib/sendmail/src/sendmail.8 b/contrib/sendmail/src/sendmail.8 index ee7175f..1c014fd 100644 --- a/contrib/sendmail/src/sendmail.8 +++ b/contrib/sendmail/src/sendmail.8 @@ -11,8 +11,6 @@ .\" .\" $Id: sendmail.8,v 8.51 2002/05/24 15:42:13 ca Exp $ .\" -.\" $FreeBSD$ -.\" .TH SENDMAIL 8 "$Date: 2001/03/23 22:10:00 $" .SH NAME sendmail @@ -711,3 +709,4 @@ The .B sendmail command appeared in 4.2BSD. +.\" $FreeBSD$ diff --git a/contrib/sendmail/vacation/vacation.1 b/contrib/sendmail/vacation/vacation.1 index 43f1976..913a412 100644 --- a/contrib/sendmail/vacation/vacation.1 +++ b/contrib/sendmail/vacation/vacation.1 @@ -11,8 +11,6 @@ .\" .\" $Id: vacation.1,v 8.29.2.1 2002/06/21 21:28:06 ca Exp $ .\" -.\" $FreeBSD$ -.\" .TH VACATION 1 "$Date: 2002/06/21 21:28:06 $" .SH NAME vacation @@ -270,3 +268,4 @@ The .B vacation command appeared in 4.3BSD. +.\" $FreeBSD$ |