From 1515ecb0b2804b805351344c09af1867bd6585bf Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Thu, 26 Apr 2001 03:30:05 +0000
Subject: Check aka suffixes even if DNS is on.

svn path=/trunk/; revision=3298
---
 NEWS         | 1 +
 checkalias.c | 4 ++--
 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
-- 
cgit v1.2.3