smeserver-wbl/contribs8/smeserver-wbl-0.1.0-ReqRes.patch

diff -up smeserver-wbl-0.1.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/11whitelist_soft.ReqRes smeserver-wbl-0.1.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/11whitelist_soft
--- smeserver-wbl-0.1.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/11whitelist_soft.ReqRes   2008-10-13 16:09:56.000000000 -0400
+++ smeserver-wbl-0.1.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/11whitelist_soft  2013-07-15 19:59:39.000000000 -0400
@@ -1,3 +1,4 @@
 {
-    return (whitelist_soft) if ($qpsmtpd{RequireResolvableFromHost} eq 'yes');
+    return (whitelist_soft) ;
+        # for SME 8 RequireResolvableFromHost key is obsolete and always on
 }
diff -up smeserver-wbl-0.1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/wbl.pm.ReqRes smeserver-wbl-0.1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/wbl.pm
--- smeserver-wbl-0.1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/wbl.pm.ReqRes      2008-10-13 16:09:56.000000000 -0400
+++ smeserver-wbl-0.1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/wbl.pm     2013-07-15 20:03:59.000000000 -0400
@@ -73,7 +73,9 @@ sub get_badmailfrom
 
 sub get_rrfh
 {
-    return ($db->get_prop('qpsmtpd', 'RequireResolvableFromHost') || 'no');
+    return 'yes';
+    # always yes for SME8
+    #return ($db->get_prop('qpsmtpd', 'RequireResolvableFromHost') || 'no');
 }
 
 sub get_whitelisthosts
@@ -221,7 +223,8 @@ sub create_modify_white
     my $q = $fm->{'cgi'};
 
     my $rrfh = $q->param("rrfh");
-    $db->set_prop('qpsmtpd', 'RequireResolvableFromHost', "$rrfh");
+    # SME8 no longer use this key, always on
+    #$db->set_prop('qpsmtpd', 'RequireResolvableFromHost', "$rrfh");
 
     # qpsmtpd whitelisthosts
     my %list = $wdb->get('whitelisthosts')->props;
1	diff -up smeserver-wbl-0.1.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/11whitelist_soft.ReqRes smeserver-wbl-0.1.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/11whitelist_soft
2	--- smeserver-wbl-0.1.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/11whitelist_soft.ReqRes 2008-10-13 16:09:56.000000000 -0400
3	+++ smeserver-wbl-0.1.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/11whitelist_soft 2013-07-15 19:59:39.000000000 -0400
4	@@ -1,3 +1,4 @@
5	{
6	- return (whitelist_soft) if ($qpsmtpd{RequireResolvableFromHost} eq 'yes');
7	+ return (whitelist_soft) ;
8	+ # for SME 8 RequireResolvableFromHost key is obsolete and always on
9	}
10	diff -up smeserver-wbl-0.1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/wbl.pm.ReqRes smeserver-wbl-0.1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/wbl.pm
11	--- smeserver-wbl-0.1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/wbl.pm.ReqRes 2008-10-13 16:09:56.000000000 -0400
12	+++ smeserver-wbl-0.1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/wbl.pm 2013-07-15 20:03:59.000000000 -0400
13	@@ -73,7 +73,9 @@ sub get_badmailfrom
14
15	sub get_rrfh
16	{
17	- return ($db->get_prop('qpsmtpd', 'RequireResolvableFromHost') \|\| 'no');
18	+ return 'yes';
19	+ # always yes for SME8
20	+ #return ($db->get_prop('qpsmtpd', 'RequireResolvableFromHost') \|\| 'no');
21	}
22
23	sub get_whitelisthosts
24	@@ -221,7 +223,8 @@ sub create_modify_white
25	my $q = $fm->{'cgi'};
26
27	my $rrfh = $q->param("rrfh");
28	- $db->set_prop('qpsmtpd', 'RequireResolvableFromHost', "$rrfh");
29	+ # SME8 no longer use this key, always on
30	+ #$db->set_prop('qpsmtpd', 'RequireResolvableFromHost', "$rrfh");
31
32	# qpsmtpd whitelisthosts
33	my %list = $wdb->get('whitelisthosts')->props;