projects / unix-history / blobdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
This commit was manufactured by cvs2svn to create tag 'FreeBSD-release/1.1'.
[unix-history] / usr.sbin / sendmail / cf / mailer / uucp.m4
diff --git a/usr.sbin/sendmail/cf/mailer/uucp.m4 b/usr.sbin/sendmail/cf/mailer/uucp.m4
index f97e3dc..517839f 100644 (file)
--- a/usr.sbin/sendmail/cf/mailer/uucp.m4
+++ b/usr.sbin/sendmail/cf/mailer/uucp.m4
@@ -34,7 +34,7 @@ PUSHDIVERT(-1)
 #
 
 ifdef(`UUCP_MAILER_PATH',, `define(`UUCP_MAILER_PATH', /usr/bin/uux)')
 #
 
 ifdef(`UUCP_MAILER_PATH',, `define(`UUCP_MAILER_PATH', /usr/bin/uux)')
-ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -z -a$f -gC $h!rmail ($u)')')
+ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -a$f -gC $h!rmail ($u)')')
 ifdef(`UUCP_MAILER_FLAGS',, `define(`UUCP_MAILER_FLAGS', `')')
 ifdef(`UUCP_MAX_SIZE',, `define(`UUCP_MAX_SIZE', 100000)')
 POPDIVERT
 ifdef(`UUCP_MAILER_FLAGS',, `define(`UUCP_MAILER_FLAGS', `')')
 ifdef(`UUCP_MAX_SIZE',, `define(`UUCP_MAX_SIZE', 100000)')
 POPDIVERT
@@ -42,23 +42,38 @@ POPDIVERT
 ###   UUCP Mailer specification   ###
 #####################################
 
 ###   UUCP Mailer specification   ###
 #####################################
 
-VERSIONID(`@(#)uucp.m4 8.4 (Berkeley) 7/13/93')
+VERSIONID(`@(#)uucp.m4 8.15 (Berkeley) 2/16/94')
 
 
-# old UUCP mailer
+#
+#  There are innumerable variations on the UUCP mailer.  It really
+#  is rather absurd.
+#
+
+# old UUCP mailer (two names)
 Muucp,         P=UUCP_MAILER_PATH, F=CONCAT(DFMhuU, UUCP_MAILER_FLAGS), S=12, R=22, M=UUCP_MAX_SIZE,
                A=UUCP_MAILER_ARGS
 Muucp,         P=UUCP_MAILER_PATH, F=CONCAT(DFMhuU, UUCP_MAILER_FLAGS), S=12, R=22, M=UUCP_MAX_SIZE,
                A=UUCP_MAILER_ARGS
+Muucp-old,     P=UUCP_MAILER_PATH, F=CONCAT(DFMhuU, UUCP_MAILER_FLAGS), S=12, R=22, M=UUCP_MAX_SIZE,
+               A=UUCP_MAILER_ARGS
 
 
-# smart UUCP mailer (handles multiple addresses)
+# smart UUCP mailer (handles multiple addresses) (two names)
 Msuucp,                P=UUCP_MAILER_PATH, F=CONCAT(mDFMhuU, UUCP_MAILER_FLAGS), S=12, R=22, M=UUCP_MAX_SIZE,
                A=UUCP_MAILER_ARGS
 Msuucp,                P=UUCP_MAILER_PATH, F=CONCAT(mDFMhuU, UUCP_MAILER_FLAGS), S=12, R=22, M=UUCP_MAX_SIZE,
                A=UUCP_MAILER_ARGS
+Muucp-new,     P=UUCP_MAILER_PATH, F=CONCAT(mDFMhuU, UUCP_MAILER_FLAGS), S=12, R=22, M=UUCP_MAX_SIZE,
+               A=UUCP_MAILER_ARGS
 
 ifdef(`_MAILER_smtp_',
 `# domain-ized UUCP mailer
 
 ifdef(`_MAILER_smtp_',
 `# domain-ized UUCP mailer
-Muucp-dom,     P=UUCP_MAILER_PATH, F=CONCAT(mDFMhu, UUCP_MAILER_FLAGS), S=11, R=21, M=UUCP_MAX_SIZE,
+Muucp-dom,     P=UUCP_MAILER_PATH, F=CONCAT(mDFMhu, UUCP_MAILER_FLAGS), S=52/31, R=ifdef(`_ALL_MASQUERADE_', `11/31', `21'), M=UUCP_MAX_SIZE,
+               A=UUCP_MAILER_ARGS
+
+# domain-ized UUCP mailer with UUCP-style sender envelope
+Muucp-uudom,   P=UUCP_MAILER_PATH, F=CONCAT(mDFMhu, UUCP_MAILER_FLAGS), S=72/31, R=ifdef(`_ALL_MASQUERADE_', `11/31', `21'), M=UUCP_MAX_SIZE,
                A=UUCP_MAILER_ARGS')
 
 
                A=UUCP_MAILER_ARGS')
 
 
-# sender rewriting
+#
+#  envelope and header sender rewriting
+#
 S12
 
 # handle error address as a special case
 S12
 
 # handle error address as a special case
@@ -68,26 +83,75 @@ R<@>                                $n                      errors to mailer-daemon
 R$* :; <@>                     $@ $1 :;
 
 R$* < @ $* . >                 $1 < @ $2 >             strip trailing dots
 R$* :; <@>                     $@ $1 :;
 
 R$* < @ $* . >                 $1 < @ $2 >             strip trailing dots
-R$* < @ $j >                   $1                      strip local name
+R$* < @ $=w >                  $1                      strip local name
+R<@ $- . UUCP > : $+           $1 ! $2                 convert to UUCP format
+R<@ $+ > : $+                  $1 ! $2                 convert to UUCP format
 R$* < @ $- . UUCP >            $2 ! $1                 convert to UUCP format
 R$* < @ $+ >                   $2 ! $1                 convert to UUCP format
 R$* < @ $- . UUCP >            $2 ! $1                 convert to UUCP format
 R$* < @ $+ >                   $2 ! $1                 convert to UUCP format
+R$&h ! $+ ! $+                 $@ $1 ! $2              $h!...!user => ...!user
+R$&h ! $+                      $@ $&h ! $1             $h!user => $h!user
 R$+                            $: $U ! $1              prepend our name
 R$+                            $: $U ! $1              prepend our name
+R! $+                          $: $k ! $1              in case $U undefined
 
 
-# recipient rewriting
+#
+#  envelope and header recipient rewriting
+#
 S22
 
 # don't touch list:; syntax
 S22
 
 # don't touch list:; syntax
-R$* :; <@>                     $@ $1 ;:
+R$* :; <@>                     $@ $1 :;
 
 R$* < @ $* . >                 $1 < @ $2 >             strip trailing dots
 R$* < @ $j >                   $1                      strip local name
 
 R$* < @ $* . >                 $1 < @ $2 >             strip trailing dots
 R$* < @ $j >                   $1                      strip local name
+R<@ $- . UUCP > : $+           $1 ! $2                 convert to UUCP format
+R<@ $+ > : $+                  $1 ! $2                 convert to UUCP format
 R$* < @ $- . UUCP >            $2 ! $1                 convert to UUCP format
 R$* < @ $+ >                   $2 ! $1                 convert to UUCP format
 R$* < @ $- . UUCP >            $2 ! $1                 convert to UUCP format
 R$* < @ $+ >                   $2 ! $1                 convert to UUCP format
+R$&h ! $+ ! $+                 $@ $1 ! $2              $h!...!user => ...!user
+R$&h ! $+                      $@ $&h ! $1             $h!user => $h!user
+R$+                            $: $U ! $1              prepend our name
+R! $+                          $: $k ! $1              in case $U undefined
+
+
+ifdef(`_MAILER_smtp_',
+`#
+#  envelope sender rewriting for uucp-dom mailer
+#
+S52
+
+# handle error address as a special case
+R<@>                           $n                      errors to mailer-daemon
+
+# pass everything to standard SMTP mailer rewriting
+R$*                            $@ $>11 $1
+
+#
+#  envelope sender rewriting for uucp-uudom mailer
+#
+S72
+
+# handle error address as a special case
+R<@>                           $n                      errors to mailer-daemon
+
+# do not qualify list:; syntax
+R$* :; <@>                     $@ $1 :;
+
+R$* < @ $* . >                 $1 < @ $2 >             strip trailing dots
+R$* < @ $=w >                  $1                      strip local name
+R<@ $- . UUCP > : $+           $1 ! $2                 convert to UUCP format
+R<@ $+ > : $+                  $1 ! $2                 convert to UUCP format
+R$* < @ $- . UUCP >            $2 ! $1                 convert to UUCP format
+R$* < @ $+ >                   $@ $2 ! $1              convert to UUCP format
+
+R$&h ! $+ ! $+                 $@ $1 ! $2              $h!...!user => ...!user
+R$&h ! $+                      $@ $&h ! $1             $h!user => $h!user
+R$+                            $: $M ! $1              prepend masquerade name
+R! $+                          $: $j ! $1              in case $M undefined')
+
 
 PUSHDIVERT(4)
 # resolve locally connected UUCP links
 
 PUSHDIVERT(4)
 # resolve locally connected UUCP links
-R< @ $=Y . UUCP > : $+         $#suucp $@ $1 $: $2     @host.UUCP: ...
-R< @ $=U . UUCP > : $+         $#uucp $@ $1 $: $2      @host.UUCP: ...
-R$+ < @ $=Y . UUCP >           $#suucp $@ $2 $: $1     user@host.UUCP
-R$+ < @ $=U . UUCP >           $#uucp $@ $2 $: $1      user@host.UUCP
+R$* < @ $=Z . UUCP. > $*       $#uucp-uudom $@ $2 $: $1 < @ $2 .UUCP. > $3
+R$* < @ $=Y . UUCP. > $*       $#uucp-new $@ $2 $: $1 < @ $2 .UUCP. > $3
+R$* < @ $=U . UUCP. > $*       $#uucp-old $@ $2 $: $1 < @ $2 .UUCP. > $3
 POPDIVERT
 POPDIVERT
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.