You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by ms...@apache.org on 2005/05/31 08:27:48 UTC
svn commit: r179192 - /spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm
/spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm
Author: mss
Date: Mon May 30 23:27:46 2005
New Revision: 179192
URL: http://svn.apache.org/viewcvs?rev=179192&view=rev
Log:
Renamed Mail::SpamAssassin::DnsResolver::search to send because that's the routine in Net::DNS::Resolver it actually emulates (and such the interfaces are more similar).
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm
spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm?rev=179192&r1=179191&r2=179192&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm Mon May 30 23:27:46 2005
@@ -399,7 +399,7 @@
} else {
eval {
- my $query = $self->{resolver}->search($dom, 'NS');
+ my $query = $self->{resolver}->send($dom, 'NS');
my @nses = ();
if ($query) {
foreach my $rr ($query->answer) {
@@ -431,7 +431,7 @@
} else {
eval {
- my $query = $self->{resolver}->search($dom, 'MX');
+ my $query = $self->{resolver}->send($dom, 'MX');
my @ips = ();
if ($query) {
foreach my $rr ($query->answer) {
@@ -489,7 +489,7 @@
} else {
eval {
- my $query = $self->{resolver}->search($dom);
+ my $query = $self->{resolver}->send($dom);
if ($query) {
foreach my $rr ($query->answer) {
if ($rr->type eq "PTR") {
@@ -532,7 +532,7 @@
} else {
eval {
- my $query = $self->{resolver}->search($name);
+ my $query = $self->{resolver}->send($name);
if ($query) {
foreach my $rr ($query->answer) {
if ($rr->type eq "A") {
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm?rev=179192&r1=179191&r2=179192&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm Mon May 30 23:27:46 2005
@@ -86,8 +86,8 @@
$self->{res} = Net::DNS::Resolver->new;
if (defined $self->{res}) {
$self->{no_resolver} = 0;
- $self->{retry} = 1; # retries for non-nackgrounded search
- $self->{retrans} = 3; # initial timeout for "non-backgrounded" search run in background
+ $self->{retry} = 1; # retries for non-nackgrounded query
+ $self->{retrans} = 3; # initial timeout for "non-backgrounded" query run in background
$self->{res}->retry(1); # If it fails, it fails
$self->{res}->retrans(0); # If it fails, it fails
$self->{res}->dnsrch(0); # ignore domain search-list
@@ -327,13 +327,13 @@
###########################################################################
-=item $packet = $res->search($name, $type, $class)
+=item $packet = $res->send($name, $type, $class)
-Emulates C<Net::DNS::Resolver::search()>.
+Emulates C<Net::DNS::Resolver::send()>.
=cut
-sub search {
+sub send {
my ($self, $name, $type, $class) = @_;
return if $self->{no_resolver};