have mailertable look for partial domains as well as full domains

SCCS-vsn: usr.sbin/sendmail/cf/m4/proto.m4 6.41
SCCS-vsn: usr.sbin/sendmail/cf/m4/version.m4 6.31

diff --git a/usr/src/usr.sbin/sendmail/cf/m4/proto.m4 b/usr/src/usr.sbin/sendmail/cf/m4/proto.m4
index 3885de3..83f4036 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.40 (Berkeley) %G%')
+VERSIONID(`@(#)proto.m4        6.41 (Berkeley) %G%')

 
 MAILER(local)dnl
 
 
 MAILER(local)dnl
 


@@ -477,7 +477,6 @@ R$* $=O $* < @ $j . >       $@ $>7 $1 $2 $3                 ...@here -> ...
 ifdef(`MAILER_TABLE',
 `
 # try mailer table lookup
 ifdef(`MAILER_TABLE',
 `
 # try mailer table lookup

-R$* < @ $+ > $*                $: $1 < @ $(mailertable $2 $) > $3

 R$* < @ $-:$+ > $*     $# $2 $@ $3 $: $1 @ $3 $4       found a match',
 `dnl')
 
 R$* < @ $-:$+ > $*     $# $2 $@ $3 $: $1 @ $3 $4       found a match',
 `dnl')
 


@@ -580,6 +579,20 @@ R$+ < @ $j >               $@ $1                           we are relay/hub: local
 R$+ < @ $-:$+ >                $# $2 $@ $3 $: $1               send to relay or hub
 ifdef(`_MAILER_smtp_',
 `R$+ < @ $+ >          $#relay $@ $2 $: $1             send to relay or hub')')
 R$+ < @ $-:$+ >                $# $2 $@ $3 $: $1               send to relay or hub
 ifdef(`_MAILER_smtp_',
 `R$+ < @ $+ >          $#relay $@ $2 $: $1             send to relay or hub')')

+ifdef(`MAILER_TABLE',
+`
+
+###########################################################################
+###  Ruleset 90 -- try domain part of mailertable entry                ###
+###               (new sendmail only)                                  ###
+###########################################################################
+
+S90
+R<$- . $+ > $*         $: < $(mailertable .$2 $: $) > $3       lookup
+R<$- : $+ > $*         $# $1 $@ $2 $: $3               check -- resolved?
+R<$- . $+ > $*         $@ $>99 <$2> $3                 no -- strip & try again
+R<$*> $*               $@ $2                           no match',
+`dnl')

 #\f
 ######################################################################
 ######################################################################
 #\f
 ######################################################################
 ######################################################################

diff --git a/usr/src/usr.sbin/sendmail/cf/m4/version.m4 b/usr/src/usr.sbin/sendmail/cf/m4/version.m4
index e5c42ed..0bf5df9 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.30 (Berkeley) %G%')
+VERSIONID(`@(#)version.m4      6.31 (Berkeley) %G%')

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

-DZ6.30
+DZ6.31