Fix #3496 Fix issue with Sieve and SMTP relay (#3581)

install/common/dovecot/sieve/90-sieve.conf

@@ -205,4 +205,7 @@ plugin {
   # Enables showing byte code addresses in the trace output, rather than only
   # the source line numbers.
   #sieve_trace_addresses = no
-}
+
+  # This setting determines whether vacation messages are sent with the SMTP MAIL FROM envelope address set to the recipient address of the Sieve script owner.
+  sieve_vacation_send_from_recipient = yes
+}

install/upgrade/versions/1.8.0.sh

@@ -25,7 +25,13 @@ upgrade_config_set_value 'UPGRADE_UPDATE_FILEMANAGER_CONFIG' 'false'
 
 if [ "$IMAP_SYSTEM" = "dovecot" ]; then
 	if ! grep -qw "^extra_groups = mail$" /etc/dovecot/conf.d/10-master.conf 2> /dev/null; then
-		sed -i "s/^service auth {/service auth {\n  extra_groups = mail\n/g" /etc/dovecot/conf.d/10-master.conf
+		sed -i "s/^service auth {/service auth {\n  extra_groups = mail/g" /etc/dovecot/conf.d/10-master.conf
+	fi
+
+	if [ -f /etc/dovecot/conf.d/90-sieve.conf ]; then
+		if ! grep -qw "^sieve_vacation_send_from_recipient$" /etc/dovecot/conf.d/90-sieve.conf 2> /dev/null; then
+			sed -i "s/^}/  # This setting determines whether vacation messages are sent with the SMTP MAIL FROM envelope address set to the recipient address of the Sieve script owner.\n  sieve_vacation_send_from_recipient = yes\n}/g" /etc/dovecot/conf.d/90-sieve.conf
+		fi
 	fi
 fi