change error address convention to avoid conflict with C flag

SCCS-vsn: usr.sbin/sendmail/cf/mailer/local.m4 6.4
SCCS-vsn: usr.sbin/sendmail/cf/mailer/smtp.m4 6.5
SCCS-vsn: usr.sbin/sendmail/cf/mailer/uucp.m4 6.7
SCCS-vsn: usr.sbin/sendmail/cf/m4/proto.m4 6.14
SCCS-vsn: usr.sbin/sendmail/cf/m4/version.m4 6.11

diff --git a/usr/src/usr.sbin/sendmail/cf/m4/proto.m4 b/usr/src/usr.sbin/sendmail/cf/m4/proto.m4
index f11709d..f74301f 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.13 (Berkeley) %G%')
+VERSIONID(`@(#)proto.m4        6.14 (Berkeley) %G%')

 
 MAILER(local)dnl
 
 
 MAILER(local)dnl
 


@@ -300,12 +300,12 @@ undivert(6)dnl
 S3
 
 # handle null input (translate to <> special case)
 S3
 
 # handle null input (translate to <> special case)

-R$@                    $@ <@>
+R$@                    $@ <>

 
 # basic textual canonicalization -- note RFC733 heuristic here
 R$*<$*>$*<$*>$*                <$2>$3$4$5                      strip multiple <> <>
 R$*<$*<$+>$*>$*                <$3>$5                          2-level <> nesting
 
 # basic textual canonicalization -- note RFC733 heuristic here
 R$*<$*>$*<$*>$*                <$2>$3$4$5                      strip multiple <> <>
 R$*<$*<$+>$*>$*                <$3>$5                          2-level <> nesting

-R$*<>$*                        $@ <@>                          MAIL FROM:<> case
+R$*<>$*                        $@ <>                           MAIL FROM:<> case

 R$*<$+>$*              $2                              basic RFC821/822 parsing
 
 # make sure <@a,@b,@c:user@d> syntax is easy to parse -- undone later
 R$*<$+>$*              $2                              basic RFC821/822 parsing
 
 # make sure <@a,@b,@c:user@d> syntax is easy to parse -- undone later


@@ -387,7 +387,7 @@ R$* < @ $j > $*                     $: $1 < @ $j . > $2
 ##################################################
 S4
 
 ##################################################
 S4
 

-R<@>                   $@                              handle <> error addr
+R<>                    $@                              handle <> error addr

 
 # resolve numeric addresses to name if possible
 R$* < @ [ $+ ] > $*    $: $1 < @ $[ [$2] $] > $3       lookup numeric internet addr
 
 # resolve numeric addresses to name if possible
 R$* < @ [ $+ ] > $*    $: $1 < @ $[ [$2] $] > $3       lookup numeric internet addr


@@ -425,6 +425,8 @@ R$*                 $@ $>0 $1
 
 S0
 
 
 S0
 

+R<>                    $#local $: <>                   special case error msgs
+

 ifdef(`_MAILER_smtp_',
 `# handle numeric address spec
 R$* < @ [ $+ ] > $*    $: $1 < @ $[ [$2] $] > $3       numeric internet addr
 ifdef(`_MAILER_smtp_',
 `# handle numeric address spec
 R$* < @ [ $+ ] > $*    $: $1 < @ $[ [$2] $] > $3       numeric internet addr

diff --git a/usr/src/usr.sbin/sendmail/cf/m4/version.m4 b/usr/src/usr.sbin/sendmail/cf/m4/version.m4
index ffa06f2..419d8f3 100644 (file)
--- a/usr/src/usr.sbin/sendmail/cf/m4/version.m4
+++ b/usr/src/usr.sbin/sendmail/cf/m4/version.m4
@@ -6,8 +6,8 @@ divert(-1)
 #
 # %sccs.include.redist.sh%
 #
 #
 # %sccs.include.redist.sh%
 #

-VERSIONID(`@(#)version.m4      6.10 (Berkeley) %G%')
+VERSIONID(`@(#)version.m4      6.11 (Berkeley) %G%')

 #
 divert(0)
 # Configuration version number
 #
 divert(0)
 # Configuration version number

-DZ6.10
+DZ6.11

diff --git a/usr/src/usr.sbin/sendmail/cf/mailer/local.m4 b/usr/src/usr.sbin/sendmail/cf/mailer/local.m4
index 5e44549..330ed16 100644 (file)
--- a/usr/src/usr.sbin/sendmail/cf/mailer/local.m4
+++ b/usr/src/usr.sbin/sendmail/cf/mailer/local.m4
@@ -12,7 +12,7 @@ POPDIVERT
 ###   Local and Program Mailer specification   ###
 ##################################################
 
 ###   Local and Program Mailer specification   ###
 ##################################################
 

-VERSIONID(`@(#)local.m4        6.3 (Berkeley) %G%')
+VERSIONID(`@(#)local.m4        6.4 (Berkeley) %G%')

 
 ifdef(`LOCAL_MAILER_FLAGS',, `define(`LOCAL_MAILER_FLAGS', `rn')')dnl
 Mlocal,                P=ifdef(`LOCAL_MAILER_PATH', `LOCAL_MAILER_PATH', /bin/mail), F=CONCAT(`lsDFMm', LOCAL_MAILER_FLAGS), S=10, R=20,
 
 ifdef(`LOCAL_MAILER_FLAGS',, `define(`LOCAL_MAILER_FLAGS', `rn')')dnl
 Mlocal,                P=ifdef(`LOCAL_MAILER_PATH', `LOCAL_MAILER_PATH', /bin/mail), F=CONCAT(`lsDFMm', LOCAL_MAILER_FLAGS), S=10, R=20,


@@ -21,4 +21,4 @@ Mprog,                P=ifdef(`LOCAL_SHELL_PATH', `LOCAL_SHELL_PATH', /bin/sh), F=lsDFMe, S=10
                A=sh -c $u
 
 S10
                A=sh -c $u
 
 S10

-R<@>                   $n                      errors to mailer-daemon
+R<>                    $n                      errors to mailer-daemon

diff --git a/usr/src/usr.sbin/sendmail/cf/mailer/smtp.m4 b/usr/src/usr.sbin/sendmail/cf/mailer/smtp.m4
index f7def63..2775828 100644 (file)
--- a/usr/src/usr.sbin/sendmail/cf/mailer/smtp.m4
+++ b/usr/src/usr.sbin/sendmail/cf/mailer/smtp.m4
@@ -11,7 +11,7 @@ POPDIVERT
 ###   SMTP Mailer specification   ###
 #####################################
 
 ###   SMTP Mailer specification   ###
 #####################################
 

-VERSIONID(`@(#)smtp.m4 6.4 (Berkeley) %G%')
+VERSIONID(`@(#)smtp.m4 6.5 (Berkeley) %G%')

 
 Msmtp,         P=[IPC], F=mDFMueXLC, S=11, R=21, E=\r\n,
                A=IPC $h
 
 Msmtp,         P=[IPC], F=mDFMueXLC, S=11, R=21, E=\r\n,
                A=IPC $h


@@ -30,7 +30,7 @@ R$* :;                        $@ $1 :;
 # unqualified names (e.g., "eric") "come from" $M
 R$=E                   $: $1 < @ $j>                   show exposed names
 R$+                    $: $1 < @ $M >                  user w/o host
 # unqualified names (e.g., "eric") "come from" $M
 R$=E                   $: $1 < @ $j>                   show exposed names
 R$+                    $: $1 < @ $M >                  user w/o host

-R$+ < @ >              $: $1 < @ $j >                  in case $M undefined
+R$+ <>                 $: $1 < @ $j >                  in case $M undefined

 
 S21
 
 
 S21
 

diff --git a/usr/src/usr.sbin/sendmail/cf/mailer/uucp.m4 b/usr/src/usr.sbin/sendmail/cf/mailer/uucp.m4
index 01b76c4..d8d7cf7 100644 (file)
--- a/usr/src/usr.sbin/sendmail/cf/mailer/uucp.m4
+++ b/usr/src/usr.sbin/sendmail/cf/mailer/uucp.m4
@@ -13,7 +13,7 @@ POPDIVERT
 ###   UUCP Mailer specification   ###
 #####################################
 
 ###   UUCP Mailer specification   ###
 #####################################
 

-VERSIONID(`@(#)uucp.m4 6.6 (Berkeley) %G%')
+VERSIONID(`@(#)uucp.m4 6.7 (Berkeley) %G%')

 
 Msuucp,                P=UUCP_MAILER_PATH, F=mDFMhuU, S=12, R=22, M=100000,
                A=uux - -r -z -a$f -gC $h!rmail ($u)
 
 Msuucp,                P=UUCP_MAILER_PATH, F=mDFMhuU, S=12, R=22, M=100000,
                A=uux - -r -z -a$f -gC $h!rmail ($u)


@@ -25,7 +25,7 @@ Muucp,                P=UUCP_MAILER_PATH, F=DFMhuU, S=12, R=22, M=100000,
 S12
 
 # handle error address as a special case
 S12
 
 # handle error address as a special case

-R<@>                           $n                      errors to mailer-daemon
+R<>                            $n                      errors to mailer-daemon

 
 # don't qualify list:; syntax
 R$* :;                         $@ $1 :;
 
 # don't qualify list:; syntax
 R$* :;                         $@ $1 :;