Making dovecot honor recipient_deliver - http://wiki.dovecot.org/LDA/Postfix

diff --git a/templates/master.cf.debian-etch.erb b/templates/master.cf.debian-etch.erb
index 4b39f4543cf045c27046a158093cb62f59d2a998..bc8ad645587b38ccaf66d7cb9596a1448a3a904a 100644 (file)
--- a/templates/master.cf.debian-etch.erb
+++ b/templates/master.cf.debian-etch.erb
@@ -96,7 +96,7 @@ amavis unix - - - - 2 smtp
 <% end %>
 <% if postfix_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 postfix_use_schleuder == 'yes' %>
 schleuder  unix  -       n       n       -       -       pipe

diff --git a/templates/master.cf.debian-lenny.erb b/templates/master.cf.debian-lenny.erb
index 11d0fa08d27717fc4467ee11c7031104cc49abdf..9783e08ad0817024a413c7937326cc4fce5ed273 100644 (file)
--- a/templates/master.cf.debian-lenny.erb
+++ b/templates/master.cf.debian-lenny.erb
@@ -102,7 +102,7 @@ amavis unix - - - - 2 smtp
 <% end %>
 <% if postfix_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 postfix_use_schleuder == 'yes' %>
 schleuder  unix  -       n       n       -       -       pipe

diff --git a/templates/master.cf.debian-squeeze.erb b/templates/master.cf.debian-squeeze.erb
index be86a08de7756a3eafb505934d2b6bab4c0b48f3..0d383b91a9a3547a023a0d3d78ac2b64b6450d1b 100644 (file)
--- a/templates/master.cf.debian-squeeze.erb
+++ b/templates/master.cf.debian-squeeze.erb
@@ -125,7 +125,7 @@ amavis unix - - - - 2 smtp
 <% end %>
 <% if postfix_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 postfix_use_schleuder == 'yes' %>
 schleuder  unix  -       n       n       -       -       pipe

diff --git a/templates/master.cf.debian-wheezy.erb b/templates/master.cf.debian-wheezy.erb
index c71fbeadf63de97d3b7e54c433ca02ed997158b4..b2885ab5f7e3af9c07a87b5bce70467408671c67 100644 (file)
--- a/templates/master.cf.debian-wheezy.erb
+++ b/templates/master.cf.debian-wheezy.erb
@@ -133,7 +133,7 @@ amavis unix - - - - 2 smtp
 <% end %>
 <% if postfix_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 postfix_use_schleuder == 'yes' %>
 schleuder  unix  -       n       n       -       -       pipe