Minor corrections.

svn path=/trunk/; revision=2906

6 files changed, 18 insertions, 11 deletions

diff --git a/INSTALL b/INSTALL
index 0db142c4..5c54041e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -23,7 +23,7 @@ OTP-enabled.  To test this, telnet to the server port and give it
 a valid USER id.  If the OK response includes the string "otp-",
 you should install OPIE.  You need version 2.32 or better.
 
-The OPIE library sources are available at ftp://ftp.inner.net/pub/opie.
+The OPIE library sources are available at http://www.inner.net/pub/opie/
 You can also find OPIE and IPV6-capable servers there.
 
 Building in IPv6 support *requires* glibc 2.1.1 (or newer) or 
diff --git a/NEWS b/NEWS
index e9bd5333..d71b5311 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@
 
 (The `lines' figures total .c, .h, .l, and .y files under version control.)
 
+* Julian Haight's fix for his 5.4.1 patch, which created a potential 
+  memory leak.
+* Minor bug fixes for SSL by Wolfram Kleff.
+
 fetchmail-5.4.1 (Tue Jun  6 23:24:22 EDT 2000), 19051 lines:
 
 * Julian Haight added support for arbitrary SMTP RCPT TO: control using:
diff --git a/driver.c b/driver.c
index c1b171f5..1e80c2b8 100644
--- a/driver.c
+++ b/driver.c
@@ -1675,7 +1675,7 @@ const int maxfetch;		/* maximum number of messages to fetch */
 		verification.  We may want to make this configurable */
 	if (ctl->use_ssl && SSLOpen(mailserver_socket,ctl->sslkey,ctl->sslcert,realhost) == -1) 
 	{
-	    report(stderr, "SSL connection failed.");
+	    report(stderr, "SSL connection failed.\n");
 	    goto closeUp;
 	}
 #endif
diff --git a/fetchmail-FAQ.html b/fetchmail-FAQ.html
index 28e2f0ab..8821edfc 100644
--- a/fetchmail-FAQ.html
+++ b/fetchmail-FAQ.html
@@ -10,7 +10,7 @@
 <table width="100%" cellpadding=0><tr>
 <td width="30%">Back to <a href="index.html">Fetchmail Home Page</a>
 <td width="30%" align=center>To <a href="/~esr/sitemap.html">Site Map</a>
-<td width="30%" align=right>$Date: 2000/06/07 02:21:34 $
+<td width="30%" align=right>$Date: 2000/06/28 00:12:37 $
 </table>
 <HR>
 <H1>Frequently Asked Questions About Fetchmail</H1>
@@ -640,11 +640,13 @@ latency).<p>
 In the immortal words of Alan Cox the last time this came up: ``Take
 the Solaris lex and stick it up the backside of a passing Sun
 salesman, then install <a
-href="ftp://prep.ai.mit.edu/ftp/pub/gnu">flex</a> and use that.  All
+href="ftp://ftp.gnu.org/pub/non-gnu/flex/">flex</a> and use that.  All
 will be happier.''<P>
 
 I couldn't have put it better myself, and ain't going to try now.<P>
 
+(The same problem has been reported under HP-UX v10.20)<P>
+
 <hr>
 <h2><a name="B2">B2. I get link failures when I try to build fetchmail.</a></h2>
 
@@ -1419,11 +1421,11 @@ Demon Internet's SDPS service is an implementation of POP3. All messages
 have a Received: header added when they enter the maildrop, like this:
 
 <pre>
-   Received: from punt-1.mail.demon.net by mailstore for fred@xyz.demon.co.uk
+   Received: from punt-1.mail.demon.net by mailstore.com for fred@xyz.demon.co.uk
              id 899963657:10:27896:0; Thu, 09 Jul 98 05:54:17 GMT
 </pre>
 
-To enable multi-drop mode you need to tell fetchmail that 'mailstore' is
+To enable multi-drop mode you need to tell fetchmail that 'mailstore.com' is
 the name of the host which accepted the mail, and let it know the
 hostname part(s) of your E-mail address. The following example assumes
 that your hostname is xyz.demon.co.uk, and that you have also bought
@@ -1431,7 +1433,7 @@ that your hostname is xyz.demon.co.uk, and that you have also bought
 MTA must also be configured to accept mail sent to user@my-company.co.uk)
 
 <pre>
-     poll pop3.demon.co.uk proto pop3 aka mailstore no dns:
+     poll pop3.demon.co.uk proto pop3 aka mailstore.com no dns:
        localdomains xyz.demon.co.uk my-company.co.uk
        user xyz is * fetchall
 </pre>
@@ -2856,7 +2858,7 @@ install Linux on your server...<p>
 <table width="100%" cellpadding=0><tr>
 <td width="30%">Back to <a href="index.html">Fetchmail Home Page</a>
 <td width="30%" align=center>To <a href="/~esr/sitemap.html">Site Map</a>
-<td width="30%" align=right>$Date: 2000/06/07 02:21:34 $
+<td width="30%" align=right>$Date: 2000/06/28 00:12:37 $
 </table>
 
 <P><ADDRESS>Eric S. Raymond <A HREF="mailto:esr@thyrsus.com">&lt;esr@snark.thyrsus.com&gt;</A></ADDRESS>
diff --git a/fetchmail.c b/fetchmail.c
index dd83b671..0dfc7e41 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -922,7 +922,7 @@ static int load_params(int argc, char **argv, int optind)
 			|| str_in_list(&ctl->server.akalist, argv[optind], TRUE))
 		{
 		    /* Is this correct? */
-		    if(predeclared)
+		    if (predeclared && outlevel == O_VERBOSE)
 			fprintf(stderr,_("Warning: multiple mentions of host %s in config file\n"),argv[optind]);
 		    ctl->active = TRUE;
 		    predeclared = TRUE;
@@ -1175,8 +1175,9 @@ static int load_params(int argc, char **argv, int optind)
 		       namerec->h_addr_list[0],
 		       namerec->h_length);
 	      }
-#endif /* HAVE_GETHOSTBYNAME */
+#else
 	      ctl->server.truename = xstrdup(ctl->server.queryname);
+#endif /* HAVE_GETHOSTBYNAME */
 	    }
 
 	    /* if no folders were specified, set up the null one as default */
diff --git a/socket.c b/socket.c
index 8c64d5f2..8c367d0c 100644
--- a/socket.c
+++ b/socket.c
@@ -602,7 +602,7 @@ int SSL_verify_callback( int ok_return, X509_STORE_CTX *ctx )
 				report(stdout, "Server CommonName: %s\n", cbuf );
 			/* Should we have some wildcarding here? */
 			if ( NULL != _ssl_server_cname
-			     && 0 != strcmp( cbuf, _ssl_server_cname ) ) {
+			     && 0 != strcasemp( cbuf, _ssl_server_cname ) ) {
 				report(stdout,
 				       "Server CommonName mismatch: %s != %s\n",
 				       cbuf, _ssl_server_cname );