lib-sieve: enotify plugin: mailto method: Make sure from header is se…

…t to a usable address and not (null).
dovecot · Oct 21, 2017 · 1210d33 · 1210d33
1 parent 8b5be61
commit 1210d33
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/lib-sieve/plugins/enotify/mailto/ntfy-mailto.c b/src/lib-sieve/plugins/enotify/mailto/ntfy-mailto.c
@@ -501,10 +501,13 @@ static int ntfy_mailto_send
 	}
 
 	/* Determine message from address */
-	if ( nact->from == NULL ) {
-		from = t_strdup_printf("<%s>", from_smtp);
-	} else {
+	if ( nact->from != NULL ) {
 		from = nact->from;
+	} else if ( from_smtp == NULL ) {
+		from = t_strdup_printf("<%s>",
+			sieve_get_postmaster_address(senv));
+	} else {
+		from = t_strdup_printf("<%s>", from_smtp);
 	}
 
 	/* Determine subject */