Changeset 5497:2731e5174c5a

Timestamp:

2008-08-26 23:09:13 (3 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

Properly set the SASL external auth name when using SSL client certs.
Also zero out the account structure before filling it with available
data. Client certificates + SASL EXTERNAL were only working by luck.

Files:

• ChangeLog (modified) (1 diff)
• imap/util.c (modified) (2 diffs)
• mutt_sasl.c (modified) (2 diffs)
• mutt_ssl.c (modified) (1 diff)
• mutt_ssl_gnutls.c (modified) (1 diff)

ChangeLog

@@ -1 @@
-2008-08-25 00:16 -0700  Brendan Cully  <brendan@kublai.com>  (53d9210aa4ee)
+2008-08-26 02:07 -0700  Brendan Cully  <brendan@kublai.com>  (22498996719f)
+
+        * imap/imap.c: Remove leftover IMAP IDLE handling from before
+        [53d9210aa4ee].
+
+2008-08-25 00:52 -0700  Brendan Cully  <brendan@kublai.com>  (36aa1130091a)
+
+        * UPDATING, globals.h, imap/command.c, imap/imap.c,
+        imap/imap_private.h, imap/util.c, init.c, init.h: Introduce
+        $imap_pipeline_depth. This lets users control the number of
+        commands that mutt will queue up before sending them to the
+        server. Setting this to 0 disables pipelining, which should close
+        #2892.
 
         * imap/command.c, imap/imap.c, imap/imap_private.h, imap/message.c:

imap/util.c

@@ -2 +2 @@
  * Copyright (C) 1996-8 Michael R. Elkins <me@mutt.org>
  * Copyright (C) 1996-9 Brandon Long <blong@fiction.net>
- * Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>
+ * Copyright (C) 1999-2008 Brendan Cully <brendan@kublai.com>
  * 
  *     This program is free software; you can redistribute it and/or modify
@@ -190 +190 @@
 
   /* Defaults */
-  mx->account.flags = 0;
+  memset(&mx->account, 0, sizeof(mx->account));
   mx->account.port = ImapPort;
   mx->account.type = M_ACCT_TYPE_IMAP;

mutt_sasl.c

@@ -1 +1 @@
 /*
- * Copyright (C) 2000-7 Brendan Cully <brendan@kublai.com>
+ * Copyright (C) 2000-8 Brendan Cully <brendan@kublai.com>
  * 
  *     This program is free software; you can redistribute it and/or modify
@@ -247 +247 @@
       return -1;
     }
+  }
+  if (conn->account.user[0])
+  {
     dprint (2, (debugfile, "External authentication name: %s\n", conn->account.user));
     if (sasl_setprop (*saslconn, SASL_AUTH_EXTERNAL, conn->account.user) != SASL_OK)

mutt_ssl.c

@@ -875 +875 @@
     SSL_CTX_use_certificate_file(ssldata->ctx, SslClientCert, SSL_FILETYPE_PEM);
     SSL_CTX_use_PrivateKey_file(ssldata->ctx, SslClientCert, SSL_FILETYPE_PEM);
+    
+    /* if we are using a client cert, SASL may expect an external auth name */
+    mutt_account_getuser (&conn->account);
   }
 }

mutt_ssl_gnutls.c

@@ -216 +216 @@
     *cnend = '\0';
 
-  dprint (2, (debugfile, "client CN: %s\n", cn));
+  /* if we are using a client cert, SASL may expect an external auth name */
+  mutt_account_getuser (&conn->account);
 
 err_dn: