Almost ready to ship.

svn path=/trunk/; revision=2893

4 files changed, 44 insertions, 13 deletions

diff --git a/NEWS b/NEWS
index 91a30419..70ffbdbb 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@
 
 (The `lines' figures total .c, .h, .l, and .y files under version control.)
 
+* Matthias Scheler's fix for SSL under IPV6
+* Added FAQ material on SSL's "RPNG not seeded" message and on ssh tunnelling.
+
 fetchmail-5.3.8 (Fri Apr 21 03:47:14 EDT 2000), 18977 lines:
 
 * Fixed brown-paper-bag bugs involving rcfile name initialization.
@@ -14,7 +17,7 @@ fetchmail-5.3.7 (Sun Apr 16 03:46:13 EDT 2000), 18975 lines:
 * Updated and corrected version of contrib/domino.
 * Galician translation added, courtesy of Jesus Bravo Alvarez <jba@pobox.com>.
 * Spanish translation updated, courtesy of Javier Kohen.
-* Removed an unnecessary Kereberos check that seemed to be causing lossage.
+* Removed an unnecessary Kerberos check that seemed to be causing lossage.
 * FETCHMAILHOME environment variable introduced to optionally override the
   normal $HOME location of fetchmail's rc, id, and pid files.
 * Fixed a bug in the SEARCH UNSEEN code that resulted in only half the
diff --git a/fetchmail-FAQ.html b/fetchmail-FAQ.html
index 3afc8818..88011fb6 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/05/13 21:59:36 $
+<td width="30%" align=right>$Date: 2000/05/13 22:14:55 $
 </table>
 <HR>
 <H1>Frequently Asked Questions About Fetchmail</H1>
@@ -1648,12 +1648,12 @@ http://www.bieringer.de/linux/IPv6/IPv6-HOWTO/IPv6-HOWTO.html</a>
 <hr>
 <h2><a name="K3">K3. How can I get fetchmail to work with ssh?</a></h2>
 
-We have three recipes for this.  The first is easy to set up,
-but only supports one user at a time.<P>
+We have four recipes for this.<P>
 
 <h3>Single-User POP3</h3>
 
-First, a lightly edited version of a recipe from Masafumi NAKANE:<p>
+First, a lightly edited version of a recipe from Masafumi NAKANE.
+This one is easy to set up, but only supports one user at a time.<p>
 
 1. You must have ssh (the ssh client) on the local host and sshd (ssh
 server) on the remote mail server.  And you have to configure ssh so
@@ -1757,7 +1757,7 @@ Now just use localhost:1234 to access your POP server.<P>
 
 <h3>Multi-User IMAP</h3>
 
-This is the preferred method.  It comes to us from Joerg Dorchain.
+This one comes comes to us from Joerg Dorchain.
 The basic idea is to set up a bidirectional encrypted socket connection:<p>
 
 <pre>
@@ -1801,6 +1801,35 @@ The wrapper script should look like this:<p>
 exec ssh -i $HOME/.ssh/identity-imap $1 /usr/sbin/imapd
 </pre>
 
+<h3>Netcat-based POP or IMAP tunnelling</h3>
+
+Oren Tirosh &lt;oren@mimique.com&gt; sends us a method of using
+fetchmail over ssh without port forwarding, using the plugin keyword.<P>
+
+First, set up a poll entry resembling thius one:
+
+<TT>
+poll target.host plugin sshtunnel proto pop3 user foo password *
+</TT>
+
+The important part is the "plugin sshtunnel".  Now set up sshtunnel
+as follows:<P>
+
+<TT>
+This is the sshtunnel script:
+#!/bin/sh
+ssh $1 "nc localhost $2"
+</TT>
+
+Thia method uses netcat to connect to the pop3 port locally on the
+target host and create a two-way channel over the ssh connection.<P>
+
+Oren says: "In my experience it is much more reliable than the methods
+described in your FAQ.  ssh port forwarding often keeps the local port
+bound for along timeout and has timing issues requiring tricks like
+sleep, etc.  I use this method for fetching all the mail for
+mimique.com"<P>
+
 <hr>
 <h2><a name="K4">K4. What do I have to do to use the IMAP-GSS protocol?</a></h2>
 
@@ -2798,7 +2827,7 @@ terminate it.<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/05/13 21:59:36 $
+<td width="30%" align=right>$Date: 2000/05/13 22:14:55 $
 </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 d68bffca..bce52ae5 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -1123,9 +1123,9 @@ static int load_params(int argc, char **argv, int optind)
 		ctl->server.truename = xstrdup(leadname);
 	    }
 #ifdef HAVE_GETHOSTBYNAME
-	    else if (ctl->server.preauthenticate==A_KERBEROS_V4 ||
+	    else if (!configdump && (ctl->server.preauthenticate==A_KERBEROS_V4 ||
 		ctl->server.preauthenticate==A_KERBEROS_V5 ||
-		(ctl->server.dns && MULTIDROP(ctl)))
+		      (ctl->server.dns && MULTIDROP(ctl))))
 	    {
 		struct hostent	*namerec;
 
diff --git a/indexgen.sh b/indexgen.sh
index ebd8c4c4..8c9c6ea8 100755
--- a/indexgen.sh
+++ b/indexgen.sh
@@ -278,10 +278,9 @@ Donncha O Caoihm has written a Perl script called
 <a href="http://cork.linux.ie/projects/install-sendmail/">install-sendmail</a>
 that assists you in installing sendmail and fetchmail together/<p>
 
-Hugo Rabson has written a script called \`hotmole' that can retrieve
-Hotmail mail via the web using Lynx.  The script was available on <a
-href="http://www.jin-sei-kai.demon.co.uk/hugo/linux.html"> Hugo
-Rabson's Linux page</a>, but we are informed the project is now dead.<P>
+Peter Hawkins has written a script called <a
+href="http://www.ozemail.com.au/~peterhawkins/gotmail/">gotmail</a>
+that can retrieve Hotmail. <P>
 
 <H1>Fetchmail's funniest fan letter:</H1>