cleanup for new features and release engineering

SCCS-vsn: usr.sbin/sendmail/cf/m4/cf.m4 2.21
SCCS-vsn: usr.sbin/sendmail/cf/m4/proto.m4 2.34
SCCS-vsn: usr.sbin/sendmail/cf/m4/version.m4 2.12

diff --git a/usr/src/usr.sbin/sendmail/cf/m4/cf.m4 b/usr/src/usr.sbin/sendmail/cf/m4/cf.m4
index 2d203ab..2219b5e 100644 (file)
--- a/usr/src/usr.sbin/sendmail/cf/m4/cf.m4
+++ b/usr/src/usr.sbin/sendmail/cf/m4/cf.m4
@@ -53,10 +53,13 @@ define(`SITE', `ifelse(CONCAT($'2`, $3), SU,
                CONCAT(CY, $'1`),
                CONCAT(C, $3, $'1`))')
 sinclude(../siteconfig/$1.m4)')
                CONCAT(CY, $'1`),
                CONCAT(C, $3, $'1`))')
 sinclude(../siteconfig/$1.m4)')

-define(`LOCAL_NAME', `PUSHDIVERT(5)CL$1
+define(`EXPOSED_USER', `PUSHDIVERT(5)CE$1

 POPDIVERT`'dnl')
 POPDIVERT`'dnl')

+define(`LOCAL_USER', `PUSHDIVERT(5)CL$1
+POPDIVERT`'dnl')
+define(`MASQUERADE_AS', `define(`MASQUERADE_NAME', $1)')

 
 m4wrap(`include(`../m4/proto.m4')')
 
 divert(0)dnl
 
 m4wrap(`include(`../m4/proto.m4')')
 
 divert(0)dnl

-VERSIONID(`@(#)cf.m4   2.20 (Berkeley) %G%')
+VERSIONID(`@(#)cf.m4   2.21 (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 e73e189..0262ae7 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        2.33 (Berkeley) %G%')
+VERSIONID(`@(#)proto.m4        2.34 (Berkeley) %G%')

 
 MAILER(local)dnl
 
 
 MAILER(local)dnl
 


@@ -46,19 +46,12 @@ CONCAT(DM, ifdef(`MASQUERADE_NAME', MASQUERADE_NAME, $j))
 # who I send unqualified names to (null means deliver locally)
 CONCAT(DR, ifdef(`LOCAL_RELAY', LOCAL_RELAY))
 
 # who I send unqualified names to (null means deliver locally)
 CONCAT(DR, ifdef(`LOCAL_RELAY', LOCAL_RELAY))
 

-# names that should be delivered locally, even if we have a relay
+# class L: names that should be delivered locally, even if we have a relay
+# class E: names that should be exposed as from this host, even if we masquerade

 CLroot
 CLroot

+CEroot

 undivert(5)dnl
 
 undivert(5)dnl
 

-ifdef(`UUCP_NAME',
-`# uucp hostnames
-UUCP_NAME
-UUCP_ALIASES
-
-# local UUCP connections
-include(UUCP_HOSTS_FILE)',
-`dnl')
-

 # operators that cannot be in local usernames (i.e., network indicators)
 CO @ % !
 
 # operators that cannot be in local usernames (i.e., network indicators)
 CO @ % !
 


@@ -72,10 +65,6 @@ OU`'ifdef(`USERDB_SPEC', `USERDB_SPEC')
 Ow`'ifdef(`_NO_WILDCARD_MX_', `True', `False')
 
 include(`../m4/version.m4')
 Ow`'ifdef(`_NO_WILDCARD_MX_', `True', `False')
 
 include(`../m4/version.m4')

-
-ifdef(`INTERNET_RELAY',
-`include(../sitedep/nicregistered.m4)',
-`dnl')

 include(`../m4/boilerplate.m4')
 undivert(6)dnl
 #\f
 include(`../m4/boilerplate.m4')
 undivert(6)dnl
 #\f


@@ -134,8 +123,7 @@ R$* @ $*            $@ $>6 $1 < @ $2 >              Insert < > and finish
 ###  Ruleset 6 -- bottom half of ruleset 3  ###
 ###############################################
 
 ###  Ruleset 6 -- bottom half of ruleset 3  ###
 ###############################################
 

-#  At this point, everything should be in a local_part@domain format.
-
+#  At this point, everything should be in a "local_part<@domain>extra" format.

 S6
 
 # handle special cases for local names
 S6
 
 # handle special cases for local names

diff --git a/usr/src/usr.sbin/sendmail/cf/m4/version.m4 b/usr/src/usr.sbin/sendmail/cf/m4/version.m4
index 26529ab..642a42c 100644 (file)
--- a/usr/src/usr.sbin/sendmail/cf/m4/version.m4
+++ b/usr/src/usr.sbin/sendmail/cf/m4/version.m4
@@ -6,11 +6,11 @@ divert(-1)
 #
 # %sccs.include.redist.sh%
 #
 #
 # %sccs.include.redist.sh%
 #

-VERSIONID(`@(#)version.m4      2.11 (Berkeley) %G%')
+VERSIONID(`@(#)version.m4      2.12 (Berkeley) %G%')

 #
 divert(0)
 ######################
 #   Version Number   #
 ######################
 
 #
 divert(0)
 ######################
 #   Version Number   #
 ######################
 

-DZ2.11
+DZ2.12