You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by do...@apache.org on 2007/04/12 03:28:36 UTC
svn commit: r527740 - in /spamassassin/trunk: lib/Mail/SpamAssassin/
lib/Mail/SpamAssassin/Plugin/ t/
Author: dos
Date: Wed Apr 11 18:28:35 2007
New Revision: 527740
URL: http://svn.apache.org/viewvc?view=rev&rev=527740
Log:
bug 5410: config options that cause DNS lookups should be privileged
(and timeouts should require admin privs)
The following config options (all offered by plugins) can now only be used in
user_pref files (or equivalent) if allow_user_rules is enabled:
MIMEHeader.pm: setting => 'mimeheader',
ReplaceTags.pm: setting => 'replace_tag',
ReplaceTags.pm: setting => 'replace_pre',
ReplaceTags.pm: setting => 'replace_inter',
ReplaceTags.pm: setting => 'replace_post',
ReplaceTags.pm: setting => 'replace_rules',
ReplaceTags.pm: setting => 'replace_start',
ReplaceTags.pm: setting => 'replace_end',
URIDetail.pm: setting => 'uri_detail',
URIDNSBL.pm: setting => 'uridnsbl',
URIDNSBL.pm: setting => 'urirhsbl',
URIDNSBL.pm: setting => 'urirhssub',
The following config options (all offered by plugins) can now only be used in
site config files:
ASN.pm: setting => 'asn_lookup',
DCC.pm: setting => 'dcc_timeout',
DKIM.pm: setting => 'dkim_timeout',
DomainKeys.pm: setting => 'domainkeys_timeout',
Pyzor.pm: setting => 'pyzor_timeout',
Razor2.pm: setting => 'razor_timeout',
Razor2.pm: setting => 'razor_config',
SPF.pm: setting => 'spf_timeout',
URIDNSBL.pm: setting => 'uridnsbl_timeout',
URIDNSBL.pm: setting => 'uridnsbl_max_domains',
The following config option can now only be used in site config files:
Conf.pm: setting => 'rbl_timeout',
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ASN.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DomainKeys.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDetail.pm
spamassassin/trunk/t/config.dist
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?view=diff&rev=527740&r1=527739&r2=527740
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Wed Apr 11 18:28:35 2007
@@ -1185,34 +1185,6 @@
type => $CONF_TYPE_BOOL
});
-=item rbl_timeout n (default: 15)
-
-All DNS queries are made at the beginning of a check and we try to read the
-results at the end. This value specifies the maximum period of time to wait
-for an DNS query. If most of the DNS queries have succeeded for a particular
-message, then SpamAssassin will not wait for the full period to avoid wasting
-time on unresponsive server(s). For the default 15 second timeout, here is a
-chart of queries remaining versus the effective timeout in seconds:
-
- queries left 100% 90% 80% 70% 60% 50% 40% 30% 20% 10% 0%
- timeout 15 15 14 14 13 11 10 8 5 3 0
-
-In addition, whenever the effective timeout is lowered due to additional query
-results returning, the remaining queries are always given at least one more
-second before timing out, but the wait time will never exceed rbl_timeout.
-
-For example, if 20 queries are made at the beginning of a message check and 16
-queries have returned (leaving 20%), the remaining 4 queries must finish
-within 5 seconds of the beginning of the check or they will be timed out.
-
-=cut
-
- push (@cmds, {
- setting => 'rbl_timeout',
- default => 15,
- type => $CONF_TYPE_NUMERIC
- });
-
=item dns_available { yes | test[: name1 name2...] | no } (default: test)
By default, SpamAssassin will query some default hosts on the internet to
@@ -2433,6 +2405,35 @@
if ($value !~ /^(\S+)\s+(ok|fail)\s+(.*)$/) { return $INVALID_VALUE; }
$self->{parser}->add_regression_test($1, $2, $3);
}
+ });
+
+=item rbl_timeout n (default: 15)
+
+All DNS queries are made at the beginning of a check and we try to read the
+results at the end. This value specifies the maximum period of time to wait
+for an DNS query. If most of the DNS queries have succeeded for a particular
+message, then SpamAssassin will not wait for the full period to avoid wasting
+time on unresponsive server(s). For the default 15 second timeout, here is a
+chart of queries remaining versus the effective timeout in seconds:
+
+ queries left 100% 90% 80% 70% 60% 50% 40% 30% 20% 10% 0%
+ timeout 15 15 14 14 13 11 10 8 5 3 0
+
+In addition, whenever the effective timeout is lowered due to additional query
+results returning, the remaining queries are always given at least one more
+second before timing out, but the wait time will never exceed rbl_timeout.
+
+For example, if 20 queries are made at the beginning of a message check and 16
+queries have returned (leaving 20%), the remaining 4 queries must finish
+within 5 seconds of the beginning of the check or they will be timed out.
+
+=cut
+
+ push (@cmds, {
+ setting => 'rbl_timeout',
+ is_admin => 1,
+ default => 15,
+ type => $CONF_TYPE_NUMERIC
});
=item util_rb_tld tld1 tld2 ...
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ASN.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ASN.pm?view=diff&rev=527740&r1=527739&r2=527740
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ASN.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ASN.pm Wed Apr 11 18:28:35 2007
@@ -110,7 +110,7 @@
my ($self, $conf) = @_;
my @cmds = ();
-=head1 USER SETTINGS
+=head1 ADMINISTRATOR SETTINGS
=over 4
@@ -146,6 +146,7 @@
push (@cmds, {
setting => 'asn_lookup',
+ is_admin => 1,
code => sub {
my ($self, $key, $value, $line) = @_;
unless (defined $value && $value !~ /^$/) {
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm?view=diff&rev=527740&r1=527739&r2=527740
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm Wed Apr 11 18:28:35 2007
@@ -98,19 +98,6 @@
type => $Mail::SpamAssassin::Conf::CONF_TYPE_BOOL,
});
-=item dcc_timeout n (default: 8)
-
-How many seconds you wait for DCC to complete, before scanning continues
-without the DCC results.
-
-=cut
-
- push (@cmds, {
- setting => 'dcc_timeout',
- default => 8,
- type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
- });
-
=item dcc_body_max NUMBER
=item dcc_fuz1_max NUMBER
@@ -149,6 +136,20 @@
=head1 ADMINISTRATOR OPTIONS
=over 4
+
+=item dcc_timeout n (default: 8)
+
+How many seconds you wait for DCC to complete, before scanning continues
+without the DCC results.
+
+=cut
+
+ push (@cmds, {
+ setting => 'dcc_timeout',
+ is_admin => 1,
+ default => 8,
+ type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
+ });
=item dcc_home STRING
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm?view=diff&rev=527740&r1=527739&r2=527740
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm Wed Apr 11 18:28:35 2007
@@ -94,19 +94,6 @@
=over 4
-=item dkim_timeout n (default: 5)
-
-How many seconds to wait for a DKIM query to complete, before
-scanning continues without the DKIM result.
-
-=cut
-
- push (@cmds, {
- setting => 'dkim_timeout',
- default => 5,
- type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC
- });
-
=item whitelist_from_dkim add@ress.com [identity]
Use this to supplement the whitelist_from addresses with a check to make sure
@@ -185,6 +172,26 @@
$self->{parser}->add_to_addrlist_rcvd ('def_whitelist_from_dkim',
$address, $identity);
}
+ });
+
+=back
+
+=head1 ADMINISTRATOR SETTINGS
+
+=over 4
+
+=item dkim_timeout n (default: 5)
+
+How many seconds to wait for a DKIM query to complete, before
+scanning continues without the DKIM result.
+
+=cut
+
+ push (@cmds, {
+ setting => 'dkim_timeout',
+ is_admin => 1,
+ default => 5,
+ type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC
});
$conf->{parser}->register_commands(\@cmds);
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DomainKeys.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DomainKeys.pm?view=diff&rev=527740&r1=527739&r2=527740
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DomainKeys.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DomainKeys.pm Wed Apr 11 18:28:35 2007
@@ -102,19 +102,6 @@
=over 4
-=item domainkeys_timeout n (default: 5)
-
-How many seconds to wait for a DomainKeys query to complete, before
-scanning continues without the DomainKeys result.
-
-=cut
-
- push (@cmds, {
- setting => 'domainkeys_timeout',
- default => 5,
- type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC
- });
-
=item whitelist_from_dk add@ress.com [signing domain name]
Use this to supplement the whitelist_from addresses with a check to make sure
@@ -193,6 +180,26 @@
$self->{parser}->add_to_addrlist_rcvd ('def_whitelist_from_dk',
$address, $signer);
}
+ });
+
+=back
+
+=head1 ADMINISTRATOR SETTINGS
+
+=over 4
+
+=item domainkeys_timeout n (default: 5)
+
+How many seconds to wait for a DomainKeys query to complete, before
+scanning continues without the DomainKeys result.
+
+=cut
+
+ push (@cmds, {
+ setting => 'domainkeys_timeout',
+ is_admin => 1,
+ default => 5,
+ type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC
});
$conf->{parser}->register_commands(\@cmds);
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm?view=diff&rev=527740&r1=527739&r2=527740
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm Wed Apr 11 18:28:35 2007
@@ -29,7 +29,7 @@
This plugin allows regexp rules to be written against MIME headers in the
message.
-=head1 CONFIGURATION
+=head1 RULE DEFINITIONS AND PRIVILEGED SETTINGS
=over 4
@@ -96,6 +96,7 @@
push (@cmds, {
setting => 'mimeheader',
+ is_priv => 1,
code => sub {
my ($self, $key, $value, $line) = @_;
if ($value !~ /^(\S+)\s+(\S+)\s*([\=\!]\~)\s*(.+)$/) {
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm?view=diff&rev=527740&r1=527739&r2=527740
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm Wed Apr 11 18:28:35 2007
@@ -89,6 +89,29 @@
type => $Mail::SpamAssassin::Conf::CONF_TYPE_BOOL
});
+=item pyzor_max NUMBER (default: 5)
+
+This option sets how often a message's body checksum must have been
+reported to the Pyzor server before SpamAssassin will consider the Pyzor
+check as matched.
+
+As most clients should not be auto-reporting these checksums, you should
+set this to a relatively low value, e.g. C<5>.
+
+=cut
+
+ push (@cmds, {
+ setting => 'pyzor_max',
+ default => 5,
+ type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC
+ });
+
+=back
+
+=head1 ADMINISTRATOR OPTIONS
+
+=over 4
+
=item pyzor_timeout n (default: 3.5)
How many seconds you wait for Pyzor to complete, before scanning continues
@@ -114,32 +137,10 @@
push (@cmds, {
setting => 'pyzor_timeout',
+ is_admin => 1,
default => 3.5,
type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC
});
-
-=item pyzor_max NUMBER (default: 5)
-
-This option sets how often a message's body checksum must have been
-reported to the Pyzor server before SpamAssassin will consider the Pyzor
-check as matched.
-
-As most clients should not be auto-reporting these checksums, you should
-set this to a relatively low value, e.g. C<5>.
-
-=cut
-
- push (@cmds, {
- setting => 'pyzor_max',
- default => 5,
- type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC
- });
-
-=back
-
-=head1 ADMINISTRATOR OPTIONS
-
-=over 4
=item pyzor_options options
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm?view=diff&rev=527740&r1=527739&r2=527740
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm Wed Apr 11 18:28:35 2007
@@ -102,6 +102,12 @@
type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
});
+=back
+
+=head1 ADMINISTRATOR SETTINGS
+
+=over 4
+
=item razor_timeout n (default: 5)
How many seconds you wait for Razor to complete before you go on without
@@ -111,6 +117,7 @@
push(@cmds, {
setting => 'razor_timeout',
+ is_admin => 1,
default => 5,
type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
});
@@ -124,6 +131,7 @@
push(@cmds, {
setting => 'razor_config',
+ is_admin => 1,
type => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING,
});
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm?view=diff&rev=527740&r1=527739&r2=527740
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm Wed Apr 11 18:28:35 2007
@@ -167,7 +167,7 @@
my ($self, $conf) = @_;
my @cmds = ();
-=head1 CONFIGURATION
+=head1 RULE DEFINITIONS AND PRIVILEGED SETTINGS
=over 4
@@ -182,6 +182,7 @@
push(@cmds, {
setting => 'replace_tag',
+ is_priv => 1,
type => $Mail::SpamAssassin::Conf::CONF_TYPE_HASH_KEY_VALUE,
});
@@ -194,6 +195,7 @@
push(@cmds, {
setting => 'replace_pre',
+ is_priv => 1,
type => $Mail::SpamAssassin::Conf::CONF_TYPE_HASH_KEY_VALUE,
});
@@ -206,6 +208,7 @@
push(@cmds, {
setting => 'replace_inter',
+ is_priv => 1,
type => $Mail::SpamAssassin::Conf::CONF_TYPE_HASH_KEY_VALUE,
});
@@ -218,6 +221,7 @@
push(@cmds, {
setting => 'replace_post',
+ is_priv => 1,
type => $Mail::SpamAssassin::Conf::CONF_TYPE_HASH_KEY_VALUE,
});
@@ -231,6 +235,7 @@
push(@cmds, {
setting => 'replace_rules',
+ is_priv => 1,
code => sub {
my ($self, $key, $value, $line) = @_;
unless (defined $value && $value !~ /^$/) {
@@ -256,12 +261,14 @@
push(@cmds, {
setting => 'replace_start',
+ is_priv => 1,
default => '<',
type => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING,
});
push(@cmds, {
setting => 'replace_end',
+ is_priv => 1,
default => '>',
type => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING,
});
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm?view=diff&rev=527740&r1=527739&r2=527740
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm Wed Apr 11 18:28:35 2007
@@ -79,19 +79,6 @@
=over 4
-=item spf_timeout n (default: 5)
-
-How many seconds to wait for an SPF query to complete, before scanning
-continues without the SPF result.
-
-=cut
-
- push (@cmds, {
- setting => 'spf_timeout',
- default => 5,
- type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC
- });
-
=item whitelist_from_spf add@ress.com
Use this to supplement the whitelist_from addresses with a check against the
@@ -136,6 +123,20 @@
=head1 ADMINISTRATOR OPTIONS
=over 4
+
+=item spf_timeout n (default: 5)
+
+How many seconds to wait for an SPF query to complete, before scanning
+continues without the SPF result.
+
+=cut
+
+ push (@cmds, {
+ setting => 'spf_timeout',
+ is_admin => 1,
+ default => 5,
+ type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC
+ });
=item do_not_use_mail_spf (0|1) (default: 0)
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm?view=diff&rev=527740&r1=527739&r2=527740
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm Wed Apr 11 18:28:35 2007
@@ -31,7 +31,19 @@
the hostnames used therein, and querying various DNS blocklists for
those IP addresses. This is quite effective.
-=head1 CONFIGURATION
+=head1 USER SETTINGS
+
+=over 4
+
+=item uridnsbl_skip_domain domain1 domain2 ...
+
+Specify a domain, or a number of domains, which should be skipped for the
+URIBL checks. This is very useful to specify very common domains which are
+not going to be listed in URIBLs.
+
+=back
+
+=head1 RULE DEFINITIONS AND PRIVILEGED SETTINGS
=over 4
@@ -88,6 +100,12 @@
urirhssub URIBL_RHSBL_4 rhsbl.example.org. A 127.0.0.4
urirhssub URIBL_RHSBL_8 rhsbl.example.org. A 8
+=back
+
+=head1 ADMINISTRATOR SETTINGS
+
+=over 4
+
=item uridnsbl_timeout N (default: 2)
Specify the maximum number of seconds to wait for a result before
@@ -98,12 +116,6 @@
The maximum number of domains to look up.
-=item uridnsbl_skip_domain domain1 domain2 ...
-
-Specify a domain, or a number of domains, which should be skipped for the
-URIBL checks. This is very useful to specify very common domains which are
-not going to be listed in URIBLs.
-
=back
=cut
@@ -285,18 +297,21 @@
push(@cmds, {
setting => 'uridnsbl_timeout',
+ is_admin => 1,
default => 3,
type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
});
push(@cmds, {
setting => 'uridnsbl_max_domains',
+ is_admin => 1,
default => 20,
type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
});
push (@cmds, {
setting => 'uridnsbl',
+ is_priv => 1,
code => sub {
my ($self, $key, $value, $line) = @_;
if ($value =~ /^(\S+)\s+(\S+)\s+(\S+)$/) {
@@ -319,6 +334,7 @@
push (@cmds, {
setting => 'urirhsbl',
+ is_priv => 1,
code => sub {
my ($self, $key, $value, $line) = @_;
if ($value =~ /^(\S+)\s+(\S+)\s+(\S+)$/) {
@@ -341,6 +357,7 @@
push (@cmds, {
setting => 'urirhssub',
+ is_priv => 1,
code => sub {
my ($self, $key, $value, $line) = @_;
if ($value =~ /^(\S+)\s+(\S+)\s+(\S+)\s+(\d{1,10}|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/) {
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDetail.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDetail.pm?view=diff&rev=527740&r1=527739&r2=527740
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDetail.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDetail.pm Wed Apr 11 18:28:35 2007
@@ -26,7 +26,7 @@
loadplugin Mail::SpamAssassin::Plugin::URIDetail
-=head1 CONFIGURATION
+=head1 RULE DEFINITIONS AND PRIVILEGED SETTINGS
The format for defining a rule is as follows:
@@ -99,6 +99,7 @@
push (@cmds, {
setting => 'uri_detail',
+ is_priv => 1,
code => sub {
my ($self, $key, $value, $line) = @_;
Modified: spamassassin/trunk/t/config.dist
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/config.dist?view=diff&rev=527740&r1=527739&r2=527740
==============================================================================
--- spamassassin/trunk/t/config.dist (original)
+++ spamassassin/trunk/t/config.dist Wed Apr 11 18:28:35 2007
@@ -5,7 +5,7 @@
# Run network rule tests during 'make test'.
# test scripts may fail due to network problems)
-run_net_tests=n
+run_net_tests=y
# Run DCC Tests
run_dcc_tests=n