diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2002-06-11 21:16:51 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2002-06-11 21:16:51 +0000 |
| commit | 3c674fdc703cfcd040f14a18df8bf695a8327cdf (patch) | |
| tree | 880f6da65807015e5fdccdcf00f5a5e9a2a8809c /contrib/sendmail/mail.local | |
| parent | 6995a6ac420610646a5da9e1ca4a5081c427fd4c (diff) | |
| download | FreeBSD-src-3c674fdc703cfcd040f14a18df8bf695a8327cdf.zip FreeBSD-src-3c674fdc703cfcd040f14a18df8bf695a8327cdf.tar.gz | |
Resolve conflicts from sendmail 8.12.4 import
Diffstat (limited to 'contrib/sendmail/mail.local')
| -rw-r--r-- | contrib/sendmail/mail.local/mail.local.8 | 2 | ||||
| -rw-r--r-- | contrib/sendmail/mail.local/mail.local.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/sendmail/mail.local/mail.local.8 b/contrib/sendmail/mail.local/mail.local.8 index 97fd436..2720578 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 1.1.1.6 2002/02/17 21:56:42 gshapiro Exp $ +.\" $Id: mail.local.8,v 8.23 2001/04/05 23:27:35 gshapiro Exp $ .\" .\" $FreeBSD$ .\" diff --git a/contrib/sendmail/mail.local/mail.local.c b/contrib/sendmail/mail.local/mail.local.c index d93420a..a8ac285 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 1.1.1.9 2002/04/10 03:04:53 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: mail.local.c,v 8.239 2002/05/24 20:56:32 gshapiro Exp $") #include <stdlib.h> #include <sm/errstring.h> @@ -533,7 +533,7 @@ dolmtp() "Nested MAIL command"); continue; } - if (sm_strncasecmp(buf+5, "from:", 5) != 0 || + if (sm_strncasecmp(buf + 5, "from:", 5) != 0 || ((return_path = parseaddr(buf + 10, false)) == NULL)) { @@ -870,7 +870,7 @@ deliver(fd, name) off_t headerbytes; int readamount; #endif /* CONTENTLENGTH */ - char biffmsg[100], buf[8*1024]; + char biffmsg[100], buf[8 * 1024]; SM_MBDB_T user; /* |
