diff options
Diffstat (limited to 'contrib/sendmail/src')
-rw-r--r-- | contrib/sendmail/src/aliases.5 | 2 | ||||
-rw-r--r-- | contrib/sendmail/src/conf.c | 43 | ||||
-rw-r--r-- | contrib/sendmail/src/conf.h | 2 | ||||
-rw-r--r-- | contrib/sendmail/src/err.c | 2 | ||||
-rw-r--r-- | contrib/sendmail/src/headers.c | 20 | ||||
-rw-r--r-- | contrib/sendmail/src/mailq.1 | 4 | ||||
-rw-r--r-- | contrib/sendmail/src/mci.c | 2 | ||||
-rw-r--r-- | contrib/sendmail/src/savemail.c | 2 | ||||
-rw-r--r-- | contrib/sendmail/src/sendmail.8 | 10 |
9 files changed, 43 insertions, 44 deletions
diff --git a/contrib/sendmail/src/aliases.5 b/contrib/sendmail/src/aliases.5 index 62b5dfb..c6c96f9 100644 --- a/contrib/sendmail/src/aliases.5 +++ b/contrib/sendmail/src/aliases.5 @@ -11,6 +11,8 @@ .\" .\" $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 diff --git a/contrib/sendmail/src/conf.c b/contrib/sendmail/src/conf.c index a850b2a..677aea2 100644 --- a/contrib/sendmail/src/conf.c +++ b/contrib/sendmail/src/conf.c @@ -13,7 +13,9 @@ #include <sendmail.h> -SM_RCSID("@(#)$Id: conf.c,v 8.972.2.5 2002/08/16 14:56:01 ca Exp $") +SM_RCSID("@(#)$Id: conf.c,v 8.972 2002/06/18 16:11:44 ca Exp $") + +/* $FreeBSD$ */ #include <sendmail/pathnames.h> @@ -2372,15 +2374,12 @@ initsetproctitle(argc, argv, envp) ** the top of memory. */ - if (envp != NULL) - { - for (i = 0; envp[i] != NULL; i++) - continue; - environ = (char **) xalloc(sizeof (char *) * (i + 1)); - for (i = 0; envp[i] != NULL; i++) - environ[i] = newstr(envp[i]); - environ[i] = NULL; - } + for (i = 0; envp[i] != NULL; i++) + continue; + environ = (char **) xalloc(sizeof (char *) * (i + 1)); + for (i = 0; envp[i] != NULL; i++) + environ[i] = newstr(envp[i]); + environ[i] = NULL; /* ** Save start and extent of argv for setproctitle. @@ -2406,7 +2405,7 @@ initsetproctitle(argc, argv, envp) if (i == 0 || LastArgv + 1 == argv[i]) LastArgv = argv[i] + SPT_ALIGN(strlen(argv[i]), align); } - for (i = 0; LastArgv != NULL && envp != NULL && envp[i] != NULL; i++) + for (i = 0; LastArgv != NULL && envp[i] != NULL; i++) { if (LastArgv + 1 == envp[i]) LastArgv = envp[i] + SPT_ALIGN(strlen(envp[i]), align); @@ -2655,6 +2654,7 @@ SIGFUNC_DECL reapchild(sig) int sig; { + int m = 0; int save_errno = errno; int st; pid_t pid; @@ -2692,6 +2692,7 @@ reapchild(sig) # endif /* HASWAITPID */ /* Drop PID and check if it was a control socket child */ proc_list_drop(pid, st, NULL); + CurRunners -= m; /* Update */ } FIX_SYSV_SIGNAL(sig, reapchild); errno = save_errno; @@ -3066,21 +3067,11 @@ static char *DefaultUserShells[] = # endif /* defined(__svr4__) || defined(__svr5__) */ # ifdef sgi "/sbin/sh", /* SGI's shells really live in /sbin */ - "/usr/bin/sh", - "/sbin/bsh", /* classic borne shell */ - "/bin/bsh", - "/usr/bin/bsh", - "/sbin/csh", /* standard csh */ - "/bin/csh", - "/usr/bin/csh", - "/sbin/jsh", /* classic borne shell w/ job control*/ - "/bin/jsh", - "/usr/bin/jsh", + "/sbin/csh", "/bin/ksh", /* Korn shell */ "/sbin/ksh", "/usr/bin/ksh", - "/sbin/tcsh", /* Extended csh */ - "/bin/tcsh", + "/bin/tcsh", /* Extended csh */ "/usr/bin/tcsh", # endif /* sgi */ NULL @@ -3941,7 +3932,7 @@ validate_connection(sap, hostname, e) hostname, anynet_ntoa(sap)); if (rscheck("check_relay", hostname, anynet_ntoa(sap), - e, RSF_RMCOMM|RSF_COUNT, 3, NULL, NOQID) != EX_OK) + e, true, true, 3, NULL, NOQID) != EX_OK) { static char reject[BUFSIZ*2]; extern char MsgBuf[]; @@ -5966,10 +5957,6 @@ char *FFRCompileOptions[] = /* Steven Pitzl */ "_FFR_NODELAYDSN_ON_HOLD", #endif /* _FFR_NODELAYDSN_ON_HOLD */ -#if _FFR_NONSTOP_PERSISTENCE -/* Suggested by Jan Krueger of digitalanswers communications consulting gmbh. */ - "_FFR_NONSTOP_PERSISTENCE", -#endif /* _FFR_NONSTOP_PERSISTENCE */ #if _FFR_NO_PIPE "_FFR_NO_PIPE", #endif /* _FFR_NO_PIPE */ diff --git a/contrib/sendmail/src/conf.h b/contrib/sendmail/src/conf.h index 22d7737..fb562f4 100644 --- a/contrib/sendmail/src/conf.h +++ b/contrib/sendmail/src/conf.h @@ -13,6 +13,8 @@ * $Id: conf.h,v 8.563 2002/06/04 02:13:50 geir Exp $ */ +/* $FreeBSD$ */ + /* ** CONF.H -- All user-configurable parameters for sendmail ** diff --git a/contrib/sendmail/src/err.c b/contrib/sendmail/src/err.c index 484af9e..3a75dd5 100644 --- a/contrib/sendmail/src/err.c +++ b/contrib/sendmail/src/err.c @@ -15,6 +15,8 @@ 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 fdcccf6..efb4f3c 100644 --- a/contrib/sendmail/src/headers.c +++ b/contrib/sendmail/src/headers.c @@ -13,7 +13,9 @@ #include <sendmail.h> -SM_RCSID("@(#)$Id: headers.c,v 8.266.4.1 2002/08/16 14:56:01 ca Exp $") +/* $FreeBSD$ */ + +SM_RCSID("@(#)$Id: headers.c,v 8.266 2001/10/12 01:50:12 gshapiro Exp $") static size_t fix_mime_header __P((char *)); static int priencode __P((char *)); @@ -285,27 +287,23 @@ hse: if (bitset(pflag, CHHDR_CHECK)) { - int rscheckflags; + bool stripcom = false; char *rs; /* no ruleset? look for default */ rs = hi->hi_ruleset; - rscheckflags = RSF_COUNT; - if (!bitset(hi->hi_flags, H_FROM|H_RCPT)) - rscheckflags |= RSF_UNSTRUCTURED; if (rs == NULL) { s = stab("*", ST_HEADER, ST_FIND); if (s != NULL) { rs = (&s->s_header)->hi_ruleset; - if (bitset((&s->s_header)->hi_flags, - H_STRIPCOMM)) - rscheckflags |= RSF_RMCOMM; + stripcom = bitset((&s->s_header)->hi_flags, + H_STRIPCOMM); } } - else if (bitset(hi->hi_flags, H_STRIPCOMM)) - rscheckflags |= RSF_RMCOMM; + else + stripcom = bitset(hi->hi_flags, H_STRIPCOMM); if (rs != NULL) { int l, k; @@ -370,7 +368,7 @@ hse: #endif /* _FFR_HDR_TYPE */ macdefine(&e->e_macro, A_PERM, macid("{addr_type}"), "h"); - (void) rscheck(rs, fvalue, NULL, e, rscheckflags, 3, + (void) rscheck(rs, fvalue, NULL, e, stripcom, true, 3, NULL, e->e_id); } } diff --git a/contrib/sendmail/src/mailq.1 b/contrib/sendmail/src/mailq.1 index 0fae3ad..6434b92 100644 --- a/contrib/sendmail/src/mailq.1 +++ b/contrib/sendmail/src/mailq.1 @@ -11,7 +11,9 @@ .\" .\" $Id: mailq.1,v 8.19 2002/04/12 05:07:58 gshapiro Exp $ .\" -.TH MAILQ 1 "$Date: 2002/04/12 05:07:58 $" +.\" $FreeBSD$ +.\" +.TH MAILQ 1 "$Date: 2000/12/23 19:37:48 $" .SH NAME mailq \- print the mail queue diff --git a/contrib/sendmail/src/mci.c b/contrib/sendmail/src/mci.c index b54b13d..a487196 100644 --- a/contrib/sendmail/src/mci.c +++ b/contrib/sendmail/src/mci.c @@ -11,6 +11,8 @@ * */ +/* $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 b28a70d..e354443 100644 --- a/contrib/sendmail/src/savemail.c +++ b/contrib/sendmail/src/savemail.c @@ -11,6 +11,8 @@ * */ +/* $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 cf473c5..ee7175f 100644 --- a/contrib/sendmail/src/sendmail.8 +++ b/contrib/sendmail/src/sendmail.8 @@ -11,7 +11,9 @@ .\" .\" $Id: sendmail.8,v 8.51 2002/05/24 15:42:13 ca Exp $ .\" -.TH SENDMAIL 8 "$Date: 2002/05/24 15:42:13 $" +.\" $FreeBSD$ +.\" +.TH SENDMAIL 8 "$Date: 2001/03/23 22:10:00 $" .SH NAME sendmail \- an electronic mail transport agent @@ -687,13 +689,13 @@ collected statistics /var/spool/mqueue/* temp files .SH SEE ALSO -binmail(1), mail(1), -rmail(1), syslog(3), aliases(5), mailaddr(7), -rc(8) +mail.local(8), +rc(8), +rmail(8) .PP DARPA Internet Request For Comments |