Debian sid's master.cf: merge custom dovecot/deliver options from the Jessie template.

These changes were introduced in other templates in commit 6a44990, let's
propagate them to the sid template.

diff --git a/templates/master.cf.debian-sid.erb b/templates/master.cf.debian-sid.erb
index c93fcfb3569c0f2cec032aa9d19ce8767ad44477..943581df553f5039f32f751a8a0f7e115b1b42b2 100644 (file)
--- a/templates/master.cf.debian-sid.erb
+++ b/templates/master.cf.debian-sid.erb
@@ -148,7 +148,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 -d ${recipient}
+  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -n -m ${extension}
 <% end %>
 <% if use_schleuder == 'yes' %>
 schleuder  unix  -       n       n       -       -       pipe