| 1 |
diff -up smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/RelayRequiresAuth.require_auth smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/RelayRequiresAuth |
| 2 |
diff -up smeserver-qpsmtpd-2.2.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/relayclients/80relayFromLocalNetwork.require_auth smeserver-qpsmtpd-2.2.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/relayclients/80relayFromLocalNetwork |
| 3 |
--- smeserver-qpsmtpd-2.2.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/relayclients/80relayFromLocalNetwork.require_auth 2005-08-19 15:31:01.000000000 -0600 |
| 4 |
+++ smeserver-qpsmtpd-2.2.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/relayclients/80relayFromLocalNetwork 2010-09-26 10:58:27.000000000 -0600 |
| 5 |
@@ -8,9 +8,13 @@ |
| 6 |
my $n = esmith::NetworksDB->open; |
| 7 |
foreach my $network ($n->get_all_by_prop(type => 'network')) |
| 8 |
{ |
| 9 |
- push(@prefixes, |
| 10 |
- esmith::util::computeAllLocalNetworkPrefixes( |
| 11 |
- $network->key, $network->prop('Mask'))); |
| 12 |
+ if ( (($qpsmtpd{'RelayRequiresAuth'} || 'enabled') eq 'disabled') or |
| 13 |
+ (($network->prop('RelayRequiresAuth') || 'enabled') eq 'disabled')) |
| 14 |
+ { |
| 15 |
+ push(@prefixes, |
| 16 |
+ esmith::util::computeAllLocalNetworkPrefixes( |
| 17 |
+ $network->key, $network->prop('Mask'))); |
| 18 |
+ } |
| 19 |
} |
| 20 |
|
| 21 |
foreach my $prefix ( @prefixes ) |
| 22 |
diff -up smeserver-qpsmtpd-2.2.0/root/etc/e-smith/templates/var/service/qpsmtpd/peers/local/RELAYCLIENT.require_auth smeserver-qpsmtpd-2.2.0/root/etc/e-smith/templates/var/service/qpsmtpd/peers/local/RELAYCLIENT |
| 23 |
--- smeserver-qpsmtpd-2.2.0/root/etc/e-smith/templates/var/service/qpsmtpd/peers/local/RELAYCLIENT.require_auth 2005-04-20 21:19:07.000000000 -0600 |
| 24 |
+++ smeserver-qpsmtpd-2.2.0/root/etc/e-smith/templates/var/service/qpsmtpd/peers/local/RELAYCLIENT 2010-09-26 10:57:10.000000000 -0600 |
| 25 |
@@ -1 +1 @@ |
| 26 |
-+RELAYCLIENT= |
| 27 |
++RELAYCLIENT{ $OUT = ($qpsmtpd{'RelayRequiresAuth'} || 'enabled') eq 'disabled' ? '=' : '' } |
| 28 |
diff -up smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/RelayRequiresAuth.require_auth smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/RelayRequiresAuth |
| 29 |
--- smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/RelayRequiresAuth.require_auth 2010-09-26 10:45:33.000000000 -0600 |
| 30 |
+++ smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/RelayRequiresAuth 2010-09-26 10:45:22.000000000 -0600 |
| 31 |
@@ -0,0 +1 @@ |
| 32 |
+enabled |
Parent Directory
| 
Revision Log
| 
Revision Graph
