X-Git-Url: https://dehnerts.com/gitweb/?a=blobdiff_plain;f=master.cf;fp=master.cf;h=9a30e9adb20b05d154b74617ae5e019dab40f731;hb=86afbcb7ac76b8a0cbc993c993a58da3591b3a69;hp=139b297f2843d784b26d1a3e09f9d79af294ea30;hpb=bb916e6a42be882901b8240c9666bb26d5874dbf;p=sysconfig%2Fpostfix.git

diff --git a/master.cf b/master.cf
index 139b297..9a30e9a 100644
--- a/master.cf
+++ b/master.cf
@@ -19,7 +19,7 @@ submission inet  n       -       y       -       -       smtpd
     -o smtpd_sasl_auth_enable=yes
     -o smtpd_client_restrictions=permit_sasl_authenticated,reject
     -o milter_macro_daemon_name=ORIGINATING
-    -o smtpd_proxy_filter=127.0.0.1:10025
+    -o content_filter=smtp:127.0.0.1:10025
     -o smtpd_client_connection_count_limit=15
 pickup     fifo  n       -       y       60      1       pickup
 cleanup    unix  n       -       y       -       0       cleanup
@@ -35,6 +35,7 @@ flush      unix  n       -       y       1000?   0       flush
 proxymap  unix  -       -       n       -       -       proxymap
 proxywrite unix -       -       n       -       1       proxymap
 #smtp      inet  n       -       -       -       -       smtpd
+
 #
 # Before-filter SMTP server. Receive mail from the network and
 # pass it to the content filter on localhost port 10025.
@@ -48,7 +49,7 @@ smtp       unix  -       -       y       -       -       smtp
 # on localhost port 10026.
 #
 smtp       inet  n       -       y       -       5       smtpd
-    -o smtpd_proxy_filter=127.0.0.1:10025
+    -o content_filter=smtp:127.0.0.1:10025
     -o smtpd_client_connection_count_limit=15
 127.0.0.1:10026 inet n  -       n       -        -      smtpd
         -o smtpd_authorized_xforward_hosts=127.0.0.0/8
@@ -58,7 +59,7 @@ smtp       inet  n       -       y       -       5       smtpd
         -o smtpd_recipient_restrictions=permit_mynetworks,reject
         -o smtpd_data_restrictions=
         -o mynetworks=127.0.0.0/8
-        -o receive_override_options=no_unknown_recipient_checks
+        -o receive_override_options=no_unknown_recipient_checks,no_milters
 
 smtp-forward    unix  -  -   n       -       -       smtp -o smtp_bind_address=18.102.208.11
 smtp-local      unix  -  -   n       -       -       smtp -o smtp_bind_address=18.102.208.44