Wautier's fix.

svn path=/trunk/; revision=1756

2 files changed, 18 insertions, 14 deletions

diff --git a/NEWS b/NEWS
index 8bd56bb4..c867468a 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,9 @@
 				Release Notes:
 
 ------------------------------------------------------------------------------
+fetchmail-4.4.4 ():
+* Francois Wautier's fix for qvirtual.
+
 fetchmail-4.4.3 (Sun Apr 19 18:22:00 EDT 1998):
 * Back out one of the changes to the null Return-Path handling, as it caused
   invalid rewrites leading to protocol sync errors under some configurations.
diff --git a/driver.c b/driver.c
index af0e61c8..fe8bec8a 100644
--- a/driver.c
+++ b/driver.c
@@ -326,25 +326,26 @@ struct idlist **xmit_names;	/* list of recipient names parsed out */
 			break;
 		    }
 		}
-		/* if we matched a local domain, idp != NULL */
-		if (idp) continue;
 
-		/*
-		 * Check to see if the right-hand part is an alias
-		 * or MX equivalent of the mailserver.  If it's
-		 * not, skip this name.  If it is, we'll keep
-		 * going and try to find a mapping to a client name.
-		 */
-		if (!is_host_alias(atsign+1, ctl))
+		/* if we matched a local domain, idp != NULL */
+		if (!idp)
 		{
-		    save_str(xmit_names, cp, XMIT_REJECT);
-		    reject_count++;
-		    continue;
+		    /*
+		     * Check to see if the right-hand part is an alias
+		     * or MX equivalent of the mailserver.  If it's
+		     * not, skip this name.  If it is, we'll keep
+		     * going and try to find a mapping to a client name.
+		     */
+		    if (!is_host_alias(atsign+1, ctl))
+		    {
+			save_str(xmit_names, cp, XMIT_REJECT);
+			reject_count++;
+			continue;
+		    }
 		}
 		atsign[0] = '\0';
+		map_name(cp, ctl, xmit_names);
 	    }
-
-	    map_name(cp, ctl, xmit_names);
 	}
     }
 }