diff --git a/src/lib-sieve/plugins/enotify/cmd-notify.c b/src/lib-sieve/plugins/enotify/cmd-notify.c
index 7f5a647139ee7c57dbb244f211592c21c263335e..89ac8c6b14d3002eb8d160e12e0dd248400c061e 100644
--- a/src/lib-sieve/plugins/enotify/cmd-notify.c
+++ b/src/lib-sieve/plugins/enotify/cmd-notify.c
@@ -464,24 +464,25 @@ static int cmd_notify_operation_execute
(renv, source_line, str_c(method_uri),
message == NULL ? NULL : str_c(message),
from == NULL ? NULL : str_c(from),
- &method_context)) == NULL ){
- return SIEVE_EXEC_FAILURE;
- }
-
- /* Add notify action to the result */
-
- pool = sieve_result_pool(renv->result);
- act = p_new(pool, struct sieve_enotify_context, 1);
- act->method = method;
- act->method_context = method_context;
- act->importance = importance;
- if ( message != NULL )
- act->message = p_strdup(pool, str_c(message));
- if ( from != NULL )
- act->from = p_strdup(pool, str_c(from));
+ &method_context)) != NULL ) {
+ /* Add notify action to the result */
+
+ pool = sieve_result_pool(renv->result);
+ act = p_new(pool, struct sieve_enotify_context, 1);
+ act->method = method;
+ act->method_context = method_context;
+ act->importance = importance;
+ if ( message != NULL )
+ act->message = p_strdup(pool, str_c(message));
+ if ( from != NULL )
+ act->from = p_strdup(pool, str_c(from));
- return ( sieve_result_add_action
- (renv, &act_notify, slist, source_line, (void *) act, 0) >= 0 );
+ return ( sieve_result_add_action
+ (renv, &act_notify, slist, source_line, (void *) act, 0) >= 0 );
+ }
+
+ /* Erroneous notify action is no reason to kill the script */
+ return SIEVE_EXEC_OK;
}
/*
@@ -524,7 +525,13 @@ static bool act_notify_commit
const struct sieve_action_exec_env *aenv, void *tr_context,
bool *keep ATTR_UNUSED)
{
- return FALSE;
+ const struct sieve_enotify_context *nctx =
+ (const struct sieve_enotify_context *) tr_context;
+
+ if ( nctx->method->action_execute != NULL )
+ return nctx->method->action_execute(aenv, nctx);
+
+ return TRUE;
}
diff --git a/src/lib-sieve/plugins/enotify/ntfy-mailto.c b/src/lib-sieve/plugins/enotify/ntfy-mailto.c
index 33edca9f3af701d918ed0579bbd04799ed3ad8b9..927b116d01f2681ccf55d2ccbf87c201426b7498 100644
--- a/src/lib-sieve/plugins/enotify/ntfy-mailto.c
+++ b/src/lib-sieve/plugins/enotify/ntfy-mailto.c
@@ -425,64 +425,76 @@ static bool ntfy_mailto_action_execute
{
const struct sieve_message_data *msgdata = aenv->msgdata;
const struct sieve_script_env *senv = aenv->scriptenv;
+ struct ntfy_mailto_context *mtctx =
+ (struct ntfy_mailto_context *) nctx->method_context;
+ const char *const *recipients;
void *smtp_handle;
+ unsigned int count, i;
FILE *f;
const char *outmsgid;
- const char *recipient = "BOGUS";
-
+
/* Just to be sure */
if ( senv->smtp_open == NULL || senv->smtp_close == NULL ) {
sieve_result_warning(aenv,
"notify mailto method has no means to send mail.");
return FALSE;
}
+
+ recipients = array_get(&mtctx->recipients, &count);
+ for ( i = 0; i < count; i++ ) {
+ smtp_handle = senv->smtp_open(recipients[i], NULL, &f);
+ outmsgid = sieve_get_new_message_id(senv);
- smtp_handle = senv->smtp_open(msgdata->return_path, NULL, &f);
- outmsgid = sieve_get_new_message_id(senv);
-
- fprintf(f, "Message-ID: %s\r\n", outmsgid);
- fprintf(f, "Date: %s\r\n", message_date_create(ioloop_time));
- fprintf(f, "X-Sieve: %s\r\n", SIEVE_IMPLEMENTATION);
+ fprintf(f, "Message-ID: %s\r\n", outmsgid);
+ fprintf(f, "Date: %s\r\n", message_date_create(ioloop_time));
+ fprintf(f, "X-Sieve: %s\r\n", SIEVE_IMPLEMENTATION);
- switch ( nctx->importance ) {
- case 1:
- fprintf(f, "X-Priority: 1 (Highest)\r\n");
- fprintf(f, "Importance: High\r\n");
- break;
- case 3:
- fprintf(f, "X-Priority: 5 (Lowest)\r\n");
- fprintf(f, "Importance: Low\r\n");
- break;
- case 2:
- default:
- fprintf(f, "X-Priority: 3 (Normal)\r\n");
- fprintf(f, "Importance: Normal\r\n");
- break;
- }
-
- fprintf(f, "From: Postmaster <%s>\r\n", senv->postmaster_address);
- fprintf(f, "To: <%s>\r\n", recipient);
- fprintf(f, "Subject: [SIEVE] New mail notification\r\n");
- fprintf(f, "Auto-Submitted: auto-generated (notify)\r\n");
- fprintf(f, "Precedence: bulk\r\n");
+ switch ( nctx->importance ) {
+ case 1:
+ fprintf(f, "X-Priority: 1 (Highest)\r\n");
+ fprintf(f, "Importance: High\r\n");
+ break;
+ case 3:
+ fprintf(f, "X-Priority: 5 (Lowest)\r\n");
+ fprintf(f, "Importance: Low\r\n");
+ break;
+ case 2:
+ default:
+ fprintf(f, "X-Priority: 3 (Normal)\r\n");
+ fprintf(f, "Importance: Normal\r\n");
+ break;
+ }
+
+ fprintf(f, "From: Postmaster <%s>\r\n", senv->postmaster_address);
+ fprintf(f, "To: <%s>\r\n", recipients[i]);
+ fprintf(f, "Subject: [SIEVE] New mail notification\r\n");
+ fprintf(f, "Auto-Submitted: auto-generated (notify)\r\n");
+ fprintf(f, "Precedence: bulk\r\n");
- if (_contains_8bit(nctx->message)) {
- fprintf(f, "MIME-Version: 1.0\r\n");
- fprintf(f, "Content-Type: text/plain; charset=UTF-8\r\n");
- fprintf(f, "Content-Transfer-Encoding: 8bit\r\n");
- }
- fprintf(f, "\r\n");
- fprintf(f, "%s\r\n", nctx->message);
+ if ( nctx->message != NULL ) {
+ if (_contains_8bit(nctx->message)) {
+ fprintf(f, "MIME-Version: 1.0\r\n");
+ fprintf(f, "Content-Type: text/plain; charset=UTF-8\r\n");
+ fprintf(f, "Content-Transfer-Encoding: 8bit\r\n");
+ }
+ fprintf(f, "\r\n");
+ fprintf(f, "%s\r\n", nctx->message);
+ } else {
+ fprintf(f, "\r\n");
+ fprintf(f, "Notification of new message.\r\n");
+ }
- if ( senv->smtp_close(smtp_handle) ) {
- sieve_result_log(aenv,
- "sent mail notification to <%s>", str_sanitize(recipient, 80));
- } else {
- sieve_result_error(aenv,
- "failed to send mail notification to <%s> "
- "(refer to system log for more information)",
- str_sanitize(recipient, 80));
+ if ( senv->smtp_close(smtp_handle) ) {
+ sieve_result_log(aenv,
+ "sent mail notification to <%s>", str_sanitize(recipients[i], 80));
+ } else {
+ sieve_result_error(aenv,
+ "failed to send mail notification to <%s> "
+ "(refer to system log for more information)",
+ str_sanitize(recipients[i], 80));
+ }
}
return TRUE;
}
+