GSSAPI support is rockin'!

svn path=/trunk/; revision=1979

4 files changed, 30 insertions, 9 deletions

diff --git a/NEWS b/NEWS
index 4c153ebe..37fc4f21 100644
--- a/NEWS
+++ b/NEWS
@@ -3,11 +3,16 @@
 * Add an "ident" per-user option for debugging that produces an 
   "X-Fetchmail-ID" header in fetched messages for debugging.
 * -U/--userdefault option to specify postmaster overriding USER.
-* Runtime selection of either straight POP3 or RPA on CompuServe sites
+* Can the initial gethostname() be eliminated?
 
 				Release Notes:
 
 ------------------------------------------------------------------------------
+fetchmail-4.5.3 ():
+* Minor fixes to the GSSAPI code.  Seems to work with stock UW IMAP now! 
+
+There are 267 people on fetchmail-friends and 249 on fetchmail-announce.
+
 fetchmail-4.5.2 (Tue Jul 14 19:02:52 EDT 1998):
 * German-language internationalization in the RPM, thanks to Jochen Hayek.
 * .fetchmailrc files are now permitted to be executable by user and group.
diff --git a/fetchmail-FAQ.html b/fetchmail-FAQ.html
index c9303343..b5f16054 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: 1998/07/15 17:47:05 $
+<td width="30%" align=right>$Date: 1998/07/20 04:00:38 $
 </table>
 <HR>
 <H1>Frequently Asked Questions About Fetchmail</H1>
@@ -324,7 +324,8 @@ vs. NT performance.<P>
 You can find sources for IMAP software at <a
 href="http://www.imap.org">The IMAP Connection</a>; we like the
 open-source UW IMAP and Cyrus products. UW IMAP is the reference
-implementation of IMAP.<P>
+implementation of IMAP.  UW IMAP's support for GSSAPI gives you a
+good way to authenticate without sending a password en clair.<P>
 
 Source for a high-quality supported implementation of POP is available
 from the <a href="ftp://ftp.qualcomm.com/eudora/servers/unix/popper/">Eudora
@@ -403,10 +404,12 @@ and your fetchmail was built with OPIE support compiled in (see the
 distribution INSTALL file), fetchmail will detect it also.  When using
 OTP, you will specify a password but it will not be sent en clair.<P>
 
-Sadly, there is at present (May 1998) no OTP or APOP-like
+Sadly, there is at present (July 1998) no OTP or APOP-like
 facility generally available on IMAP servers.  However, there do exist
 patches which will OTP-enable the University of Washington IMAP
-daemon, version 4.1-BETA.<P>
+daemon, version 4.1-BETA.  And we have a report that the GSSAPI
+support in fetchmail works with the GSSAPI support in the most recent
+version of UW IMAP.<P>
 
 You can get both POP3 and IMAP OTP patches from <a name="cmetz">Craig
 Metz</A>, over FTP via either
@@ -2043,7 +2046,7 @@ Re-ordering messages is a user-agent function, anyway.<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: 1998/07/15 17:47:05 $
+<td width="30%" align=right>$Date: 1998/07/20 04:00:38 $
 </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 148d175a..b91e4765 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -159,6 +159,9 @@ int main (int argc, char **argv)
 #ifndef IMAP_ENABLE
 	printf("-IMAP");
 #endif /* IMAP_ENABLE */
+#ifdef GSSAPI
+	printf("+IMAP-GSS");
+#endif /* GSSAPI */
 #ifdef RPA_ENABLE
 	printf("+RPA");
 #endif /* RPA_ENABLE */
@@ -1163,9 +1166,15 @@ void dump_params (struct runctl *runp, struct query *querylist, flag implicit)
 	if (ctl->server.skip || outlevel == O_VERBOSE)
 	    printf("  This host will%s be queried when no host is specified.\n",
 		   ctl->server.skip ? " not" : "");
-	/* don't poll for password when there is one or when using the ETRN
-	** protocol */
-	if (!ctl->password && (ctl->server.protocol != P_ETRN))
+	/*
+	 * Don't poll for password when there is one or when using the ETRN
+	 * or IMAP-GSS protocol
+	 */
+	if (!ctl->password && (ctl->server.protocol != P_ETRN)
+#ifdef GSSAPI
+            && (ctl->server.protocol != P_IMAP_GSS)
+#endif /* GSSAPI */
+        )
 	    printf("  Password will be prompted for.\n");
 	else if (outlevel == O_VERBOSE)
 	    if (ctl->server.protocol == P_APOP)
diff --git a/options.c b/options.c
index 63623e68..69ae2c56 100644
--- a/options.c
+++ b/options.c
@@ -306,6 +306,10 @@ struct query *ctl;	/* option record to be initialized */
 	    else if (strcasecmp(optarg,"imap-k4") == 0)
 		ctl->server.protocol = P_IMAP_K4;
 #endif /* KERBEROS_V4 */
+#ifdef GSSAPI
+	    else if (strcasecmp(optarg, "imap-gss") == 0)
+                ctl->server.protocol = P_IMAP_GSS;
+#endif /* GSSAPI */
 	    else if (strcasecmp(optarg,"etrn") == 0)
 		ctl->server.protocol = P_ETRN;
 	    else {