master.cf: on Debian distros that ship dovecot 2.x, don't pass obsolete -n, but inste...

diff --git a/templates/master.cf.debian-8.erb b/templates/master.cf.debian-8.erb
index 7b653fb395b4eb16c56a05ea90f433379cea6141..0c5c30cb304dfca9b735981960547e5572571c4a 100644 (file)
--- a/templates/master.cf.debian-8.erb
+++ b/templates/master.cf.debian-8.erb
@@ -135,7 +135,7 @@ amavis unix - - - - 2 smtp
 <% end %>
 <% if @use_dovecot_lda == 'yes' %>
 dovecot   unix  -       n       n       -       -       pipe
-  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -n -m ${extension}
+  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -m ${extension} -a "${recipient}"
 <% end %>
 <% if @use_schleuder == 'yes' %>
 schleuder  unix  -       n       n       -       -       pipe

diff --git a/templates/master.cf.debian-sid.erb b/templates/master.cf.debian-sid.erb
index 7b653fb395b4eb16c56a05ea90f433379cea6141..0c5c30cb304dfca9b735981960547e5572571c4a 100644 (file)
--- a/templates/master.cf.debian-sid.erb
+++ b/templates/master.cf.debian-sid.erb
@@ -135,7 +135,7 @@ amavis unix - - - - 2 smtp
 <% end %>
 <% if @use_dovecot_lda == 'yes' %>
 dovecot   unix  -       n       n       -       -       pipe
-  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -n -m ${extension}
+  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -m ${extension} -a "${recipient}"
 <% end %>
 <% if @use_schleuder == 'yes' %>
 schleuder  unix  -       n       n       -       -       pipe