accept user+detail

SCCS-vsn: usr.sbin/sendmail/cf/mailer/local.m4 8.8
SCCS-vsn: usr.sbin/sendmail/cf/m4/cf.m4 8.11
SCCS-vsn: usr.sbin/sendmail/cf/m4/proto.m4 8.58

diff --git a/usr/src/usr.sbin/sendmail/cf/m4/cf.m4 b/usr/src/usr.sbin/sendmail/cf/m4/cf.m4
index adfa57c..9f45d7b 100644 (file)
--- a/usr/src/usr.sbin/sendmail/cf/m4/cf.m4
+++ b/usr/src/usr.sbin/sendmail/cf/m4/cf.m4
@@ -87,7 +87,7 @@ m4wrap(`include(`../m4/proto.m4')')
 # set up default values for options
 define(`confMAILER_NAME', ``MAILER-DAEMON'')
 define(`confFROM_LINE', `From $g  $d')
 # set up default values for options
 define(`confMAILER_NAME', ``MAILER-DAEMON'')
 define(`confFROM_LINE', `From $g  $d')

-define(`confOPERATORS', `.:%@!^/[]')
+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(`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')


@@ -129,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.10 (Berkeley) %G%')
+VERSIONID(`@(#)cf.m4   8.11 (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 aab3e5c..57ecfed 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.57 (Berkeley) %G%')
+VERSIONID(`@(#)proto.m4        8.58 (Berkeley) %G%')

 
 MAILER(local)dnl
 
 
 MAILER(local)dnl
 


@@ -534,8 +534,10 @@ R<$+ @ $+ > $* < $+ >      $: $>_SET_95_ < $H > $3 < $4 >  ... send direct to hub
 R<$* @ $* > $* < $+ >  $: $3 < $4 >
 ifdef(`_STICKY_LOCAL_DOMAIN_',
 `R$+ < @ $=w . >               $: < $H > $1 < @ $2 . >         first try hub
 R<$* @ $* > $* < $+ >  $: $3 < $4 >
 ifdef(`_STICKY_LOCAL_DOMAIN_',
 `R$+ < @ $=w . >               $: < $H > $1 < @ $2 . >         first try hub

-R< $+ > $+ < $+ >      $#_LOCAL_ $: $2                 yep ....
+R< $+ > $+ + $* < $+ > $#_LOCAL_ $@ $3 $: $2           yep (plussed name) ....
+R< $+ > $+ < $+ >      $#_LOCAL_ $: $2                 yep (nonplussed) ....

 R< > $=D . $+ < $+ >   $#_LOCAL_ $: $1 . $2            dotted name?
 R< > $=D . $+ < $+ >   $#_LOCAL_ $: $1 . $2            dotted name?

+R< > $+ + $* < $+ >    $#_LOCAL_ $@ $2 $: $1           plussed name?

 R< > $+ < $+ >         $#_LOCAL_ $: @ $1                       nope, local address',
 `R$+ < @ $=w . >               $#_LOCAL_ $: $1                 dispose directly',
 `R$+ < @ $=w . >               $: $>_SET_95_ < $H > $1 < @ $2 . >      sticky local names
 R< > $+ < $+ >         $#_LOCAL_ $: @ $1                       nope, local address',
 `R$+ < @ $=w . >               $#_LOCAL_ $: $1                 dispose directly',
 `R$+ < @ $=w . >               $: $>_SET_95_ < $H > $1 < @ $2 . >      sticky local names


@@ -598,6 +600,7 @@ R$+ $=O $+          $@ $>97 $1 $2 $3                        try again
 # handle locally delivered names
 R$=L                   $: $>_SET_95_ < $H > $1         special local names
 R$=L                   $#_LOCAL_ $: @ $1                       special local names
 # handle locally delivered names
 R$=L                   $: $>_SET_95_ < $H > $1         special local names
 R$=L                   $#_LOCAL_ $: @ $1                       special local names

+R$+ + $*               $#_LOCAL_ $@ $2 $: $1           plussed local names

 R$+                    $#_LOCAL_ $: $1                 regular local names
 
 ###########################################################################
 R$+                    $#_LOCAL_ $: $1                 regular local names
 
 ###########################################################################

diff --git a/usr/src/usr.sbin/sendmail/cf/mailer/local.m4 b/usr/src/usr.sbin/sendmail/cf/mailer/local.m4
index 94cf91f..e9a676c 100644 (file)
--- a/usr/src/usr.sbin/sendmail/cf/mailer/local.m4
+++ b/usr/src/usr.sbin/sendmail/cf/mailer/local.m4
@@ -18,7 +18,7 @@ POPDIVERT
 ###   Local and Program Mailer specification   ###
 ##################################################
 
 ###   Local and Program Mailer specification   ###
 ##################################################
 

-VERSIONID(`@(#)local.m4        8.7 (Berkeley) %G%')
+VERSIONID(`@(#)local.m4        8.8 (Berkeley) %G%')

 
 Mlocal,                P=LOCAL_MAILER_PATH, F=CONCAT(`lsDFMAw5:/|@', LOCAL_MAILER_FLAGS), S=10, R=20/40,
                A=LOCAL_MAILER_ARGS
 
 Mlocal,                P=LOCAL_MAILER_PATH, F=CONCAT(`lsDFMAw5:/|@', LOCAL_MAILER_FLAGS), S=10, R=20/40,
                A=LOCAL_MAILER_ARGS


@@ -31,6 +31,7 @@ R$+                   $: $>40 $1
 
 S20
 R$+ < @ $* >           $: $1                   strip host part
 
 S20
 R$+ < @ $* >           $: $1                   strip host part

+R$+ + $*               $: $1                   strip +argument part

 
 S40
 ifdef(`_ALWAYS_ADD_DOMAIN_',
 
 S40
 ifdef(`_ALWAYS_ADD_DOMAIN_',