Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src/gnu/dist/sendmail Pull up revision 1.5 (requested by it...
details: https://anonhg.NetBSD.org/src/rev/dad962ad9126
branches: netbsd-1-5
changeset: 492787:dad962ad9126
user: he <he%NetBSD.org@localhost>
date: Wed Feb 20 23:12:00 2002 +0000
description:
Pull up revision 1.5 (requested by itojun):
Upgrade to sendmail version 8.11.6.
diffstat:
gnu/dist/sendmail/cf/cf/Makefile | 3 +-
gnu/dist/sendmail/libmilter/main.c | 7 +-
gnu/dist/sendmail/libsmutil/safefile.c | 83 +-----------------
gnu/dist/sendmail/libsmutil/snprintf.c | 8 +-
gnu/dist/sendmail/mail.local/mail.local.0 | 55 +-----------
gnu/dist/sendmail/mailstats/mailstats.8 | 10 +-
gnu/dist/sendmail/sendmail/aliases.0 | 45 +---------
gnu/dist/sendmail/sendmail/bf_portable.c | 20 ++-
gnu/dist/sendmail/sendmail/mci.c | 13 +-
gnu/dist/sendmail/sendmail/sendmail.0 | 140 +----------------------------
gnu/dist/sendmail/sendmail/sendmail.8 | 1 -
11 files changed, 48 insertions(+), 337 deletions(-)
diffs (truncated from 722 to 300 lines):
diff -r 127e7460e426 -r dad962ad9126 gnu/dist/sendmail/cf/cf/Makefile
--- a/gnu/dist/sendmail/cf/cf/Makefile Wed Feb 20 23:11:54 2002 +0000
+++ b/gnu/dist/sendmail/cf/cf/Makefile Wed Feb 20 23:12:00 2002 +0000
@@ -1,7 +1,7 @@
#
# Makefile for configuration files.
#
-# Id: Makefile,v 8.40.8.4 2000/10/26 18:27:44 gshapiro Exp
+# Id: Makefile,v 8.40.8.5 2001/04/12 22:39:52 gshapiro Exp
#
#
@@ -117,7 +117,6 @@
${CFDIR}/ostype/aix4.m4 \
${CFDIR}/ostype/altos.m4 \
${CFDIR}/ostype/amdahl-uts.m4 \
- ${CFDIR}/ostype/aux.m4 \
${CFDIR}/ostype/bsd4.3.m4 \
${CFDIR}/ostype/bsd4.4.m4 \
${CFDIR}/ostype/bsdi.m4 \
diff -r 127e7460e426 -r dad962ad9126 gnu/dist/sendmail/libmilter/main.c
--- a/gnu/dist/sendmail/libmilter/main.c Wed Feb 20 23:11:54 2002 +0000
+++ b/gnu/dist/sendmail/libmilter/main.c Wed Feb 20 23:12:00 2002 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2000 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
*/
#ifndef lint
-static char id[] = "@(#)Id: main.c,v 8.34.4.9 2000/09/09 02:23:03 gshapiro Exp";
+static char id[] = "@(#)Id: main.c,v 8.34.4.11 2001/05/07 22:06:37 gshapiro Exp";
#endif /* ! lint */
#if _FFR_MILTER
@@ -131,9 +131,11 @@
return MI_SUCCESS;
}
+
int
smfi_main()
{
+
signal(SIGPIPE, SIG_IGN);
if (conn == NULL)
{
@@ -151,6 +153,7 @@
return MI_FAILURE;
}
+
/* Startup the listener */
if (mi_listener(conn, dbg, smfi, timeout, backlog) != MI_SUCCESS)
return MI_FAILURE;
diff -r 127e7460e426 -r dad962ad9126 gnu/dist/sendmail/libsmutil/safefile.c
--- a/gnu/dist/sendmail/libsmutil/safefile.c Wed Feb 20 23:11:54 2002 +0000
+++ b/gnu/dist/sendmail/libsmutil/safefile.c Wed Feb 20 23:12:00 2002 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -12,7 +12,7 @@
*/
#ifndef lint
-static char id[] = "@(#)Id: safefile.c,v 8.81.4.7 2000/09/01 21:09:23 ca Exp";
+static char id[] = "@(#)Id: safefile.c,v 8.81.4.10 2001/07/20 04:19:36 gshapiro Exp";
#endif /* ! lint */
#include <sendmail.h>
@@ -660,10 +660,6 @@
** Same as open.
*/
-#ifndef O_ACCMODE
-# define O_ACCMODE (O_RDONLY|O_WRONLY|O_RDWR)
-#endif /* ! O_ACCMODE */
-
int
safeopen(fn, omode, cmode, sff)
char *fn;
@@ -735,81 +731,6 @@
return fd;
}
/*
-** SAFEFOPEN -- do a file open with extra checking
-**
-** Parameters:
-** fn -- the file name to open.
-** omode -- the open-style mode flags.
-** cmode -- the create-style mode flags.
-** sff -- safefile flags.
-**
-** Returns:
-** Same as fopen.
-*/
-
-FILE *
-safefopen(fn, omode, cmode, sff)
- char *fn;
- int omode;
- int cmode;
- long sff;
-{
- int fd;
- int save_errno;
- FILE *fp;
- char *fmode;
-
- switch (omode & O_ACCMODE)
- {
- case O_RDONLY:
- fmode = "r";
- break;
-
- case O_WRONLY:
- if (bitset(O_APPEND, omode))
- fmode = "a";
- else
- fmode = "w";
- break;
-
- case O_RDWR:
- if (bitset(O_TRUNC, omode))
- fmode = "w+";
- else if (bitset(O_APPEND, omode))
- fmode = "a+";
- else
- fmode = "r+";
- break;
-
- default:
- syserr("554 5.3.5 safefopen: unknown omode %o", omode);
- fmode = "x";
- }
- fd = safeopen(fn, omode, cmode, sff);
- if (fd < 0)
- {
- save_errno = errno;
- if (tTd(44, 10))
- dprintf("safefopen: safeopen failed: %s\n",
- errstring(errno));
- errno = save_errno;
- return NULL;
- }
- fp = fdopen(fd, fmode);
- if (fp != NULL)
- return fp;
-
- save_errno = errno;
- if (tTd(44, 10))
- {
- dprintf("safefopen: fdopen(%s, %s) failed: omode=%x, sff=%lx, err=%s\n",
- fn, fmode, omode, sff, errstring(errno));
- }
- (void) close(fd);
- errno = save_errno;
- return NULL;
-}
- /*
** FILECHANGED -- check to see if file changed after being opened
**
** Parameters:
diff -r 127e7460e426 -r dad962ad9126 gnu/dist/sendmail/libsmutil/snprintf.c
--- a/gnu/dist/sendmail/libsmutil/snprintf.c Wed Feb 20 23:11:54 2002 +0000
+++ b/gnu/dist/sendmail/libsmutil/snprintf.c Wed Feb 20 23:12:00 2002 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1997 Eric P. Allman. All rights reserved.
* Copyright (c) 1988, 1993
@@ -12,7 +12,7 @@
*/
#ifndef lint
-static char id[] = "@(#)Id: snprintf.c,v 8.27.16.2 2000/09/17 17:04:24 gshapiro Exp";
+static char id[] = "@(#)Id: snprintf.c,v 8.27.16.4 2001/07/20 04:19:37 gshapiro Exp";
#endif /* ! lint */
#include <sendmail.h>
@@ -86,10 +86,10 @@
sm_dopr( str, fmt, args );
if (count > 0)
DoprEnd[0] = 0;
- if (SnprfOverflow && tTd(57, 2))
+ if (SnprfOverflow > 0 && tTd(57, 2))
dprintf("\nvsnprintf overflow, len = %ld, str = %s",
(long) count, shortenstring(str, MAXSHORTSTR));
- return strlen(str);
+ return strlen(str) + SnprfOverflow;
}
/*
diff -r 127e7460e426 -r dad962ad9126 gnu/dist/sendmail/mail.local/mail.local.0
--- a/gnu/dist/sendmail/mail.local/mail.local.0 Wed Feb 20 23:11:54 2002 +0000
+++ b/gnu/dist/sendmail/mail.local/mail.local.0 Wed Feb 20 23:12:00 2002 +0000
@@ -1,8 +1,6 @@
-
+MAIL.LOCAL(8) MAIL.LOCAL(8)
-MAIL.LOCAL(8) MAIL.LOCAL(8)
-
NNAAMMEE
mail.local - store mail in a mailbox
@@ -58,18 +56,6 @@
TZ Used to set the appropriate time zone on the times-
tamp.
-
-
-
- Date: 2000/12/29 18:12:16 1
-
-
-
-
-
-MAIL.LOCAL(8) MAIL.LOCAL(8)
-
-
FFIILLEESS
/tmp/local.XXXXXX temporary files
/var/mail/user user's mailbox directory
@@ -92,41 +78,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Date: 2000/12/29 18:12:16 2
-
-
+ Date: 2000/12/29 18:12:16 MAIL.LOCAL(8)
diff -r 127e7460e426 -r dad962ad9126 gnu/dist/sendmail/mailstats/mailstats.8
--- a/gnu/dist/sendmail/mailstats/mailstats.8 Wed Feb 20 23:11:54 2002 +0000
+++ b/gnu/dist/sendmail/mailstats/mailstats.8 Wed Feb 20 23:12:00 2002 +0000
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
+.\" Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
.\" All rights reserved.
.\"
.\" By using this file, you agree to the terms and conditions set
@@ -6,9 +6,9 @@
.\" the sendmail distribution.
.\"
.\"
-.\" Id: mailstats.8,v 8.17.4.3 2000/12/29 18:12:20 gshapiro Exp
+.\" Id: mailstats.8,v 8.17.4.6 2001/05/07 22:06:38 gshapiro Exp
.\"
-.TH MAILSTATS 8 "Date: 2000/12/29 18:12:20"
+.TH MAILSTATS 8 "Date: 2001/05/07 22:06:38"
.SH NAME
mailstats
\- display mail statistics
@@ -61,11 +61,11 @@
Home |
Main Index |
Thread Index |
Old Index