e-smith-email/sme10/e-smith-email-5.6.0-qpsmtpd_in_masq_templates.patch

diff -Nur e-smith-email-5.6.0/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90adjustSMTPProxy e-smith-email-5.6.0_bz9561/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90adjustSMTPProxy
--- e-smith-email-5.6.0/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90adjustSMTPProxy       2013-02-06 22:56:01.000000000 +0100
+++ e-smith-email-5.6.0_bz9561/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90adjustSMTPProxy        2016-06-07 08:54:53.116780952 +0200
@@ -14,12 +14,12 @@
 
     $OUT .= "    /sbin/iptables --flush SMTPProxy\n";
 
-    if (${smtpd}{'Proxy'} eq 'transparent')
+    if (${qpsmtpd}{'Proxy'} eq 'transparent')
     {
        $OUT .= "    /sbin/iptables --table nat --replace SMTPProxy $rule\\\n";
        $OUT .= "\t-p TCP -j DNAT --to $LocalIP:25\n";
     }
-    elsif (${smtpd}{'Proxy'} eq 'blocked')
+    elsif (${qpsmtpd}{'Proxy'} eq 'blocked')
     {
        # Replace it with nothing, but keep the rule entry as a placeholder
        # for each re-enabling.
1	diff -Nur e-smith-email-5.6.0/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90adjustSMTPProxy e-smith-email-5.6.0_bz9561/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90adjustSMTPProxy
2	--- e-smith-email-5.6.0/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90adjustSMTPProxy 2013-02-06 22:56:01.000000000 +0100
3	+++ e-smith-email-5.6.0_bz9561/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90adjustSMTPProxy 2016-06-07 08:54:53.116780952 +0200
4	@@ -14,12 +14,12 @@
5
6	$OUT .= " /sbin/iptables --flush SMTPProxy\n";
7
8	- if (${smtpd}{'Proxy'} eq 'transparent')
9	+ if (${qpsmtpd}{'Proxy'} eq 'transparent')
10	{
11	$OUT .= " /sbin/iptables --table nat --replace SMTPProxy $rule\\\n";
12	$OUT .= "\t-p TCP -j DNAT --to $LocalIP:25\n";
13	}
14	- elsif (${smtpd}{'Proxy'} eq 'blocked')
15	+ elsif (${qpsmtpd}{'Proxy'} eq 'blocked')
16	{
17	# Replace it with nothing, but keep the rule entry as a placeholder
18	# for each re-enabling.