aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2001-04-26 03:30:05 +0000
committerEric S. Raymond <esr@thyrsus.com>2001-04-26 03:30:05 +0000
commit1515ecb0b2804b805351344c09af1867bd6585bf (patch)
tree00b56f350f25c5e946dc831171a55f0da871c531
parent06093ccd700f061429f6c5f5118ae36a14b40f7d (diff)
downloadfetchmail-1515ecb0b2804b805351344c09af1867bd6585bf.tar.gz
fetchmail-1515ecb0b2804b805351344c09af1867bd6585bf.tar.bz2
fetchmail-1515ecb0b2804b805351344c09af1867bd6585bf.zip
Check aka suffixes even if DNS is on.
svn path=/trunk/; revision=3298
-rw-r--r--NEWS1
-rw-r--r--checkalias.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index fdf63a75..79b3c649 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@
bugmail.
* Kerberos build patch by HH.
* Don't cough and die from failure to resolve a skipped host.
+* Do aka suffix match even if DNS checking is enabled (Johannes Stille's bug).
fetchmail-5.8.1 (Tue Apr 10 09:32:04 EDT 2001), 20511 lines:
diff --git a/checkalias.c b/checkalias.c
index 5b8b6744..90a7ffd5 100644
--- a/checkalias.c
+++ b/checkalias.c
@@ -123,8 +123,6 @@ int is_host_alias(const char *name, struct query *ctl)
return(TRUE);
else if (str_in_list(&lead_server->akalist, name, TRUE))
return(TRUE);
- else if (!ctl->server.dns)
- return(FALSE);
/*
* Now check for a suffix match on the akalist. The theory here is
@@ -149,6 +147,8 @@ int is_host_alias(const char *name, struct query *ctl)
return(TRUE);
}
+ if (!ctl->server.dns)
+ return(FALSE);
#ifndef HAVE_RES_SEARCH
return(FALSE);
#else