From 69b6924beee8d8135c10dea5036002511d676f9c Mon Sep 17 00:00:00 2001 From: gshapiro Date: Sat, 20 Apr 2002 20:34:16 +0000 Subject: Resolve conflicts from import of post-8.12.3 bug fixes. --- contrib/sendmail/cf/m4/cfhead.m4 | 2 +- contrib/sendmail/cf/ostype/bsd4.4.m4 | 2 +- contrib/sendmail/cf/sh/makeinfo.sh | 2 +- contrib/sendmail/mail.local/mail.local.8 | 2 +- contrib/sendmail/mail.local/mail.local.c | 2 +- contrib/sendmail/mailstats/mailstats.c | 2 +- contrib/sendmail/makemap/makemap.c | 2 +- contrib/sendmail/praliases/praliases.c | 2 +- contrib/sendmail/rmail/rmail.c | 2 +- contrib/sendmail/smrsh/smrsh.8 | 2 +- contrib/sendmail/smrsh/smrsh.c | 2 +- contrib/sendmail/src/aliases.5 | 2 +- contrib/sendmail/src/conf.c | 2 +- contrib/sendmail/src/conf.h | 2 +- contrib/sendmail/src/err.c | 2 +- contrib/sendmail/src/mailq.1 | 11 +++++++++-- contrib/sendmail/src/mci.c | 2 +- contrib/sendmail/src/savemail.c | 2 +- contrib/sendmail/src/sendmail.8 | 2 +- contrib/sendmail/vacation/vacation.1 | 2 +- 20 files changed, 28 insertions(+), 21 deletions(-) diff --git a/contrib/sendmail/cf/m4/cfhead.m4 b/contrib/sendmail/cf/m4/cfhead.m4 index a857c6c..aae4d6e 100644 --- a/contrib/sendmail/cf/m4/cfhead.m4 +++ b/contrib/sendmail/cf/m4/cfhead.m4 @@ -303,4 +303,4 @@ define(`confMILTER_MACROS_ENVRCPT', ``{rcpt_mailer}, {rcpt_host}, {rcpt_addr}'') divert(0)dnl -VERSIONID(`$Id: cfhead.m4,v 8.107 2001/07/22 03:25:37 ca Exp $') +VERSIONID(`$Id: cfhead.m4,v 1.1.1.7 2002/02/17 21:56:44 gshapiro Exp $') diff --git a/contrib/sendmail/cf/ostype/bsd4.4.m4 b/contrib/sendmail/cf/ostype/bsd4.4.m4 index 65309b9..15ea055e 100644 --- a/contrib/sendmail/cf/ostype/bsd4.4.m4 +++ b/contrib/sendmail/cf/ostype/bsd4.4.m4 @@ -14,7 +14,7 @@ divert(-1) # divert(0) -VERSIONID(`$Id: bsd4.4.m4,v 8.14 1999/04/24 05:37:40 gshapiro Exp $') +VERSIONID(`$Id: bsd4.4.m4,v 1.1.1.3 2000/08/12 21:55:39 gshapiro Exp $') ifdef(`STATUS_FILE',, `define(`STATUS_FILE', `/var/log/sendmail.st')')dnl ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /usr/libexec/mail.local)')dnl ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail $u')')dnl diff --git a/contrib/sendmail/cf/sh/makeinfo.sh b/contrib/sendmail/cf/sh/makeinfo.sh index e7b0cd1..0a8275f 100644 --- a/contrib/sendmail/cf/sh/makeinfo.sh +++ b/contrib/sendmail/cf/sh/makeinfo.sh @@ -11,7 +11,7 @@ # the sendmail distribution. # # -# $Id: makeinfo.sh,v 8.14 1999/02/07 07:26:25 gshapiro Exp $ +# $Id: makeinfo.sh,v 1.1.1.3 2000/08/12 21:55:41 gshapiro Exp $ # # $FreeBSD$ # diff --git a/contrib/sendmail/mail.local/mail.local.8 b/contrib/sendmail/mail.local/mail.local.8 index 2720578..97fd436 100644 --- a/contrib/sendmail/mail.local/mail.local.8 +++ b/contrib/sendmail/mail.local/mail.local.8 @@ -8,7 +8,7 @@ .\" the sendmail distribution. .\" .\" -.\" $Id: mail.local.8,v 8.23 2001/04/05 23:27:35 gshapiro Exp $ +.\" $Id: mail.local.8,v 1.1.1.6 2002/02/17 21:56:42 gshapiro Exp $ .\" .\" $FreeBSD$ .\" diff --git a/contrib/sendmail/mail.local/mail.local.c b/contrib/sendmail/mail.local/mail.local.c index 3965233..d93420a 100644 --- a/contrib/sendmail/mail.local/mail.local.c +++ b/contrib/sendmail/mail.local/mail.local.c @@ -18,7 +18,7 @@ SM_IDSTR(copyright, Copyright (c) 1990, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n") -SM_IDSTR(id, "@(#)$Id: mail.local.c,v 8.238 2002/03/30 07:43:21 geir Exp $") +SM_IDSTR(id, "@(#)$Id: mail.local.c,v 1.1.1.9 2002/04/10 03:04:53 gshapiro Exp $") #include #include diff --git a/contrib/sendmail/mailstats/mailstats.c b/contrib/sendmail/mailstats/mailstats.c index f3f9cb7..4f37abe 100644 --- a/contrib/sendmail/mailstats/mailstats.c +++ b/contrib/sendmail/mailstats/mailstats.c @@ -20,7 +20,7 @@ SM_IDSTR(copyright, Copyright (c) 1988, 1993\n\ The Regents of the University of California. All rights reserved.\n") -SM_IDSTR(id, "@(#)$Id: mailstats.c,v 8.95 2001/12/30 04:59:40 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: mailstats.c,v 1.1.1.8 2002/02/17 21:56:43 gshapiro Exp $") /* $FreeBSD$ */ diff --git a/contrib/sendmail/makemap/makemap.c b/contrib/sendmail/makemap/makemap.c index 29dd47f..1f4b098 100644 --- a/contrib/sendmail/makemap/makemap.c +++ b/contrib/sendmail/makemap/makemap.c @@ -20,7 +20,7 @@ SM_IDSTR(copyright, Copyright (c) 1992, 1993\n\ The Regents of the University of California. All rights reserved.\n") -SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.175 2001/12/28 22:44:01 ca Exp $") +SM_IDSTR(id, "@(#)$Id: makemap.c,v 1.1.1.6 2002/02/17 21:56:43 gshapiro Exp $") /* $FreeBSD$ */ diff --git a/contrib/sendmail/praliases/praliases.c b/contrib/sendmail/praliases/praliases.c index ab71ce0..8f5f001 100644 --- a/contrib/sendmail/praliases/praliases.c +++ b/contrib/sendmail/praliases/praliases.c @@ -20,7 +20,7 @@ SM_IDSTR(copyright, Copyright (c) 1988, 1993\n\ The Regents of the University of California. All rights reserved.\n") -SM_IDSTR(id, "@(#)$Id: praliases.c,v 8.93 2001/09/11 04:05:07 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: praliases.c,v 1.1.1.7 2002/02/17 21:56:45 gshapiro Exp $") /* $FreeBSD$ */ diff --git a/contrib/sendmail/rmail/rmail.c b/contrib/sendmail/rmail/rmail.c index 3177fd2..6b14daa 100644 --- a/contrib/sendmail/rmail/rmail.c +++ b/contrib/sendmail/rmail/rmail.c @@ -18,7 +18,7 @@ SM_IDSTR(copyright, Copyright (c) 1988, 1993\n\ The Regents of the University of California. All rights reserved.\n") -SM_IDSTR(id, "@(#)$Id: rmail.c,v 8.61 2001/09/18 21:45:29 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: rmail.c,v 1.1.1.8 2002/02/17 21:56:45 gshapiro Exp $") /* $FreeBSD$ */ diff --git a/contrib/sendmail/smrsh/smrsh.8 b/contrib/sendmail/smrsh/smrsh.8 index ba3f300..4f975ed 100644 --- a/contrib/sendmail/smrsh/smrsh.8 +++ b/contrib/sendmail/smrsh/smrsh.8 @@ -9,7 +9,7 @@ .\" the sendmail distribution. .\" .\" -.\" $Id: smrsh.8,v 8.15 2001/01/24 00:40:47 gshapiro Exp $ +.\" $Id: smrsh.8,v 1.1.1.5 2002/02/17 21:56:43 gshapiro Exp $ .\" .\" $FreeBSD$ .\" diff --git a/contrib/sendmail/smrsh/smrsh.c b/contrib/sendmail/smrsh/smrsh.c index d0613a1..373550c 100644 --- a/contrib/sendmail/smrsh/smrsh.c +++ b/contrib/sendmail/smrsh/smrsh.c @@ -20,7 +20,7 @@ SM_IDSTR(copyright, Copyright (c) 1993\n\ The Regents of the University of California. All rights reserved.\n") -SM_IDSTR(id, "@(#)$Id: smrsh.c,v 8.55 2001/09/11 04:05:22 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: smrsh.c,v 1.1.1.8 2002/02/17 21:56:43 gshapiro Exp $") /* $FreeBSD$ */ diff --git a/contrib/sendmail/src/aliases.5 b/contrib/sendmail/src/aliases.5 index c6c96f9..cb1de4b 100644 --- a/contrib/sendmail/src/aliases.5 +++ b/contrib/sendmail/src/aliases.5 @@ -9,7 +9,7 @@ .\" the sendmail distribution. .\" .\" -.\" $Id: aliases.5,v 8.17 2000/12/14 23:09:46 gshapiro Exp $ +.\" $Id: aliases.5,v 1.1.1.5 2002/02/17 21:56:38 gshapiro Exp $ .\" .\" $FreeBSD$ .\" diff --git a/contrib/sendmail/src/conf.c b/contrib/sendmail/src/conf.c index 30022c6..06a48eb 100644 --- a/contrib/sendmail/src/conf.c +++ b/contrib/sendmail/src/conf.c @@ -13,7 +13,7 @@ #include -SM_RCSID("@(#)$Id: conf.c,v 8.961 2002/04/04 21:32:14 gshapiro Exp $") +SM_RCSID("@(#)$Id: conf.c,v 1.1.1.12 2002/04/10 03:04:48 gshapiro Exp $") /* $FreeBSD$ */ diff --git a/contrib/sendmail/src/conf.h b/contrib/sendmail/src/conf.h index ab59c0d..2903b7b 100644 --- a/contrib/sendmail/src/conf.h +++ b/contrib/sendmail/src/conf.h @@ -10,7 +10,7 @@ * the sendmail distribution. * * - * $Id: conf.h,v 8.560 2002/03/15 06:01:54 geir Exp $ + * $Id: conf.h,v 1.1.1.12 2002/04/10 03:04:48 gshapiro Exp $ */ /* $FreeBSD$ */ diff --git a/contrib/sendmail/src/err.c b/contrib/sendmail/src/err.c index 3a75dd5..ee57d684 100644 --- a/contrib/sendmail/src/err.c +++ b/contrib/sendmail/src/err.c @@ -13,7 +13,7 @@ #include -SM_RCSID("@(#)$Id: err.c,v 8.189 2002/01/09 18:52:30 ca Exp $") +SM_RCSID("@(#)$Id: err.c,v 1.1.1.7 2002/02/17 21:56:39 gshapiro Exp $") /* $FreeBSD$ */ diff --git a/contrib/sendmail/src/mailq.1 b/contrib/sendmail/src/mailq.1 index 9d9fe09..6f5a13e 100644 --- a/contrib/sendmail/src/mailq.1 +++ b/contrib/sendmail/src/mailq.1 @@ -9,7 +9,7 @@ .\" the sendmail distribution. .\" .\" -.\" $Id: mailq.1,v 8.18 2000/12/23 19:37:48 ca Exp $ +.\" $Id: mailq.1,v 1.1.1.6 2002/02/17 21:56:39 gshapiro Exp $ .\" .\" $FreeBSD$ .\" @@ -19,6 +19,7 @@ mailq \- print the mail queue .SH SYNOPSIS .B mailq +.RB [ \-Ac ] .RB [ \-v ] .SH DESCRIPTION .B Mailq @@ -47,7 +48,13 @@ one per line. .B Mailq is identical to ``sendmail -bp''. .PP -The options are as follows: +The relevant options are as follows: +.TP +.B \-Ac +Show the mail submission queue specified in +.I /etc/mail/submit.cf +instead of the MTA queue specified in +.IR /etc/mail/sendmail.cf . .TP .B \-v Print verbose information. diff --git a/contrib/sendmail/src/mci.c b/contrib/sendmail/src/mci.c index d248ed6..e5c43b2 100644 --- a/contrib/sendmail/src/mci.c +++ b/contrib/sendmail/src/mci.c @@ -15,7 +15,7 @@ #include -SM_RCSID("@(#)$Id: mci.c,v 8.204 2002/02/22 18:24:57 ca Exp $") +SM_RCSID("@(#)$Id: mci.c,v 1.1.1.7 2002/04/10 03:04:50 gshapiro Exp $") #if NETINET || NETINET6 # include diff --git a/contrib/sendmail/src/savemail.c b/contrib/sendmail/src/savemail.c index 0324591..da386e2 100644 --- a/contrib/sendmail/src/savemail.c +++ b/contrib/sendmail/src/savemail.c @@ -15,7 +15,7 @@ #include -SM_RCSID("@(#)$Id: savemail.c,v 8.297 2001/12/28 22:32:19 ca Exp $") +SM_RCSID("@(#)$Id: savemail.c,v 1.1.1.9 2002/02/17 21:56:41 gshapiro Exp $") static void errbody __P((MCI *, ENVELOPE *, char *)); static bool pruneroute __P((char *)); diff --git a/contrib/sendmail/src/sendmail.8 b/contrib/sendmail/src/sendmail.8 index d440774..2abfedd 100644 --- a/contrib/sendmail/src/sendmail.8 +++ b/contrib/sendmail/src/sendmail.8 @@ -9,7 +9,7 @@ .\" the sendmail distribution. .\" .\" -.\" $Id: sendmail.8,v 8.49 2001/03/23 22:10:00 ca Exp $ +.\" $Id: sendmail.8,v 1.1.1.6 2002/02/17 21:56:41 gshapiro Exp $ .\" .\" $FreeBSD$ .\" diff --git a/contrib/sendmail/vacation/vacation.1 b/contrib/sendmail/vacation/vacation.1 index 0f8d09b..9261a1b 100644 --- a/contrib/sendmail/vacation/vacation.1 +++ b/contrib/sendmail/vacation/vacation.1 @@ -9,7 +9,7 @@ .\" the sendmail distribution. .\" .\" -.\" $Id: vacation.1,v 8.29 2002/03/23 19:17:36 gshapiro Exp $ +.\" $Id: vacation.1,v 1.1.1.5 2002/04/10 03:05:00 gshapiro Exp $ .\" .\" $FreeBSD$ .\" -- cgit v1.1