dovecot-2.0-pigeonhole: Merged concurrent changes.

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.0-pigeonhole/rev/b4f0fe1f54c3
changeset: 1535:b4f0fe1f54c3
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Sat Sep 17 09:04:55 2011 +0200
description:
Merged concurrent changes.

diffstat:

 .hgsigs                                  |   1 +
 src/plugins/lda-sieve/lda-sieve-plugin.c |  21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diffs (60 lines):

diff -r 78654f55c9a0 -r b4f0fe1f54c3 .hgsigs
--- a/.hgsigs	Fri Sep 16 17:57:56 2011 +0200
+++ b/.hgsigs	Sat Sep 17 09:04:55 2011 +0200
@@ -1,3 +1,4 @@
 d768f911252d6b798400a382b41a98d2b2cde770 0 iQEcBAABAgAGBQJMn9w7AAoJEATWKx49+7T0LwwH/iZXNVppEZRfPOZPvkg+pSw4twuqmmV7h8yELaHKxyyqcKjSO6/A7Mkxf6FVZ6LerJ59h+iqib42TcGGDRTETH8OfN/jbZ0HX5F6jYAYvbs7RzjrO6FAthT3BnWvGLGPBuPrGCSS3FSF5AS8qhSOgpSlKheV/K7S4DeU5+4UNv49+icHZIGFYLjahb+rbL5aNqLx8NewVeKU77Fe9Jk0NRNO9p9g+JQEswEUQONhKta1hovZcOqKtZ45Xfq+/KvBIsITT/sSfRe+z8Mn7DhXYxFajRnVf2pBBQTrBRoy3Z4PtU1BvEUbUfGohLnnn3RQP092dfqwkovevT82lOLHtlc=
 df8b38da248cbd6d83e9bd476ec2c92716ea193c 0 iQEcBAABAgAGBQJM/WxCAAoJEATWKx49+7T0blMH/0Cdwr16xm5I9koqhVu3KKToePJqVIG723rdLjyBeTgr/0T5UTXzkPT8OHnzJ/SRcI8AiVJiLtTEFYAKsegJxFo3TEztlZ+cO2k8JT2HnL1w8RYeagihMyDdBPD+dpv+US+0eWHGmbmLvxi1UlfyqGiPZrKQmCuRtpzJTwzkGKOGdg+ln+kifvwzNhVGNC1URdfYOkO/vZL8W47OREtF4U2zV6l/KM6m4fnrUp7YdOBdYFwen6Yux6NDQzqXkUoJQ0xNsqp4HYGvSDCzRBI6tba++mGQ5tAvYyJuqwRKToMH/fk5al4igraZI8MH0tSZplHGxUAhsq8JO1/v83kudbM=
 3ab2a125e1e2d478382c07853e99a5973d06afd6 0 iQEcBAABAgAGBQJNp1ztAAoJEATWKx49+7T0CJcH/24Txa1ynS5hBUhOuWTpUTGtm+9cMpWoQ33exiMR0pm8ycxsUQcKfRtO/cRHQX1CW3PqQs3DGZ31QdEEg0CyX8OsBbP/dwdEcnLRYF5BsJMyfy+Qnbhxn+wV0k9s9AUgZTdvPKrg1hFa6XS+6SE3N33AA4Y2eYYZGzFuDiSoN7fGx7PATCrobMsmp5WtBiKoy4WyP2SwDv/VgKy0PQTF+6+0t0MMCBSurLzpHk8dDuBonWIBgbJRM/sk9f+cYbU/ESRMcryZbbau9EwMQIQJfprGH6WP/gwysF0pu47zQERMuVt3fFzXUzrfxVpMOI7EkLgnF+Tes0vA7dKh1x+vvec=
+0d071eaa6d5e2a9f524c94ddf1686f1b3091f604 0 iQEcBAABAgAGBQJOb8BjAAoJEATWKx49+7T0cAcH/3coc1MhQj8zUdC+NB3N8eUkQ3AF3QQgSfP9uXs9BhvPw70Ts9MLJiO54RhhYf/k9VxptzWk7MPJF47v4NEEKHkjDDMXtPbVOxHjNa2Ny8EAuWe4dv5X0faAlH4Ks58enDchCmunX1DgQtC1f+gHqVtvTpGAROFPqkBe5RGOJ0jQd+2hTTlf1BpLl44fiBdYd6350haX0KjDGNthX9ETVc3bnbdIiXSy7DPnn0ELhvTbgkl4Zu1tA778IJy/JjsCPb2YueX7LsksvxcSZHqv80Zd3JJhs5a3ZeHijN6twpe7VZD9FO+jPOKA1rr/HYwCv0KweKgmwVHCdaT+Mq4OLPc=
diff -r 78654f55c9a0 -r b4f0fe1f54c3 src/plugins/lda-sieve/lda-sieve-plugin.c
--- a/src/plugins/lda-sieve/lda-sieve-plugin.c	Fri Sep 16 17:57:56 2011 +0200
+++ b/src/plugins/lda-sieve/lda-sieve-plugin.c	Sat Sep 17 09:04:55 2011 +0200
@@ -42,13 +42,13 @@
 static const char *lda_sieve_get_homedir
 (void *context)
 {
-	struct mail_user *mail_user = (struct mail_user *) context;
+	struct mail_deliver_context *mdctx = (struct mail_deliver_context *)context;
 	const char *home = NULL;
 
-	if ( mail_user == NULL )
+	if ( mdctx == NULL || mdctx->dest_user == NULL )
 		return NULL;
 
-	if ( mail_user_get_home(mail_user, &home) <= 0 )
+	if ( mail_user_get_home(mdctx->dest_user, &home) <= 0 )
 		return NULL;
 
 	return home;
@@ -57,12 +57,19 @@
 static const char *lda_sieve_get_setting
 (void *context, const char *identifier)
 {
-	struct mail_user *mail_user = (struct mail_user *) context;
+	struct mail_deliver_context *mdctx = (struct mail_deliver_context *)context;
+	const char *value = NULL;
 
-	if ( mail_user == NULL )
+	if ( mdctx == NULL )
 		return NULL;
 
-	return mail_user_plugin_getenv(mail_user, identifier);	
+	if ( mdctx->dest_user == NULL ||
+		(value=mail_user_plugin_getenv(mdctx->dest_user, identifier)) == NULL ) {
+		if ( strcmp(identifier, "recipient_delimiter") == 0 )
+			value = mdctx->set->recipient_delimiter;
+	}
+
+	return value;
 }
 
 static const struct sieve_environment lda_sieve_env = {
@@ -665,7 +672,7 @@
 
 	/* Initialize Sieve engine */
 
-	svinst = sieve_init(&lda_sieve_env, mdctx->dest_user, debug);
+	svinst = sieve_init(&lda_sieve_env, mdctx, debug);
 
 	/* Initialize master error handler */