You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2007/04/20 14:31:52 UTC
svn commit: r530769 - in /spamassassin/trunk:
lib/Mail/SpamAssassin/Conf/LDAP.pm lib/Mail/SpamAssassin/Dns.pm
lib/Mail/SpamAssassin/Logger.pm lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
lib/Mail/SpamAssassin/Plugin/SPF.pm spamd/spamd.raw
Author: jm
Date: Fri Apr 20 05:31:51 2007
New Revision: 530769
URL: http://svn.apache.org/viewvc?view=rev&rev=530769
Log:
bug 4481: always report $@ error messages where appropriate
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Conf/LDAP.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Logger.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm
spamassassin/trunk/spamd/spamd.raw
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/LDAP.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/LDAP.pm?view=diff&rev=530769&r1=530768&r2=530769
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/LDAP.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/LDAP.pm Fri Apr 20 05:31:51 2007
@@ -107,7 +107,7 @@
};
if ($@) {
- warn "ldap: failed to load user scores from LDAP server, ignored\n";
+ warn "ldap: failed to load user scores from LDAP server, ignored ($@)\n";
}
}
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm?view=diff&rev=530769&r1=530768&r2=530769
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm Fri Apr 20 05:31:51 2007
@@ -456,7 +456,7 @@
$nsrecords = $self->{dnscache}->{NS}->{$dom} = [ @nses ];
};
if ($@) {
- dbg("dns: NS lookup failed horribly, perhaps bad resolv.conf setting?");
+ dbg("dns: NS lookup failed horribly, perhaps bad resolv.conf setting? ($@)");
return undef;
}
}
@@ -490,7 +490,7 @@
$mxrecords = $self->{dnscache}->{MX}->{$dom} = [ @ips ];
};
if ($@) {
- dbg("dns: MX lookup failed horribly, perhaps bad resolv.conf setting?");
+ dbg("dns: MX lookup failed horribly, perhaps bad resolv.conf setting? ($@)");
return undef;
}
}
@@ -549,7 +549,7 @@
};
if ($@) {
- dbg("dns: PTR lookup failed horribly, perhaps bad resolv.conf setting?");
+ dbg("dns: PTR lookup failed horribly, perhaps bad resolv.conf setting? ($@)");
return undef;
}
}
@@ -591,7 +591,7 @@
};
if ($@) {
- dbg("dns: A lookup failed horribly, perhaps bad resolv.conf setting?");
+ dbg("dns: A lookup failed horribly, perhaps bad resolv.conf setting? ($@)");
return undef;
}
}
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Logger.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Logger.pm?view=diff&rev=530769&r1=530768&r2=530769
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Logger.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Logger.pm Fri Apr 20 05:31:51 2007
@@ -247,7 +247,7 @@
dbg("logger: successfully added $name method\n");
return 1;
}
- warn("logger: failed to add $name method\n");
+ warn("logger: failed to add $name method ($@)\n");
return 0;
}
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm?view=diff&rev=530769&r1=530768&r2=530769
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm Fri Apr 20 05:31:51 2007
@@ -69,7 +69,7 @@
$reg = IP::Country::Fast->new();
};
if ($@) {
- dbg("metadata: failed to load 'IP::Country::Fast', skipping");
+ dbg("metadata: failed to load 'IP::Country::Fast', skipping ($@)");
return 1;
}
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=530769&r1=530768&r2=530769
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm Fri Apr 20 05:31:51 2007
@@ -522,7 +522,7 @@
};
if ($@) {
- dbg("spf: cannot create Mail::SPF::Request object");
+ dbg("spf: cannot create Mail::SPF::Request object ($@)");
return;
}
@@ -559,7 +559,7 @@
};
if ($@) {
- dbg("spf: cannot create Mail::SPF::Query object: $@");
+ dbg("spf: cannot create Mail::SPF::Query object ($@)");
return;
}
Modified: spamassassin/trunk/spamd/spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd/spamd.raw?view=diff&rev=530769&r1=530768&r2=530769
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw (original)
+++ spamassassin/trunk/spamd/spamd.raw Fri Apr 20 05:31:51 2007
@@ -380,7 +380,8 @@
# ident-based spamc user authentication
if ( $opt{'auth-ident'} ) {
eval { require Net::Ident };
- die "spamd: ident-based authentication requested, but Net::Ident is unavailable\n" if ($@);
+ die "spamd: ident-based authentication requested, but Net::Ident is unavailable ($@)\n"
+ if ($@);
$opt{'ident-timeout'} = undef if $opt{'ident-timeout'} <= 0.0;
import Net::Ident qw(ident_lookup);
@@ -391,7 +392,7 @@
$opt{'server-cert'} ||= "$LOCAL_RULES_DIR/certs/server-cert.pem";
if ( $listen_ssl ) {
eval { require IO::Socket::SSL };
- die "spamd: SSL encryption requested, but IO::Socket::SSL is unavailable\n"
+ die "spamd: SSL encryption requested, but IO::Socket::SSL is unavailable ($@)\n"
if ($@);
if ( !-e $opt{'server-key'} ) {
@@ -1965,7 +1966,7 @@
if ($value =~ /zlib/i) {
eval { require Compress::Zlib; };
if ($@) {
- protocol_error("(compression not supported, Compress::Zlib not installed)");
+ protocol_error("(compression not supported, Compress::Zlib not installed: $@)");
return 0;
}
$hdrs->{compress_zlib} = 1;