Commit Graph

7 Commits

Author SHA1 Message Date
Gregory Neil Shapiro b466200952 Repair 8.11.3 merge conflicts 2001-02-28 00:22:47 +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 9350bdc398 Fix syntax for Received: header after conflict resolution.
Problem noted by: Andrey A. Chernov <ache@FreeBSD.ORG>
2000-08-13 18:47:42 +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 8c7de60340 Copy across rev 1.2 of usr.sbin/sendmail/cf/m4/cfhead.m4: Record envelope
sender in each Received: header along the way. Great for spammer hunting.
1998-08-04 12:44:19 +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