diff options
author | gshapiro <gshapiro@FreeBSD.org> | 2004-02-14 21:58:08 +0000 |
---|---|---|
committer | gshapiro <gshapiro@FreeBSD.org> | 2004-02-14 21:58:08 +0000 |
commit | e5769b57f42987d792d1756411faaa787bc5ebbe (patch) | |
tree | 86ee5e2859378715dd7f2a812b0c15a7d1b91054 /contrib/sendmail | |
parent | 3b5debc668e4cf70a893a0e38111db42ea9ecd45 (diff) | |
download | FreeBSD-src-e5769b57f42987d792d1756411faaa787bc5ebbe.zip FreeBSD-src-e5769b57f42987d792d1756411faaa787bc5ebbe.tar.gz |
Fix sendmail 8.12.11 import conflicts
Diffstat (limited to 'contrib/sendmail')
-rw-r--r-- | contrib/sendmail/cf/m4/cfhead.m4 | 2 | ||||
-rw-r--r-- | contrib/sendmail/smrsh/smrsh.8 | 11 | ||||
-rw-r--r-- | contrib/sendmail/smrsh/smrsh.c | 7 | ||||
-rw-r--r-- | contrib/sendmail/src/conf.c | 13 | ||||
-rw-r--r-- | contrib/sendmail/src/headers.c | 14 | ||||
-rw-r--r-- | contrib/sendmail/src/sendmail.8 | 35 |
6 files changed, 63 insertions, 19 deletions
diff --git a/contrib/sendmail/cf/m4/cfhead.m4 b/contrib/sendmail/cf/m4/cfhead.m4 index a2dbedd..8828da9 100644 --- a/contrib/sendmail/cf/m4/cfhead.m4 +++ b/contrib/sendmail/cf/m4/cfhead.m4 @@ -307,4 +307,4 @@ define(`confMILTER_MACROS_ENVRCPT', ``{rcpt_mailer}, {rcpt_host}, {rcpt_addr}'') divert(0)dnl -VERSIONID(`$Id: cfhead.m4,v 8.108.2.3 2003/04/03 17:51:51 ca Exp $') +VERSIONID(`$Id: cfhead.m4,v 8.108.2.6 2003/12/05 02:26:47 ca Exp $') diff --git a/contrib/sendmail/smrsh/smrsh.8 b/contrib/sendmail/smrsh/smrsh.8 index 0d19ae7..0dd8926 100644 --- a/contrib/sendmail/smrsh/smrsh.8 +++ b/contrib/sendmail/smrsh/smrsh.8 @@ -9,9 +9,9 @@ .\" the sendmail distribution. .\" .\" -.\" $Id: smrsh.8,v 8.16.2.1 2003/07/08 01:33:03 gshapiro Exp $ +.\" $Id: smrsh.8,v 8.16.2.2 2003/10/07 18:05:37 ca Exp $ .\" -.TH SMRSH 8 "$Date: 2003/07/08 01:33:03 $" +.TH SMRSH 8 "$Date: 2003/10/07 18:05:37 $" .SH NAME smrsh \- restricted shell for sendmail .SH SYNOPSIS @@ -87,7 +87,12 @@ and/or \-DSMRSH_CMDDIR=\e"\fIdir\fP\e" to change the default program directory (defaults to ``/usr/libexec/sm.bin''). .SH FILES -/usr/libexec/sm.bin \- directory for restricted programs +/usr/adm/sm.bin \- default directory for restricted programs on most OSs +.PP +/var/adm/sm.bin \- directory for restricted programs on HP UX and Solaris +.PP +/usr/libexec/sm.bin \- directory for restricted programs on FreeBSD (>= 3.3) + .SH SEE ALSO sendmail(8) .\" $FreeBSD$ diff --git a/contrib/sendmail/smrsh/smrsh.c b/contrib/sendmail/smrsh/smrsh.c index a37613e..409b13f 100644 --- a/contrib/sendmail/smrsh/smrsh.c +++ b/contrib/sendmail/smrsh/smrsh.c @@ -21,7 +21,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.58.2.2 2002/09/24 21:40:05 ca Exp $") +SM_IDSTR(id, "@(#)$Id: smrsh.c,v 8.58.2.5 2003/12/15 17:09:39 ca Exp $") /* ** SMRSH -- sendmail restricted shell @@ -119,8 +119,9 @@ addcmd(s, cmd, len) if (s == NULL || *s == '\0') return; + /* enough space for s (len) and CMDDIR + "/" and '\0'? */ if (sizeof newcmdbuf - strlen(newcmdbuf) <= - len + (cmd ? (strlen(CMDDIR) + 1) : 0)) + len + 1 + (cmd ? (strlen(CMDDIR) + 1) : 0)) { (void)sm_io_fprintf(smioerr, SM_TIME_DEFAULT, "%s: command too long: %s\n", prg, par); @@ -131,7 +132,7 @@ addcmd(s, cmd, len) } if (cmd) (void) sm_strlcat2(newcmdbuf, CMDDIR, "/", sizeof newcmdbuf); - (void) sm_strlcat(newcmdbuf, s, sizeof newcmdbuf); + (void) strncat(newcmdbuf, s, len); } int diff --git a/contrib/sendmail/src/conf.c b/contrib/sendmail/src/conf.c index 5b3ca3e..71c2c7a 100644 --- a/contrib/sendmail/src/conf.c +++ b/contrib/sendmail/src/conf.c @@ -14,7 +14,7 @@ #include <sendmail.h> -SM_RCSID("@(#)$Id: conf.c,v 8.972.2.50 2003/09/03 21:37:03 ca Exp $") +SM_RCSID("@(#)$Id: conf.c,v 8.972.2.54 2004/01/08 21:54:55 ca Exp $") #include <sendmail/pathnames.h> #if NEWDB @@ -5572,6 +5572,9 @@ char *CompileOptions[] = #if MIME7TO8 "MIME7TO8", #endif /* MIME7TO8 */ +#if MIME7TO8_OLD + "MIME7TO8_OLD", +#endif /* MIME7TO8_OLD */ #if MIME8TO7 "MIME8TO7", #endif /* MIME8TO7 */ @@ -6066,11 +6069,19 @@ char *FFRCompileOptions[] = /* Limit sleep(2) time in libsm/clock.c */ "_FFR_MAX_SLEEP_TIME", #endif /* _FFR_MAX_SLEEP_TIME */ +#if _FFR_MESSAGEID_MACRO + /* stick the message ID header's value in a macro */ + "_FFR_MESSAGEID_MACRO", +#endif /* _FFR_MESSAGEID_MACRO */ #if MILTER # if _FFR_MILTER_421 /* If a filter returns 421, close the SMTP connection */ "_FFR_MILTER_421", # endif /* _FFR_MILTER_421 */ +# if _FFR_MILTER_MACROS_EOM + /* Add an EOM macro set for milter */ + "_FFR_MILTER_MACROS_EOM", +# endif /* _FFR_MILTER_MACROS_EOM */ # if _FFR_MILTER_PERDAEMON /* Per DaemonPortOptions InputMailFilter lists */ "_FFR_MILTER_PERDAEMON", diff --git a/contrib/sendmail/src/headers.c b/contrib/sendmail/src/headers.c index c85ea2d..b7c5ef9 100644 --- a/contrib/sendmail/src/headers.c +++ b/contrib/sendmail/src/headers.c @@ -14,7 +14,7 @@ #include <sendmail.h> -SM_RCSID("@(#)$Id: headers.c,v 8.266.4.7 2003/09/03 21:32:20 ca Exp $") +SM_RCSID("@(#)$Id: headers.c,v 8.266.4.9 2003/10/30 00:17:22 gshapiro Exp $") static size_t fix_mime_header __P((HDR *, ENVELOPE *)); static int priencode __P((char *)); @@ -731,6 +731,10 @@ eatheader(e, full, log) e->e_msgid = h->h_value; while (isascii(*e->e_msgid) && isspace(*e->e_msgid)) e->e_msgid++; +#if _FFR_MESSAGEID_MACRO + macdefine(&e->e_macro, A_PERM, macid("{msg_id}"), + e->e_msgid); +#endif /* _FFR_MESSAGEID_MACRO */ } } if (tTd(32, 1)) @@ -774,11 +778,13 @@ eatheader(e, full, log) e->e_timeoutclass = TOC_NORMAL; else if (sm_strcasecmp(p, "non-urgent") == 0) e->e_timeoutclass = TOC_NONURGENT; +#if _FFR_QUEUERETURN_DSN + else if (bitset(EF_RESPONSE, e->e_flags)) + e->e_timeoutclass = TOC_DSN; +#endif /* _FFR_QUEUERETURN_DSN */ } - #if _FFR_QUEUERETURN_DSN - /* If no timeoutclass picked and it's a DSN, use that timeoutclass */ - if (e->e_timeoutclass == TOC_NORMAL && bitset(EF_RESPONSE, e->e_flags)) + else if (bitset(EF_RESPONSE, e->e_flags)) e->e_timeoutclass = TOC_DSN; #endif /* _FFR_QUEUERETURN_DSN */ diff --git a/contrib/sendmail/src/sendmail.8 b/contrib/sendmail/src/sendmail.8 index 52a58be..a229aed 100644 --- a/contrib/sendmail/src/sendmail.8 +++ b/contrib/sendmail/src/sendmail.8 @@ -9,9 +9,9 @@ .\" the sendmail distribution. .\" .\" -.\" $Id: sendmail.8,v 8.51.2.1 2003/05/20 16:38:15 gshapiro Exp $ +.\" $Id: sendmail.8,v 8.51.2.3 2003/12/01 17:02:00 ca Exp $ .\" -.TH SENDMAIL 8 "$Date: 2003/05/20 16:38:15 $" +.TH SENDMAIL 8 "$Date: 2003/12/01 17:02:00 $" .SH NAME sendmail \- an electronic mail transport agent @@ -150,11 +150,32 @@ users or mailing lists. .BI \-C file Use alternate configuration file. .B Sendmail -refuses to run as root if an alternate configuration file is specified. -.TP -.BI \-d X -Set debugging value to -.IR X . +gives up any enhanced (set-user-ID or set-group-ID) privileges +if an alternate configuration file is specified. +.TP +.BI \-d category . level... +Set the debugging flag for +.I category +to +.IR level . +.I Category +is either an integer or a name specifying the topic, and +.I level +an integer specifying the level of debugging output desired. +Higher levels generally mean more output. +More than one flag can be specified by separating them with commas. +A list of numeric debugging categories can be found in the TRACEFLAGS file +in the sendmail source distribution. +.br +The option +.B \-d0.1 +prints the version of +.B sendmail +and the options it was compiled with. +.br +Most other categories are only useful with, and documented in, +.BR sendmail 's +source code. .ne 1i .TP .BI \-F fullname |