add LOCAL_SHELL_DIR

SCCS-vsn: usr.sbin/sendmail/cf/mailer/local.m4 8.9
SCCS-vsn: usr.sbin/sendmail/cf/README 8.42

diff --git a/usr/src/usr.sbin/sendmail/cf/README b/usr/src/usr.sbin/sendmail/cf/README
index c038c8e..e4d3572 100644 (file)
--- a/usr/src/usr.sbin/sendmail/cf/README
+++ b/usr/src/usr.sbin/sendmail/cf/README
@@ -4,7 +4,7 @@
 
                Eric Allman <eric@CS.Berkeley.EDU>
 
 
                Eric Allman <eric@CS.Berkeley.EDU>
 

-               @(#)README      8.41 (Berkeley) %G%
+               @(#)README      8.42 (Berkeley) %G%

 
 
 This document describes the sendmail configuration files being used
 
 
 This document describes the sendmail configuration files being used


@@ -161,6 +161,8 @@ LOCAL_SHELL_FLAGS   [eu] The flags used by the shell mailer.  The
                        flags lsDFM are always included.
 LOCAL_SHELL_ARGS       [sh -c $u] The arguments passed to deliver "prog"
                        mail.
                        flags lsDFM are always included.
 LOCAL_SHELL_ARGS       [sh -c $u] The arguments passed to deliver "prog"
                        mail.

+LOCAL_SHELL_DIR                [$z:/] The directory search path in which the
+                       shell should run.

 USENET_MAILER_PATH     [/usr/lib/news/inews] The name of the program
                        used to submit news.
 USENET_MAILER_FLAGS    [rlsDFMmn] The mailer flags for the usenet mailer.
 USENET_MAILER_PATH     [/usr/lib/news/inews] The name of the program
                        used to submit news.
 USENET_MAILER_FLAGS    [rlsDFMmn] The mailer flags for the usenet mailer.

diff --git a/usr/src/usr.sbin/sendmail/cf/mailer/local.m4 b/usr/src/usr.sbin/sendmail/cf/mailer/local.m4
index e9a676c..68c2f7b 100644 (file)
--- a/usr/src/usr.sbin/sendmail/cf/mailer/local.m4
+++ b/usr/src/usr.sbin/sendmail/cf/mailer/local.m4
@@ -12,17 +12,18 @@ ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail -d $u')')
 ifdef(`LOCAL_SHELL_FLAGS',, `define(`LOCAL_SHELL_FLAGS', `eu')')
 ifdef(`LOCAL_SHELL_PATH',, `define(`LOCAL_SHELL_PATH', /bin/sh)')
 ifdef(`LOCAL_SHELL_ARGS',, `define(`LOCAL_SHELL_ARGS', `sh -c $u')')
 ifdef(`LOCAL_SHELL_FLAGS',, `define(`LOCAL_SHELL_FLAGS', `eu')')
 ifdef(`LOCAL_SHELL_PATH',, `define(`LOCAL_SHELL_PATH', /bin/sh)')
 ifdef(`LOCAL_SHELL_ARGS',, `define(`LOCAL_SHELL_ARGS', `sh -c $u')')

+ifdef(`LOCAL_SHELL_DIR',, `define(`LOCAL_SHELL_DIR', `$z:/')')

 POPDIVERT
 
 ##################################################
 ###   Local and Program Mailer specification   ###
 ##################################################
 
 POPDIVERT
 
 ##################################################
 ###   Local and Program Mailer specification   ###
 ##################################################
 

-VERSIONID(`@(#)local.m4        8.8 (Berkeley) %G%')
+VERSIONID(`@(#)local.m4        8.9 (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

-Mprog,         P=LOCAL_SHELL_PATH, F=CONCAT(`lsDFM', LOCAL_SHELL_FLAGS), S=10, R=20/40, D=$z:/,
+Mprog,         P=LOCAL_SHELL_PATH, F=CONCAT(`lsDFM', LOCAL_SHELL_FLAGS), S=10, R=20/40, D=LOCAL_SHELL_DIR,

                A=LOCAL_SHELL_ARGS
 
 S10
                A=LOCAL_SHELL_ARGS
 
 S10