16c16
< VERSIONID(`$Id: proto.m4,v 8.446.2.5.2.41 2001/05/23 21:32:16 ca Exp $')
---
> VERSIONID(`$Id: proto.m4,v 8.446.2.5.2.44 2001/07/31 22:25:49 gshapiro Exp $')
164,165c164,167
< ifdef(`_FFR_5_', `# macro storage map
< Kmacro macro')
---
> ifdef(`_NEED_MACRO_MAP_', `dnl
> ifdef(`_MACRO_MAP_', `', `# macro storage map
> define(`_MACRO_MAP_', `1')dnl
> Kmacro macro')', `dnl')
634c636
< R$* [ IPv6 $- ] <@> $: $1 [ IPv6 $2 ] unmark IPv6 addr
---
> R$* [ IPv6 : $+ ] <@> $: $1 [ IPv6 : $2 ] unmark IPv6 addr
710,712c712,714
< R$* < @ [ IPv6 $- ] > $* $: $2 $| $1 < @@ [ $(dequote $2 $) ] > $3 mark IPv6 addr
< R$- $| $* < @@ $=w > $* $: $2 < @ $j . > $4 self-literal
< R$- $| $* < @@ [ $+ ] > $* $@ $2 < @ [ IPv6 $1 ] > $4 canon IP addr
---
> R$* < @ [ IPv6 : $+ ] > $* $: $2 $| $1 < @@ [ $(dequote $2 $) ] > $3 mark IPv6 addr
> R$+ $| $* < @@ $=w > $* $: $2 < @ $j . > $4 self-literal
> R$+ $| $* < @@ [ $+ ] > $* $@ $2 < @ [ IPv6 : $1 ] > $4 canon IP addr
910,911c912,913
< R$* < @ [ IPv6 $- ] : > $*
< $#_SMTP_ $@ [ $(dequote $2 $) ] $: $1 < @ [IPv6 $2 ] > $3 no smarthost: send
---
> R$* < @ [ IPv6 : $+ ] : > $*
> $#_SMTP_ $@ [ $(dequote $2 $) ] $: $1 < @ [IPv6 : $2 ] > $3 no smarthost: send
938a941,942
> dnl this is not a documented option
> dnl it performs no looping at all for virtusertable
1107c1111
< dnl <[IPv6 number]> address -> relay number address
---
> dnl <[IPv6:number]> address -> relay number address
1119c1123
< R< [ IPv6 $+ ] > $* $#_RELAY_ $@ $(dequote $1 $) $: $2 use unqualified mailer
---
> R< [ IPv6 : $+ ] > $* $#_RELAY_ $@ $(dequote $1 $) $: $2 use unqualified mailer
1283c1287
< R<[IPv6 $-]> <$+> <$*> <$*> $: <[$(dequote $1 $)]> <$2> <$3> <$4>
---
> R<[IPv6 : $+]> <$+> <$*> <$*> $: <[$(dequote $1 $)]> <$2> <$3> <$4>