delete $<

SCCS-vsn: usr.sbin/sendmail/cf/m4/proto.m4 6.22
SCCS-vsn: usr.sbin/sendmail/cf/m4/cf.m4 6.10

diff --git a/usr/src/usr.sbin/sendmail/cf/m4/cf.m4 b/usr/src/usr.sbin/sendmail/cf/m4/cf.m4
index 6a58a4a..09a991a 100644 (file)
--- a/usr/src/usr.sbin/sendmail/cf/m4/cf.m4
+++ b/usr/src/usr.sbin/sendmail/cf/m4/cf.m4
@@ -80,7 +80,7 @@ m4wrap(`include(`../m4/proto.m4')')
 
 # set up default values for options
 define(`confMAILER_NAME', ``MAILER-DAEMON'')
 
 # set up default values for options
 define(`confMAILER_NAME', ``MAILER-DAEMON'')

-define(`confFROM_LINE', `From $?<$<$|$g$.  $d')
+define(`confFROM_LINE', `From $g  $d')

 define(`confOPERATORS', `.:%@!^/[]')
 define(`confSMTP_LOGIN_MSG', `$j Sendmail $v/$Z ready at $b')
 define(`confEIGHT_BIT_INPUT', `False')
 define(`confOPERATORS', `.:%@!^/[]')
 define(`confSMTP_LOGIN_MSG', `$j Sendmail $v/$Z ready at $b')
 define(`confEIGHT_BIT_INPUT', `False')


@@ -115,4 +115,4 @@ define(`confSEPARATE_PROC', `False')
 define(`confCW_FILE', `/etc/sendmail.cw')
 
 divert(0)dnl
 define(`confCW_FILE', `/etc/sendmail.cw')
 
 divert(0)dnl

-VERSIONID(`@(#)cf.m4   6.9 (Berkeley) %G%')
+VERSIONID(`@(#)cf.m4   6.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 1b7b1da..ae12497 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        6.21 (Berkeley) %G%')
+VERSIONID(`@(#)proto.m4        6.22 (Berkeley) %G%')

 
 MAILER(local)dnl
 
 
 MAILER(local)dnl
 


@@ -276,7 +276,7 @@ Tuucp
 #   Format of headers   #
 #########################
 
 #   Format of headers   #
 #########################
 

-H?P?Return-Path: <$?<$<$|$g$.>
+H?P?Return-Path: $g

 HReceived: $?sfrom $s $.by $j ($v/$Z) id $i; $b
 H?D?Resent-Date: $a
 H?D?Date: $a
 HReceived: $?sfrom $s $.by $j ($v/$Z) id $i; $b
 H?D?Resent-Date: $a
 H?D?Date: $a