d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve conflicts from import of post-8.12.3 bug fixes.

Browse Source
This commit is contained in:
Gregory Neil Shapiro 2002-04-20 20:34:16 +00:00
parent 1e66b2bb25
commit 7320a0ab16
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=95157
20 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/sendmail/cf/m4/cfhead.m4
View File

@ -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 $')

2
contrib/sendmail/cf/ostype/bsd4.4.m4
View File

@ -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

2
contrib/sendmail/cf/sh/makeinfo.sh
View File

@ -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$
#

2
contrib/sendmail/mail.local/mail.local.8
View File

@ -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$
.\"

2
contrib/sendmail/mail.local/mail.local.c
View File

@ -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 <stdlib.h>
#include <sm/errstring.h>

2
contrib/sendmail/mailstats/mailstats.c
View File

@ -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$ */

2
contrib/sendmail/makemap/makemap.c
View File

@ -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$ */

2
contrib/sendmail/praliases/praliases.c
View File

@ -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$ */

2
contrib/sendmail/rmail/rmail.c
View File

@ -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$ */

2
contrib/sendmail/smrsh/smrsh.8
View File

@ -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$
.\"

2
contrib/sendmail/smrsh/smrsh.c
View File

@ -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$ */

2
contrib/sendmail/src/aliases.5
View File

@ -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$
.\"

2
contrib/sendmail/src/conf.c
View File

@ -13,7 +13,7 @@
#include <sendmail.h>
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$ */

2
contrib/sendmail/src/conf.h
View File

@ -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$ */

2
contrib/sendmail/src/err.c
View File

@ -13,7 +13,7 @@
#include <sendmail.h>
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$ */

11
contrib/sendmail/src/mailq.1
View File

@ -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.

2
contrib/sendmail/src/mci.c
View File

@ -15,7 +15,7 @@
#include <sendmail.h>
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 <arpa/inet.h>

2
contrib/sendmail/src/savemail.c
View File

@ -15,7 +15,7 @@
#include <sendmail.h>
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 *));

2
contrib/sendmail/src/sendmail.8
View File

@ -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$
.\"

2
contrib/sendmail/vacation/vacation.1
View File

@ -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$
.\"