Fix a multidrop bug.

svn path=/trunk/; revision=607

diff --git a/NEWS b/NEWS
index b59c00f0816c9574cb5610fabb5e9103ac70d8e2..2421910982a4f8d327ff727d7cff9cfa73fa3a69 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ features --
 
 * If SMTP returns 571 (unsolicited mail refused) to a MAIL FROM, the
   address is excluded by the local sendmail's spam filter.  Drop the mail.
+  (This the only circumstance in which mail is thrown away.)
 
 bugs --
 
@@ -13,6 +14,7 @@ bugs --
 * Fixed a bug in non-implicit (poll specified host) mode also due to aka.
 * Various minor portability fixes for Suns.
 * Avoid using -lresolv when possible, some Linux versions are badly broken.
+* Fix error in MX record handling that was causing multidrop problems
 
 fetchmail-2.1 (Thu Nov 28 11:07:48 EST 1996):
 

diff --git a/driver.c b/driver.c
index 06bb6dc193ac00c12b3648fdfce4dcb7d7eedd30..17c42bc6270ca2864e96a6781c5f5e342ee18323 100644 (file)
--- a/driver.c
+++ b/driver.c
@@ -166,6 +166,7 @@ static int is_host_alias(const char *name, struct query *ctl)
      */
     h_errno = 0;
     if ((mxrecords = getmxrecords(name)) == (struct mxentry *)NULL)
+    {
        switch (h_errno)
        {
        case HOST_NOT_FOUND:    /* specified host is unknown */
@@ -175,6 +176,7 @@ static int is_host_alias(const char *name, struct query *ctl)
            for (mxp = mxrecords; mxp->name; mxp++)
                if (strcmp(name, mxp->name) == 0)
                    goto match;
+           return(FALSE);
            break;
 
        case NO_RECOVERY:       /* non-recoverable name server error */
@@ -187,8 +189,7 @@ static int is_host_alias(const char *name, struct query *ctl)
            longjmp(restart, 2);        /* try again next poll cycle */
            break;
        }
-
-    return(FALSE);
+    }
 
 match:
     /* add this name to relevant server's `also known as' list */