Advertisement
magiza83

diff sendmail.cf

Mar 8th, 2013
23
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Bash 7.55 KB | None | 0 0
  1. --- sendmail.cf_myme1_NO        2013-03-08 10:02:52.230118004 +0100
  2. +++ sendmail.cf_mymepre_NO      2013-03-08 10:02:44.662256959 +0100
  3. @@ -37,17 +37,20 @@
  4.  
  5.  
  6.  
  7. +
  8. +
  9. +
  10.  V10/Berkeley
  11.  
  12.  
  13. -O LDAPDefaultSpec=-h "ldap.*******.com srv-ln-repli1.*******.com" -p 389 -b "ou=*****context,dc=org" -d "cn=orcladmin" -M simple -P /etc/mail/ldap
  14. +O LDAPDefaultSpec=-h "ldap.pre.*******.com srv-ln-repli1.*******.com" -p 389 -b "ou=pre_*****context,dc=org" -d "cn=orcladmin" -M simple -P /etc/mail/ldap
  15.  
  16.  
  17.  
  18.  Cwlocalhost
  19. -Fw@ldap:-h "ldap.*******.com srv-ln-repli1.*******.com" -p 389 -b "ou=local-host-names,ou=grupo1,ou=sendmail,ou=*****context,dc=org" -d "cn=orcladmin" -M simple -P /etc/mail/ldap -k (objectclass=account) -v uid
  20. +Fw@ldap:-h "ldap.pre.*******.com srv-ln-repli1.*******.com" -p 389 -b "ou=local-host-names,ou=grupo1,ou=sendmail,ou=pre_*****context,dc=org" -d "cn=orcladmin" -M simple -P /etc/mail/ldap -k (objectclass=account) -v uid
  21.  
  22. -Djsf2*****.*******.com
  23. +Djsf2pre*****.*******.com
  24.  
  25.  CP.
  26.  
  27. @@ -80,9 +83,11 @@
  28.  Kdequote dequote
  29.  
  30.  C{TrustAuthMech}LOGIN PLAIN GSSAPI KERBEROS_V4 DIGEST-MD5 CRAM-D5
  31. -C{M}sf2*****.*******.com
  32. +C{M}sf2pre*****.*******.com
  33. +C{M}localhost
  34. +C{M}localhost.localdomain
  35.  
  36. -DM*******.com
  37. +DMpre.*****.es
  38.  
  39.  DnMAILER-DAEMON
  40.  
  41. @@ -91,9 +96,9 @@
  42.  
  43.  Kvirtuser ldap:-1 -T<TMPF> -k (&(objectclass=mailRecipient)(mail=%0)) -v uid
  44.  
  45. -Kmailertable ldap:-T<TMPF> -h "ldap.*******.com srv-ln-repli1.*******.com" -p 389 -b "ou=mailertable,ou=grupo1,ou=sendmail,ou=*****context,dc=org" -d "cn=orcladmin" -M simple -P /etc/mail/ldap -1 -k (&(objectclass=account)(uid=%0)) -v o
  46. +Kmailertable ldap:-T<TMPF> -h "ldap.pre.*******.com srv-ln-repli1.*******.com" -p 389 -b "ou=mailertable,ou=grupo1,ou=sendmail,ou=pre_*****context,dc=org" -d "cn=orcladmin" -M simple -P /etc/mail/ldap -1 -k (&(objectclass=account)(uid=%0)) -v o
  47.  
  48. -Kaccess ldap -T<TMPF> -h "ldap.*******.com srv-ln-repli1.*******.com" -p 389 -b "ou=access,ou=grupo1,ou=sendmail,ou=*****context,dc=org" -d "cn=orcladmin" -M simple -P /etc/mail/ldap -1 -k (&(objectclass=account)(uid=%0)) -v o
  49. +Kaccess ldap -T<TMPF> -h "ldap.pre.*******.com srv-ln-repli1.*******.com" -p 389 -b "ou=access,ou=grupo1,ou=sendmail,ou=pre_*****context,dc=org" -d "cn=orcladmin" -M simple -P /etc/mail/ldap -1 -k (&(objectclass=account)(uid=%0)) -v o
  50.  
  51.  Kednsbl dns -R A -a. -T<TMP> -r2
  52.  
  53. @@ -211,6 +216,7 @@
  54.  
  55.  
  56.  
  57. +O ConnectionRateThrottle=100
  58.  
  59.  
  60.  
  61. @@ -225,7 +231,7 @@
  62.  
  63.  
  64.  
  65. -O SmtpGreetingMessage=SMTP1
  66. +O SmtpGreetingMessage=SMTP
  67.  
  68.  O UnixFromLine=From $g $d
  69.  
  70. @@ -241,8 +247,9 @@
  71.  O DeadLetterDrop=dead.letter
  72.  
  73.  
  74. -O MaxRecipientsPerMessage=300
  75. +O MaxRecipientsPerMessage=200
  76.  
  77. +O BadRcptThrottle=1
  78.  
  79.  
  80.  
  81. @@ -267,14 +274,14 @@
  82.  
  83.  
  84.  
  85. -O InputMailFilters=smtp-vilter
  86.  
  87. -O Milter.macros.connect=j, _, {daemon_name}, {if_name}, {if_addr}
  88. -O Milter.macros.helo={tls_version}, {cipher}, {cipher_bits}, {cert_subject}, {cert_issuer}
  89. -O Milter.macros.envfrom=i, {auth_type}, {auth_authen}, {auth_ssf}, {auth_author}, {mail_mailer}, {mail_host}, {mail_addr}
  90. -O Milter.macros.envrcpt={rcpt_mailer}, {rcpt_host}, {rcpt_addr}
  91. -O Milter.macros.eom={msg_id}
  92.  
  93. +O CACertPath=/etc/mail/certs
  94. +O CACertFile=/etc/mail/certs/cacert.pem
  95. +O ServerCertFile=/etc/mail/certs/cert.pem
  96. +O ServerKeyFile=/etc/mail/certs/key.pem
  97. +O ClientCertFile=/etc/mail/certs/cert.pem
  98. +O ClientKeyFile=/etc/mail/certs/key.pem
  99.  
  100.  
  101.  Qbounce, P=/u01/app/sendmail/mqueue/current/bounce,I=15m
  102. @@ -655,7 +662,9 @@
  103.  
  104.  
  105.  
  106. -
  107. +Scheck_relay
  108. +R$*             $: $>"RateControl" dummy
  109. +R$*             $: $>"ConnControl" dummy
  110.  
  111.  SLocal_check_relay
  112.  Scheckrelay
  113. @@ -682,6 +691,8 @@
  114.  R<$+> <$*>              $#error $: $1
  115.  
  116.  
  117. +
  118. +
  119.  R$*                     $: $&{client_addr}
  120.  R$-.$-.$-.$-            $: <?> $(ednsbl $4.$3.$2.$1.b.barracudacentral.org. $: OK $)
  121.  R<?>OK                  $: OKSOFAR
  122. @@ -695,16 +706,16 @@
  123.  R<?>$+  $#error $@ 5.7.1 $: "550 Mail from " $&{client_addr} " refused - see http://cbl.abuseat.org"
  124.  
  125.  R$*                     $: $&{client_addr}
  126. -R$-.$-.$-.$-            $: <?> $(ednsbl $4.$3.$2.$1.sbl.spamhaus.org. $: OK $)
  127. +R$-.$-.$-.$-            $: <?> $(ednsbl $4.$3.$2.$1.bl.spamcop.net. $: OK $)
  128.  R<?>OK                  $: OKSOFAR
  129.  R<?>$+<TMP>             $: TMPOK
  130. -R<?>$+  $#error $@ 5.7.1 $: "550 Mail from " $&{client_addr} " refused - see http://www.spamhaus.org/sbl/"
  131. +R<?>$+  $#error $@ 5.7.1 $: "550 Mail from " $&{client_addr} " refused - see http://spamcop.net/bl.shtml"
  132.  
  133.  R$*                     $: $&{client_addr}
  134. -R$-.$-.$-.$-            $: <?> $(ednsbl $4.$3.$2.$1.bl.spamcop.net. $: OK $)
  135. +R$-.$-.$-.$-            $: <?> $(ednsbl $4.$3.$2.$1.sbl.spamhaus.org. $: OK $)
  136.  R<?>OK                  $: OKSOFAR
  137.  R<?>$+<TMP>             $: TMPOK
  138. -R<?>$+  $#error $@ 5.7.1 $: "550 Mail from " $&{client_addr} " refused - see http://spamcop.net/bl.shtml"
  139. +R<?>$+  $#error $@ 5.7.1 $: "550 Mail from " $&{client_addr} " refused - see http://www.spamhaus.org/sbl/"
  140.  
  141.  
  142.  
  143. @@ -736,6 +747,8 @@
  144.                          $: < ? $&{client_name} > < $1 @ [127.0.0.1] >
  145.  R<@> < $* @ localhost.$m >
  146.                          $: < ? $&{client_name} > < $1 @ localhost.$m >
  147. +R<@> < $* @ localhost.localdomain >
  148. +                        $: < ? $&{client_name} > < $1 @ localhost.localdomain >
  149.  R<@> < $* @ localhost.UUCP >
  150.                          $: < ? $&{client_name} > < $1 @ localhost.UUCP >
  151.  R<@> $*                 $: $1                   no localhost as domain
  152. @@ -968,7 +981,7 @@
  153.  R<$+> <$*> <$- $-> <$*>         $@ <$1> <$5>
  154.  
  155.  
  156. -C{Src}E F D U
  157. +C{Src}E F D U A
  158.  SSearchList
  159.  R<$+> $| <$={Src}:$*> <$*>      $: <$1> $| <$4> $| $>$2 <$3> <?> <$1> <>
  160.  R<$+> $| <> $| <?> <>           $@ <?>
  161. @@ -1103,8 +1116,24 @@
  162.  R$* $| <?>$*    $@ no                           no authinfo available
  163.  R$* $| <$*> <>  $# $2
  164.  
  165. -
  166. -
  167. +SRateControl
  168. +R$*             $: <A:$&{client_addr}> <E:>
  169. +R$+             $: $>SearchList <! ClientRate> $| $1 <>
  170. +R<?>            $@ OK
  171. +R<$* <TMPF>>    $#error $@ 4.3.0 $: "451 Temporary system failure. Please try again later."
  172. +R<0>            $@ OK           no limit
  173. +R<$+>           $: <$1> $| $(arith l $@ $&{client_rate} $@ $1 $)
  174. +R<$+> $| FALSE  $#error $@ 4.3.2 $: 421 Connection rate limit exceeded.
  175. +
  176. +
  177. +SConnControl
  178. +R$*             $: <A:$&{client_addr}> <E:>
  179. +R$+             $: $>SearchList <! ClientConn> $| $1 <>
  180. +R<?>            $@ OK
  181. +R<$* <TMPF>>    $#error $@ 4.3.0 $: "451 Temporary system failure. Please try again later."
  182. +R<0>            $@ OK           no limit
  183. +R<$+>           $: <$1> $| $(arith l $@ $&{client_connections} $@ $1 $)
  184. +R<$+> $| FALSE  $#error $@ 4.3.2 $: 421 Too many open connections.
  185.  
  186.  
  187.  
  188. @@ -1132,7 +1161,21 @@
  189.  
  190.  
  191.  
  192. -Xsmtp-vilter, S=local:/u01/app/smtp-vilter/grupo1/run/smtp-vilter.sock, T=S:10s;R:120s
  193. +SLocal_greet_pause
  194. +Sgreet_pause
  195. +R$*                     $: <$1><?> $| $>"Local_greet_pause" $1
  196. +R<$*><?> $| $#$*        $#$2
  197. +R<$*><?> $| $*          $: $1
  198. +R$+ $| $+               $: $>D < $1 > <?> <! GreetPause> < $2 >
  199. +R   $| $+               $: $>A < $1 > <?> <! GreetPause> <>     empty client_name
  200. +R<?> <$+>               $: $>A < $1 > <?> <! GreetPause> <>     no: another lookup
  201. +R<?> <$*>               $# 1000
  202. +R<$* <TMPF>> <$*>       $@
  203. +R<$+> <$*>              $# $1
  204. +
  205. +
  206. +
  207. +
  208.  
  209.  
  210.  
  211. @@ -1161,6 +1204,9 @@
  212.  R$* < @ *LOCAL* > $*    $: $1 < @ $j . > $2
  213.  
  214.  SAddDomain
  215. +R$* < @ $* > $*         $@ $1 < @ $2 > $3       already fully qualified
  216. +
  217. +R$+                     $@ $1 < @ *LOCAL* >     add local qualification
  218.  
  219.  Mlocal,         P=/u01/app/dspam/grupo1/3.6/bin/dspam, F=lsDFMA5:/|@qPrnuX, S=EnvFromL/HdrFromL, R=EnvToL/HdrToL,
  220.                  T=DNS/RFC822/X-Unix,
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement