Update

git-svn-id: file:///svnroot/gsc/trunk@220 d2de0444-eb31-0410-8365-af798a554d48

1 files changed, 4 insertions, 44 deletions

diff --git a/mc/trurl.mc b/mc/trurl.mc
index 2f60cc0..8ed304d 100644
--- a/mc/trurl.mc
+++ b/mc/trurl.mc
@@ -12,50 +12,10 @@ HOrganization: GNU.ORG.UA
 DUtrurl
 Cwtrurl 
 
-dnl * To eliminate 8->7 bit base64 enconding
-define(`SMTP_MAILER_FLAGS',`8')
-define(`ALIAS_FILE', `/etc/mail/aliases')
-
-dnl * Do not reveal my version number
-define(`confRECEIVED_HEADER',`$?sfrom $s $.$?_($?s$|from $.$_) $.
-        by $j$?r with $r$. id $i$?u
-        for $u$.; $b')
-dnl * Also, disable HELP,VRFY,EXPN
-define(`HELP_FILE',`none')
-define(`confSMTP_LOGIN_MSG',`$j server; $b')
-define(`confPRIVACY_FLAGS',`authwarnings,novrfy,noexpn,noetrn,needmailhelo')
-
-define(`confMAX_MESSAGE_SIZE',`5242880')
-define(`confMESSAGE_TIMEOUT',`7d/3d')
-define(`confTO_INITIAL',  `5m')
-define(`confTO_IDENT',     `25s')
-define(`confTO_HELO',     `5m')
-define(`confTO_MAIL',     `15m')
-define(`confTO_RCPT',     `60m')
-define(`confTO_DATAINIT', `5m')
-define(`confTO_DATABLOCK',`30m')
-define(`confTO_DATAFINAL',`40m')
-define(`confTO_RSET',     `5m')
-define(`confTO_QUIT',     `2m')
-define(`confTO_MISC',     `2m')
-define(`confTO_COMMAND',  `30m')
-define(`confREFUSE_LA',`16')
-define(`confQUEUE_LA',`25')
-define(`confMAX_DAEMON_CHILDREN',`256')
-define(`confCONNECTION_RATE_THROTTLE',`128')
-define(`confCHECK_ALIASES',`False')
-define(`confCW_FILE', `-o /etc/mail/sendmail.cw')
-define(`confFORWARD_PATH', `$z/.forward:$z/.forward.$w')
-define(`confTRY_NULL_MX_LIST')
-define(`confDEAD_LETTER_DROP', `/var/spool/mail/dead.letter')
-define(`confFALLBACK_MX',`relay1.farlep.net')
-
-DAEMON_OPTIONS(`Name=MTA,Addr=0.0.0.0')
-FEATURE(`no_default_msa')
-DAEMON_OPTIONS(`Port=587,Addr=127.0.0.1, Name=MSA, M=E')
-
-define(`STATUS_FILE', `/etc/mail/sendmail.st')
+dnl * Include common defaults
+include(common.mc)
 
+dnl * Features
 FEATURE(use_cw_file)
 FEATURE(redirect)
 FEATURE(always_add_domain)
@@ -79,6 +39,6 @@ define(`LOCAL_MAILER_ARGS', `mail.local -xl -S %h/.filter.sv $u')
 MAILER(local)
 MAILER(smtp)
 
-dnl * Identification string for mail.local/Sieve log messages.ma
+dnl * Identification string for mail.local/Sieve log messages.
 LOCAL_CONFIG
 HX-Mailutils-Message-Id: $i$?u