change SortQueueByHost option to QueueSortOrder

SCCS-vsn: usr.sbin/sendmail/cf/m4/cf.m4 8.12
SCCS-vsn: usr.sbin/sendmail/cf/m4/proto.m4 8.62

diff --git a/usr/src/usr.sbin/sendmail/cf/m4/cf.m4 b/usr/src/usr.sbin/sendmail/cf/m4/cf.m4
index 9f45d7b..f42037f 100644 (file)
--- a/usr/src/usr.sbin/sendmail/cf/m4/cf.m4
+++ b/usr/src/usr.sbin/sendmail/cf/m4/cf.m4
@@ -125,8 +125,8 @@ define(`confSEPARATE_PROC', `False')
 define(`confCW_FILE', `/etc/sendmail.cw')
 define(`confMIME_FORMAT_ERRORS', `True')
 define(`confTRY_NULL_MX_LIST', `False')
 define(`confCW_FILE', `/etc/sendmail.cw')
 define(`confMIME_FORMAT_ERRORS', `True')
 define(`confTRY_NULL_MX_LIST', `False')

-define(`confSORT_QUEUE_BY_HOST', `False')
+define(`confQUEUE_SORT_ORDER', `Priority')

 define(`confBROKEN_SMTP_PEERS', `False')
 
 divert(0)dnl
 define(`confBROKEN_SMTP_PEERS', `False')
 
 divert(0)dnl

-VERSIONID(`@(#)cf.m4   8.11 (Berkeley) %G%')
+VERSIONID(`@(#)cf.m4   8.12 (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 b34ba7c..f429dcb 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        8.61 (Berkeley) %G%')
+VERSIONID(`@(#)proto.m4        8.62 (Berkeley) %G%')

 
 MAILER(local)dnl
 
 
 MAILER(local)dnl
 


@@ -318,7 +318,7 @@ ifdef(`confWORK_TIME_FACTOR',
 O BrokenSmtpPeers=confBROKEN_SMTP_PEERS
 
 # shall we sort the queue by hostname first?
 O BrokenSmtpPeers=confBROKEN_SMTP_PEERS
 
 # shall we sort the queue by hostname first?

-O SortQueueByHost=confSORT_QUEUE_BY_HOST
+O QueueSortOrder=confQUEUE_SORT_ORDER

 
 ###########################
 #   Message precedences   #
 
 ###########################
 #   Message precedences   #