Print warning if multidrop is configured, but not envelope option.

svn path=/trunk/; revision=4028

1 files changed, 12 insertions, 3 deletions

diff --git a/fetchmail.c b/fetchmail.c
index f75b062e..7bc6d4ea 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -1117,10 +1117,8 @@ static int load_params(int argc, char **argv, int optind)
 	    DEFAULT(ctl->idle, FALSE);
 	    DEFAULT(ctl->server.dns, TRUE);
 	    DEFAULT(ctl->server.uidl, FALSE);
-#ifdef	SSL_ENABLE
 	    DEFAULT(ctl->use_ssl, FALSE);
 	    DEFAULT(ctl->sslcertck, FALSE);
-#endif
 	    DEFAULT(ctl->server.checkalias, FALSE);
 #ifndef SSL_ENABLE
 	    /*
@@ -1157,13 +1155,24 @@ static int load_params(int argc, char **argv, int optind)
 
 #if !defined(HAVE_GETHOSTBYNAME) || !defined(HAVE_RES_SEARCH)
 	    /* can't handle multidrop mailboxes unless we can do DNS lookups */
-	    if (ctl->localnames && ctl->localnames->next && ctl->server.dns)
+	    if (MULTIDROP(ctl) && ctl->server.dns)
 	    {
 		ctl->server.dns = FALSE;
 		report(stderr, GT_("fetchmail: warning: no DNS available to check multidrop fetches from %s\n"), ctl->server.pollname);
 	    }
 #endif /* !HAVE_GETHOSTBYNAME || !HAVE_RES_SEARCH */
 
+	    /*
+	     * can't handle multidrop mailboxes without "envelope"
+	     * option, this causes truckloads full of support complaints
+	     * "all mail forwarded to postmaster"
+	     */
+	    if (MULTIDROP(ctl) && !ctl->server.envelope)
+	    {
+		report(stderr, GT_("warning: multidrop for %s requires envelope option!\n"), ctl->server.pollname);
+		report(stderr, GT_("warning: Do not ask for support if all mail goes to postmaster!\n"));
+	    }
+
 	    /* if no folders were specified, set up the null one as default */
 	    if (!ctl->mailboxes)
 		save_str(&ctl->mailboxes, (char *)NULL, 0);