Documentation updates and a little bug fix. From Brendan Cully.

diff --git a/INSTALL b/INSTALL
index f1c294ed568ca3fed0486601554a58ae4afb210d..2881b5a39c73a1eb156234f2664a8d717b4df19a 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -86,15 +86,29 @@ to ``configure'' to help it out, or change the default behavior:
 --enable-imap
        enable IMAP support
 
+--with-gss[=PFX]
+       Enable GSSAPI authentication to IMAP servers. This should work with
+       both MIT and Heimdal GSSAPI implementations - others haven't been
+       tested. Note that the Cyrus SASL library also supports GSSAPI,
+       and may be able to encrypt your session with it - you should use
+       SASL instead if you can.
+
 --with-ssl[=PFX]
-       enable SSL support with IMAP. SSL support requires you to have
-       OpenSSL headers and libraries properly installed before
+       enable SSL support with IMAP and POP. SSL support requires you to
+       have OpenSSL headers and libraries properly installed before
        compiling.  If the OpenSSL headers and libraries are not in the
        default system pats you can use the optional PFX argument to
        define the root directory of your installation.  The libraries
        are then expected to be found in PFX/lib and headers in
        PFX/include/openssl.
 
+--with-sasl[=PFX]
+       Use the Cyrus SASL library for IMAP or POP authentication. This
+       library provides generic support for several authentication methods,
+       and more may be added by the system administrator without recompiling
+       mutt. SASL may also be able to encrypt your mail session even if
+       SSL is not available.
+
 --disable-nls
        This switch disables mutt's native language support.
 

diff --git a/README.SSL b/README.SSL
index 72e9f485c3843d4045658e4b1fcd12989862d845..579e13f1c59f30a4e8a755e00451ed962dbe0f64 100644 (file)
--- a/README.SSL
+++ b/README.SSL
@@ -5,7 +5,7 @@ Compilation
 -----------
 If you want to have SSL support in mutt, you need to install OpenSSL
 (http://www.openssl.org) libraries and headers before compiling.
-OpenSSL versions 0.9.3 and 0.9.4 have been tested.
+OpenSSL versions 0.9.3 through 0.9.6a have been tested.
 
 For SSL support to be enabled, you need to run the ``configure''
 script with ``--enable-imap --with-ssl[=PFX]'' parameters.  If the
@@ -19,17 +19,20 @@ PFX/include/openssl.
 Usage
 -----
 IMAP/SSL folders can be accessed just like normal IMAP folders, but you
-will also have to add '/ssl' before the closing curly brace. 
+will also have to add '/ssl' before the closing curly brace. Or you can
+use IMAP url notation, where the methods is called imaps.
 
 For example:
        mailboxes {localhost/ssl}inbox
        mailboxes {localhost:994/ssl}inbox
-
+or
+       mailboxes imaps://localhost/inbox
+       mailboxes imaps://localhost:994/inbox
 
 If you get errors about lack of entropy, it means that Mutt was unable
 to find a source of random data to initialize SSL library with. Should
 this happen, you need to generate the data yourself and save it in a
-file pointed by $SslEntropyFile or $RANDFILE (environment) variables or
+file pointed by $entropy_file or $RANDFILE (environment) variables or
 in ~/.rnd.
 
 One way to generate random data would be to run a command which
@@ -41,7 +44,7 @@ calculating the MD5-sum from the output and saving it in a file.
 ** is run so don't put anything you can't afford to lose in that file.
 
 The files Mutt will try to use to initialize SSL library with are files
-pointed by $SslEntropyFile and $RANDFILE (or ~/.rnd if unset.) If your
+pointed by $entropy_file and $RANDFILE (or ~/.rnd if unset.) If your
 OpenSSL is version 0.9.5 or later, the previous files can also be EGD
 sockets (see http://www.lothar.com/tech/crypto/ for more information
 about Entropy Gathering Daemon) and in addition sockets in the following

diff --git a/rfc2047.c b/rfc2047.c
index 1e2f307070ae335d3df632531f72efe4c86013b2..a8bbfcbcd91526576a1462a112d197fec8959ef7 100644 (file)
--- a/rfc2047.c
+++ b/rfc2047.c
@@ -728,7 +728,7 @@ void rfc2047_decode (char **pd)
   const char *s = *pd;
   size_t dlen;
 
-  if (!*s || !s)
+  if (!s || !*s)
     return;
 
   dlen = 4 * strlen (s); /* should be enough */