Gregory Neil Shapiro
684b2a5fa3
Resolve conflicts from sendmail 8.13.3 import
...
MFC after: 4 days
2005-02-14 02:39:14 +00:00
Gregory Neil Shapiro
bfb62e91d7
Resolve conflicts from sendmail 8.13.1 import
2004-08-01 01:16:16 +00:00
Gregory Neil Shapiro
7660b554bc
Fix sendmail 8.12.10 import conflicts
2003-09-19 23:14:57 +00:00
Gregory Neil Shapiro
729362425c
Fix conflicts from sendmail 8.12.9 import
2003-03-29 19:18:07 +00:00
Gregory Neil Shapiro
f9218d3d4f
Fix conflicts from sendmail 8.12.8 import
2003-03-03 17:18:01 +00:00
Gregory Neil Shapiro
2ef40764f0
Resolve conflicts from sendmail 8.12.7 import
2003-02-08 20:35:51 +00:00
Gregory Neil Shapiro
518536da5d
Even if biff is turned off, we still need to set curoff as the code
...
uses that if there is an error writing to the mailbox. Note this bug
is only in the FreeBSD code, not the vendor code (which doesn't offer
nobiff).
PR: misc/43392
MFC after: 3 days
2003-02-08 19:25:21 +00:00
Gregory Neil Shapiro
3edfa581ab
Move the $FreeBSD$ CVS labels far enough away from the $Id$ CVS labels so
...
I don't have to manually resolve conflicts on every import. Ironically,
most of these files have no changes from the vendor version except the
$FreeBSD$ line.
2002-08-28 18:12:33 +00:00
Gregory Neil Shapiro
88ad41d4f0
Resolve conflicts from sendmail 8.12.4 import
2002-06-11 21:16:51 +00:00
Gregory Neil Shapiro
7320a0ab16
Resolve conflicts from import of post-8.12.3 bug fixes.
2002-04-20 20:34:16 +00:00
Gregory Neil Shapiro
320f00e768
Fix conflicts from sendmail 8.12.3 import
2002-04-10 03:06:22 +00:00
Gregory Neil Shapiro
39e37e7212
Fix mail.local build for non-sendmail.org code
2002-02-18 02:18:42 +00:00
Gregory Neil Shapiro
12ed1c7c81
Resolve conflicts from sendmail 8.12.2 import
2002-02-17 21:58:34 +00:00
Gregory Neil Shapiro
6dbce3c381
Resolve conflicts from import of sendmail 8.11.5
2001-08-01 01:34:52 +00:00
Gregory Neil Shapiro
b466200952
Repair 8.11.3 merge conflicts
2001-02-28 00:22:47 +00:00
Gregory Neil Shapiro
c46d91b759
Repair 8.11.2 merge conflicts
2001-01-21 22:21:43 +00:00
Gregory Neil Shapiro
3d1a10799a
Add FreeBSD-only options to the getopt string
...
PR: 21544
Submitted by: Peter Jeremy <peter.jeremy@alcatel.com.au>
2000-10-10 22:27:08 +00:00
Gregory Neil Shapiro
31305937b3
Add missing FreeBSD-only flag to the usage statement.
2000-10-01 16:32:16 +00:00
Gregory Neil Shapiro
d995d2ba6b
Fix conflicts from merge of sendmail 8.11.1
2000-10-01 02:03:50 +00:00
Gregory Neil Shapiro
3299c2f123
Fix conflicts from merge of sendmail 8.11.0.
...
PR: bin/11552 misc/18512 bin/15088
2000-08-12 22:19:16 +00:00
Peter Wemm
76b7bf7135
Merge sendmail 8.9.1 -> 8.9.2 changes into mainline. Some of our changes
...
were submitted back to sendmail.org (stage 1) and were incorporated.
1999-01-12 12:38:06 +00:00
Peter Wemm
05b73c60a4
I obviously cannot read. I misread the ifdef in the Makefile - DONT_FSYNC
...
was not on by default.. Back previous change out.
1998-08-04 13:56:32 +00:00
Peter Wemm
aa0c66bc41
Invert the sense of the -s flag (local addition). Instead of compiling
...
in the behavior via the previously default #define DONT_FSYNC, use the
-s flag to turn the fsync() behavior on. This can be configured in
sendmail.cf without recompiling mail.local.
1998-08-04 13:46:46 +00:00
Peter Wemm
d615a19295
Copy original revs 1.2,1.3 - nofsync/nobiff support, usage update.
1998-08-04 13:14:21 +00:00
Peter Wemm
b2ee1660ba
Copy respective revisions from usr.sbin/sendmail/*/* - use -1 with getopt.
1998-08-04 12:53:30 +00:00
Peter Wemm
c2aa98e247
Import sendmail-8.9.1 (slightly trimmed) onto a fresh branch under
...
src/contrib as per various discussions. I will copy across our changes
and then point the Makefiles across once the dust has settled..
1998-08-03 05:56:20 +00:00
