allow redefinition of sendmail.cw path

SCCS-vsn: usr.sbin/sendmail/cf/m4/cf.m4 6.8
SCCS-vsn: usr.sbin/sendmail/cf/m4/proto.m4 6.16

diff --git a/usr/src/usr.sbin/sendmail/cf/m4/cf.m4 b/usr/src/usr.sbin/sendmail/cf/m4/cf.m4
index f4ff0a8..14a9ca9 100644 (file)
--- a/usr/src/usr.sbin/sendmail/cf/m4/cf.m4
+++ b/usr/src/usr.sbin/sendmail/cf/m4/cf.m4
@@ -96,6 +96,7 @@ define(`confDEF_USER_ID', `1')
 define(`confQUEUE_LA', `8')
 define(`confREFUSE_LA', `12')
 define(`confSEPARATE_PROC', `False')
 define(`confQUEUE_LA', `8')
 define(`confREFUSE_LA', `12')
 define(`confSEPARATE_PROC', `False')

+define(`confCW_FILE', `/etc/sendmail.cw')

 
 divert(0)dnl
 
 divert(0)dnl

-VERSIONID(`@(#)cf.m4   6.7 (Berkeley) %G%')
+VERSIONID(`@(#)cf.m4   6.8 (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 0f9e146..6365212 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.15 (Berkeley) %G%')
+VERSIONID(`@(#)proto.m4        6.16 (Berkeley) %G%')

 
 MAILER(local)dnl
 
 
 MAILER(local)dnl
 


@@ -23,7 +23,7 @@ V4')
 Cwlocalhost
 ifdef(`USE_CW_FILE',
 `# file containing names of hosts for which we receive email
 Cwlocalhost
 ifdef(`USE_CW_FILE',
 `# file containing names of hosts for which we receive email

-Fw/etc/sendmail.cw', `dnl')
+CONCAT(`Fw', confCW_FILE)', `dnl')

 
 ifdef(`UUCP_RELAY',
 `# UUCP relay host
 
 ifdef(`UUCP_RELAY',
 `# UUCP relay host