Minor bug fixes.

svn path=/trunk/; revision=3736

5 files changed, 28 insertions, 8 deletions

diff --git a/NEWS b/NEWS
index 7e080500..ab004d13 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,12 @@
 (The `lines' figures total .c, .h, .l, and .y files under version control.)
 
 * OTP fix patches from Stanislav Brabec <utx@penguin.cz>
+* fix patch for writing antispam capability correctly in conf.c.
+* Fix patches for Debian bugs #162571, #156592.
+* Correction to manpage re -b and qmail.
+* Patch to dusable use of STLS if auth passwd is specified.
+* Fix specfile generation to handle SSL correctly.
+* New Danish, Turkish, and Catalan translation files.
 
 fetchmail-6.1.0 (Sun Sep 22 18:31:23 EDT 2002), 21999 lines:
 
diff --git a/conf.c b/conf.c
index 4681523f..889a5116 100644
--- a/conf.c
+++ b/conf.c
@@ -396,7 +396,7 @@ void dump_config(struct runctl *runp, struct query *querylist)
 	indent('\0');
 	fprintf(stdout, "'antispam':'");
 	if (!ctl->antispam)
-	    fputs("'\n", stdout);
+	    fputs("',\n", stdout);
 	else
 	{
 	    for (idp = ctl->antispam; idp; idp = idp->next)
diff --git a/fetchmail-FAQ.html b/fetchmail-FAQ.html
index 0bdea96c..99725961 100644
--- a/fetchmail-FAQ.html
+++ b/fetchmail-FAQ.html
@@ -16,7 +16,7 @@ content="Frequently asked questions about fetchmail."/>
 Page</a></td>
 <td width="30%" align="center">To <a href="/~esr/sitemap.html">Site
 Map</a></td>
-<td width="30%" align="right">$Date: 2002/10/18 10:20:44 $</td>
+<td width="30%" align="right">$Date: 2002/10/18 11:03:00 $</td>
 </tr>
 </table>
 
@@ -196,8 +196,7 @@ mangled.</a><br/>
 <a href="#X7">X7. Some mail attachments are hanging
 fetchmail.</a><br/>
 <a href="#X8">X8. A spurious ) is being appended to my
-messages.</a><br/>
- 
+messages.</a><br/> 
 
 <h1>Other problems:</h1>
 
@@ -221,7 +220,9 @@ working?</a><br/>
 messages over and over?</a><br/>
 <a href="#O10">O10. Why is the received date on all my messages the
 same?</a><br/>
- 
+<a href="#O11">O11. I keep getting messages that say "Repoll
+immediately" in my logs.</a><br/>
+
 
 <h1>Answers:</h1>
 
@@ -1918,7 +1919,8 @@ Geocities are lame, you should boycott them anyway.</p>
 <h2><a id="S8" name="S8">S8. How can I use fetchmail with Hotmail?</a></h2>
 
 <p>You can't, yet. But <a
-href="http://linux.cudeso.be/linuxdoc/gotmail.php">gotmail</a> might
+href="http://linux.cudeso.be/linuxdoc/gotmail.php">gotmail</a> or 
+<a href='http://people.freenet.de/courierdave/'>HotWayDaemon</a> might
 be what you need.</p>
 
 <hr/>
@@ -3419,6 +3421,17 @@ messages the same?</a></h2>
 <p>This is a design choice in your MTA, not fetchmail. It's taking
 the received date from the last Received header.</p>
 
+<hr />
+<a name="#O11">O11. I keep getting messages that say "Repoll
+immediately" in my logs.</a><br/>
+
+<p>This is your server barfing on the CAPA probe that fetchmail sends.</p>
+If you run fetchmail in daemon mode (say "set daemon 600"), you will
+get the message only once per run.</p>
+
+<p>If you set an authentication method explicitly (say, with
+<code>auth password</code>), you will never get the message.</p>
+
 <hr/>
 <table width="100%" cellpadding="0" summary="Canned page footer">
 <tr>
@@ -3426,7 +3439,7 @@ the received date from the last Received header.</p>
 Page</a></td>
 <td width="30%" align="center">To <a href="/~esr/sitemap.html">Site
 Map</a></td>
-<td width="30%" align="right">$Date: 2002/10/18 10:20:44 $</td>
+<td width="30%" align="right">$Date: 2002/10/18 11:03:00 $</td>
 </tr>
 </table>
 
diff --git a/fetchmail.man b/fetchmail.man
index 17f7c48f..064a7c58 100644
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -466,7 +466,7 @@ listener before the connection is deliberately torn down and rebuilt
 overrides any limits set in your run control file.  While
 \fBsendmail\fR(8) normally initiates delivery of a message immediately
 after receiving the message terminator, some SMTP listeners are not so
-prompt.  MTAs like \fIqmail\fR(8) and \fIsmail\fR(8) may wait till the
+prompt.  MTAs like \fIsmail\fR(8) may wait till the
 delivery socket is shut down to deliver.  This may produce annoying
 delays when \fIfetchmail\fR is processing very large batches.  Setting
 the batch limit to some nonzero size will prevent these delays.  This
diff --git a/imap.c b/imap.c
index 9005fbf9..08aa4c80 100644
--- a/imap.c
+++ b/imap.c
@@ -358,6 +358,7 @@ static int imap_getauth(int sock, struct query *ctl, char *greeting)
 
 #ifdef SSL_ENABLE
     if ((ctl->server.authenticate == A_ANY)
+        && !ctl->use_ssl
         && strstr(capabilities, "STARTTLS"))
     {
            char *realhost;