From 018280d472ff629e6fd9f98ebbbe4cd1b934df38 Mon Sep 17 00:00:00 2001
From: Thomas Roessler <roessler@does-not-exist.org>
Date: Mon, 30 Aug 1999 16:10:45 +0000
Subject: [PATCH] Properly handle IMAP cache files.

---
 configure.in | 2 +-
 imap/imap.c  | 1 +
 main.c       | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 0db0426c..1d1d8bc8 100644
--- a/configure.in
+++ b/configure.in
@@ -445,7 +445,7 @@ AC_ARG_ENABLE(imap, [  --enable-imap              Enable IMAP support],
  	AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
  	AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent))
 	LIBIMAP="-Limap -limap"
-	LIBIMAPDEPS="\$(srcdir)/imap/imap.h \$(srcdir)/imap/libimap.a"
+	LIBIMAPDEPS="\$(srcdir)/imap/imap.h imap/libimap.a"
 	CPPFLAGS="$CPPFLAGS -I\$(srcdir)/imap"
 	need_imap="yes"
 ])
diff --git a/imap/imap.c b/imap/imap.c
index 2125e079..51347f93 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -1864,6 +1864,7 @@ void imap_fastclose_mailbox (CONTEXT *ctx)
 
   if ((CTX_DATA->state == IMAP_SELECTED) && (ctx == CTX_DATA->selected_ctx))
     if (imap_close_mailbox (CTX_DATA) != 0)
+      return;
 
   for (i = 0; i < IMAP_CACHE_LEN; i++)
   {
diff --git a/main.c b/main.c
index 18e04202..f35707c5 100644
--- a/main.c
+++ b/main.c
@@ -197,6 +197,12 @@ static void show_version (void)
         "-USE_IMAP  "
 #endif
 
+#ifdef USE_GSS
+	"+USE_GSS  "
+#else
+	"-USE_GSS  "
+#endif
+
 #ifdef USE_POP
 	"+USE_POP  "
 #else
-- 
2.40.0