add confRECEIVED_HEADER to set the format of the Received: line

SCCS-vsn: usr.sbin/sendmail/cf/m4/cf.m4 8.10
SCCS-vsn: usr.sbin/sendmail/cf/m4/proto.m4 8.56

diff --git a/usr/src/usr.sbin/sendmail/cf/m4/cf.m4 b/usr/src/usr.sbin/sendmail/cf/m4/cf.m4
index f307907..adfa57c 100644 (file)
--- a/usr/src/usr.sbin/sendmail/cf/m4/cf.m4
+++ b/usr/src/usr.sbin/sendmail/cf/m4/cf.m4
@@ -89,6 +89,7 @@ define(`confMAILER_NAME', ``MAILER-DAEMON'')
 define(`confFROM_LINE', `From $g  $d')
 define(`confOPERATORS', `.:%@!^/[]')
 define(`confSMTP_LOGIN_MSG', `$j Sendmail $v/$Z ready at $b')
 define(`confFROM_LINE', `From $g  $d')
 define(`confOPERATORS', `.:%@!^/[]')
 define(`confSMTP_LOGIN_MSG', `$j Sendmail $v/$Z ready at $b')

+define(`confRECEIVED_HEADER', `$?sfrom $s $.$?_($?s$|from $.$_) $.by $j ($v/$Z)$?r with $r$. id $i$?u for $u$.; $b')

 define(`confSEVEN_BIT_INPUT', `False')
 define(`confEIGHT_BIT_HANDLING', `pass8')
 define(`confALIAS_WAIT', `10')
 define(`confSEVEN_BIT_INPUT', `False')
 define(`confEIGHT_BIT_HANDLING', `pass8')
 define(`confALIAS_WAIT', `10')


@@ -128,4 +129,4 @@ define(`confSORT_QUEUE_BY_HOST', `False')
 define(`confBROKEN_SMTP_PEERS', `False')
 
 divert(0)dnl
 define(`confBROKEN_SMTP_PEERS', `False')
 
 divert(0)dnl

-VERSIONID(`@(#)cf.m4   8.9 (Berkeley) %G%')
+VERSIONID(`@(#)cf.m4   8.10 (Berkeley) %G%')

diff --git a/usr/src/usr.sbin/sendmail/cf/m4/proto.m4 b/usr/src/usr.sbin/sendmail/cf/m4/proto.m4
index 1ebfa03..617bfda 100644 (file)
--- a/usr/src/usr.sbin/sendmail/cf/m4/proto.m4
+++ b/usr/src/usr.sbin/sendmail/cf/m4/proto.m4
@@ -8,7 +8,7 @@ divert(-1)
 #
 divert(0)
 
 #
 divert(0)
 

-VERSIONID(`@(#)proto.m4        8.55 (Berkeley) %G%')
+VERSIONID(`@(#)proto.m4        8.56 (Berkeley) %G%')

 
 MAILER(local)dnl
 
 
 MAILER(local)dnl
 


@@ -337,7 +337,7 @@ Tuucp
 #########################
 
 H?P?Return-Path: $g
 #########################
 
 H?P?Return-Path: $g

-HReceived: $?sfrom $s $.$?_($?s$|from $.$_) $.by $j ($v/$Z)$?r with $r$. id $i$?u for $u$.; $b
+HReceived: confRECEIVED_HEADER

 H?D?Resent-Date: $a
 H?D?Date: $a
 H?F?Resent-From: $q
 H?D?Resent-Date: $a
 H?D?Date: $a
 H?F?Resent-From: $q