Changeset 1414:f8449f93c867

Timestamp:

1999-12-09 03:17:04 (9 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Tommi Komulainen's multiple IMAP usernames patch.

Files:

• browser.c (modified) (1 diff)
• doc/manual.sgml.head (modified) (1 diff)
• imap/README (modified) (1 diff)
• imap/auth.c (modified) (7 diffs)
• imap/browse.c (modified) (17 diffs)
• imap/imap.c (modified) (19 diffs)
• imap/imap.h (modified) (2 diffs)
• imap/imap_private.h (modified) (1 diff)
• imap/imap_socket.h (modified) (2 diffs)
• imap/imap_ssl.c (modified) (1 diff)
• imap/message.c (modified) (4 diffs)
• imap/socket.c (modified) (5 diffs)
• imap/util.c (modified) (1 diff)
• init.c (modified) (1 diff)

browser.c

@@ -809 +809 @@
         {
           char msg[LONG_STRING];
-          char* mbox;
+          IMAP_MBOX mx;
           int nentry = menu->current;
           
-          imap_parse_path (state.entry[nentry].name, NULL, 0, NULL,
-            NULL, &mbox);
+          imap_parse_path (state.entry[nentry].name, &mx);
           snprintf (msg, sizeof (msg), _("Really delete mailbox \"%s\"?"),
-            mbox);
+            mx.mbox);
           if (mutt_yesorno (msg, M_NO) == M_YES)
           {
-            if (!imap_delete_mailbox (Context, mbox))
+            if (!imap_delete_mailbox (Context, mx.mbox))
             {
               /* free the mailbox from the browser */

doc/manual.sgml.head

@@ -1960 +1960 @@
 <tt/{imapserver:port}inbox/.
 
+You can also specify different username for each folder, ie:
+<tt/{username@imapserver[:port]}inbox/.
+
 If Mutt was compiled with SSL support (by running the <em/configure/
 script with the <em/--enable-ssl/ flag), connections to IMAP servers
 can be encrypted. This naturally requires that the server supports
 SSL encrypted connections. To access a folder with IMAP/SSL, you should
-use <tt>{imapserver[:port]/ssl}path/to/folder</tt> as your 
+use <tt>{[username@]imapserver[:port]/ssl}path/to/folder</tt> as your 
 folder path.
 

imap/README

@@ -27 +27 @@
 * Preserve deleted messages if you don't choose to expunge them
 * Delete mailboxes (from the browser)
+* Multiple IMAP usernames

imap/auth.c

@@ -122 +122 @@
 
   /* get an IMAP service ticket for the server */
-  snprintf (buf1, sizeof (buf1), "imap@%s", idata->conn->server);
+  snprintf (buf1, sizeof (buf1), "imap@%s", idata->conn->mx.host);
   request_buf.value = buf1;
   request_buf.length = strlen (buf1) + 1;
@@ -478 +478 @@
   while (r != 0)
   {
-    if (!ImapUser)
-    {
-      strfcpy (user, NONULL(Username), sizeof (user));
-      if (mutt_get_field (_("IMAP Username: "), user, sizeof (user), 0) != 0)
-      {
-        user[0] = 0;
-        return (-1);
-      }
+    if (! (conn->mx.flags & M_IMAP_USER))
+    {
+      if (!ImapUser)
+      {
+        strfcpy (user, NONULL(Username), sizeof (user));
+        if (mutt_get_field (_("IMAP Username: "), user, sizeof (user), 0) != 0)
+        {
+          user[0] = 0;
+          return (-1);
+        }
+      }
+      else
+        strfcpy (user, ImapUser, sizeof (user));
     }
     else
-      strfcpy (user, ImapUser, sizeof (user));
+      strfcpy (user, conn->mx.user, sizeof (user));
 
     if (!user[0])
@@ -520 +525 @@
     if (mutt_bit_isset (idata->capabilities, ACRAM_MD5))
     {
-      if (!ImapCRAMKey)
-      {
-        ckey[0] = '\0';
-        snprintf (buf, sizeof (buf), _("CRAM key for %s@%s: "), user,
-          conn->server);
-        if (mutt_get_field (buf, ckey, sizeof (ckey), M_PASS) != 0)
-          return -1;
+      if (!(conn->mx.flags & M_IMAP_CRAM))
+      {
+        if (!ImapCRAMKey)
+        {
+          ckey[0] = '\0';
+          snprintf (buf, sizeof (buf), _("CRAM key for %s@%s: "), user,
+                    conn->mx.host);
+          if (mutt_get_field (buf, ckey, sizeof (ckey), M_PASS) != 0)
+            return -1;
+        }
+        else
+          strfcpy (ckey, ImapCRAMKey, sizeof (ckey));
       }
       else
-        strfcpy (ckey, ImapCRAMKey, sizeof (ckey));
+        strfcpy (ckey, conn->mx.pass, sizeof (ckey));
 
       if (*ckey)
@@ -537 +547 @@
           mutt_error _("CRAM-MD5 authentication failed.");
           sleep (1);
+          if (!(conn->mx.flags & M_IMAP_CRAM))
+            FREE (&ImapCRAMKey);
+          conn->mx.flags &= ~M_IMAP_CRAM;
         }
         else
+        {
+          strfcpy (conn->mx.pass, ckey, sizeof (conn->mx.pass));
+          conn->mx.flags |= M_IMAP_CRAM;
           return 0;
+        }
       }
       else
@@ -550 +567 @@
       dprint (2, (debugfile, "CRAM-MD5 authentication is not available\n"));
         
-    if (!ImapPass)
-    {
-      pass[0]=0;
-      snprintf (buf, sizeof (buf), _("Password for %s@%s: "), user, conn->server);
-      if (mutt_get_field (buf, pass, sizeof (pass), M_PASS) != 0 ||
-          !pass[0])
-      {
-        return (-1);
-      }
+    if (! (conn->mx.flags & M_IMAP_PASS))
+    {
+      if (!ImapPass)
+      {
+        pass[0]=0;
+        snprintf (buf, sizeof (buf), _("Password for %s@%s: "), user, conn->mx.host);
+        if (mutt_get_field (buf, pass, sizeof (pass), M_PASS) != 0 ||
+            !pass[0])
+        {
+          return (-1);
+        }
+      }
+      else
+        strfcpy (pass, ImapPass, sizeof (pass));
     }
     else
-      strfcpy (pass, ImapPass, sizeof (pass));
+      strfcpy (pass, conn->mx.pass, sizeof (pass));
 
     imap_quote_string (q_user, sizeof (q_user), user);
@@ -581 +603 @@
       sleep (1);
 
-      FREE (&ImapUser);
-      FREE (&ImapPass);
+      if (!(conn->mx.flags & M_IMAP_USER))
+        FREE (&ImapUser);
+      if (!(conn->mx.flags & M_IMAP_PASS))
+        FREE (&ImapPass);
+      conn->mx.flags &= ~M_IMAP_PASS;
     }
     else
@@ -588 +613 @@
       /* If they have a successful login, we may as well cache the 
        * user/password. */
-      if (!ImapUser)
-        ImapUser = safe_strdup (user);
-      if (!ImapPass)
-        ImapPass = safe_strdup (pass);
+      if (!(conn->mx.flags & M_IMAP_USER))
+        strfcpy (conn->mx.user, user, sizeof (conn->mx.user));
+      if (!(conn->mx.flags & M_IMAP_PASS))
+        strfcpy (conn->mx.pass, pass, sizeof (conn->mx.pass));
+      
+      conn->mx.flags |= (M_IMAP_USER | M_IMAP_PASS);
     }
   }

imap/browse.c

@@ -44 +44 @@
   char nsbuf[LONG_STRING];
   char mbox[LONG_STRING];
-  char host[SHORT_STRING];
-  int port;
   char list_cmd[5];
   char seq[16];
-  char *ipath = NULL;
   IMAP_NAMESPACE_INFO nsi[16];
   int home_namespace = 0;
@@ -60 +57 @@
   int noselect;
   int noinferiors;
-
-  if (imap_parse_path (path, host, sizeof (host), &port, NULL, &ipath))
+  IMAP_MBOX mx;
+
+  if (imap_parse_path (path, &mx))
   {
     mutt_error ("%s is an invalid IMAP path", path);
@@ -69 +67 @@
   strfcpy (list_cmd, option (OPTIMAPLSUB) ? "LSUB" : "LIST", sizeof (list_cmd));
 
-  conn = mutt_socket_select_connection (host, port, 0);
+  conn = mutt_socket_select_connection (&mx, 0);
   idata = CONN_DATA;
 
@@ -85 +83 @@
   }
 
-  if (ipath[0] == '\0')
+  if (mx.mbox[0] == '\0')
   {
     home_namespace = 1;
     mbox[0] = 0;                /* Do not replace "" with "INBOX" here */
-    ipath = ImapHomeNamespace;
+    mx.mbox = ImapHomeNamespace;
     nns = 0;
     if (mutt_bit_isset(idata->capabilities,NAMESPACE))
@@ -99 +97 @@
         return (-1);
     }
-    if (!ipath)         /* Any explicitly set imap_home_namespace wins */
+    if (!mx.mbox)               /* Any explicitly set imap_home_namespace wins */
     { 
       for (i = 0; i < nns; i++)
@@ -105 +103 @@
             (nsi[i].type == IMAP_NS_PERSONAL || nsi[i].type == IMAP_NS_SHARED))
         {
-          ipath = nsi->prefix;
+          mx.mbox = nsi->prefix;
           nsi->home_namespace = 1;
           break;
@@ -114 +112 @@
   mutt_message _("Contacted server, getting folder list...");
 
-  if (ipath && ipath[0] != '\0')
-  {
-    imap_fix_path (idata, ipath, mbox, sizeof (mbox));
+  if (mx.mbox && mx.mbox[0] != '\0')
+  {
+    imap_fix_path (idata, mx.mbox, mbox, sizeof (mbox));
     n = mutt_strlen (mbox);
 
@@ -154 +152 @@
     {
       showparents = 1;
-      imap_qualify_path (buf, sizeof (buf), host, port, mbox, NULL);
+      imap_qualify_path (buf, sizeof (buf), &mx, mbox, NULL);
       state->folder = safe_strdup (buf);
       n--;
@@ -183 +181 @@
         ctmp = mbox[n];
         mbox[n] = '\0';
-        imap_qualify_path (buf, sizeof (buf), host, port, mbox, NULL);
+        imap_qualify_path (buf, sizeof (buf), &mx, mbox, NULL);
         state->folder = safe_strdup (buf);
       }
@@ -198 +196 @@
       if (!state->folder)
       {
-        imap_qualify_path (buf, sizeof (buf), host, port, relpath, NULL);
+        imap_qualify_path (buf, sizeof (buf), &mx, relpath, NULL);
         state->folder = safe_strdup (buf);
       }
@@ -207 +205 @@
   if (!state->folder)
   {
-    imap_qualify_path (buf, sizeof (buf), host, port, NULL, NULL);
+    imap_qualify_path (buf, sizeof (buf), &mx, NULL, NULL);
     state->folder = safe_strdup (buf);
   }
@@ -249 +247 @@
   IMAP_DATA *idata = CONN_DATA;
   char buf[LONG_STRING];
-  char host[SHORT_STRING];
-  int port;
-  char *curfolder;
   char *name;
   int noselect;
   int noinferiors;
-
-  if (imap_parse_path (state->folder, host, sizeof (host), &port, NULL, &curfolder))
+  IMAP_MBOX mx;
+
+  if (imap_parse_path (state->folder, &mx))
   {
     dprint (2, (debugfile,
@@ -278 +274 @@
         noselect = 1;
       /* prune current folder from output */
-      if (isparent || strncmp (name, curfolder, strlen (name)))
+      if (isparent || strncmp (name, mx.mbox, strlen (name)))
         imap_add_folder (idata->delim, name, noselect, noinferiors, state,
           isparent);
@@ -295 +291 @@
   char tmp[LONG_STRING];
   char relpath[LONG_STRING];
-  char host[SHORT_STRING];
-  int port;
-  char *curfolder;
   int flen = strlen (folder);
-
-  if (imap_parse_path (state->folder, host, sizeof (host), &port, NULL, &curfolder))
+  IMAP_MBOX mx;
+
+  if (imap_parse_path (state->folder, &mx))
     return;
 
@@ -321 +315 @@
     strfcpy (relpath, "../", sizeof (relpath));
   /* strip current folder from target, to render a relative path */
-  else if (!strncmp (curfolder, folder, strlen (curfolder)))
-    strfcpy (relpath, folder + strlen (curfolder), sizeof (relpath));
+  else if (!strncmp (mx.mbox, folder, strlen (mx.mbox)))
+    strfcpy (relpath, folder + strlen (mx.mbox), sizeof (relpath));
   else
     strfcpy (relpath, folder, sizeof (relpath));
@@ -334 +328 @@
   if (!noselect)
   {
-    imap_qualify_path (tmp, sizeof (tmp), host, port, folder, NULL);
+    imap_qualify_path (tmp, sizeof (tmp), &mx, folder, NULL);
     (state->entry)[state->entrylen].name = safe_strdup (tmp);
 
@@ -350 +344 @@
     trailing_delim[0] = (flen && folder[flen - 1] != delim) ? delim : '\0';
 
-    imap_qualify_path (tmp, sizeof (tmp), host, port, folder, trailing_delim);
+    imap_qualify_path (tmp, sizeof (tmp), &mx, folder, trailing_delim);
     (state->entry)[state->entrylen].name = safe_strdup (tmp);
 

imap/imap.c

@@ -538 +538 @@
   char buf[LONG_STRING];
   char bufout[LONG_STRING];
-  char host[SHORT_STRING];
   char seq[16];
-  char *pc = NULL;
   int count = 0;
   int n;
-  int port;
-  int socktype;
-
-  if (imap_parse_path (ctx->path, host, sizeof (host), &port, &socktype, &pc))
+  IMAP_MBOX mx;
+  
+  if (imap_parse_path (ctx->path, &mx))
   {
     mutt_error ("%s is an invalid IMAP path", ctx->path);
@@ -552 +549 @@
   }
 
-  conn = mutt_socket_select_connection (host, port, 0);
+  conn = mutt_socket_select_connection (&mx, 0);
   idata = CONN_DATA;
 
@@ -563 +560 @@
       idata = safe_calloc (1, sizeof (IMAP_DATA));
 
-      conn = mutt_socket_select_connection (host, port, socktype);
+      conn = mutt_socket_select_connection (&mx, 1);
       conn->data = idata;
       idata->conn = conn;
@@ -573 +570 @@
 
   /* Clean up path and replace the one in the ctx */
-  imap_fix_path (idata, pc, buf, sizeof (buf));
+  imap_fix_path (idata, mx.mbox, buf, sizeof (buf));
   FREE(&(idata->selected_mailbox));
   idata->selected_mailbox = safe_strdup (buf);
-  imap_qualify_path (buf, sizeof (buf), host, port, idata->selected_mailbox,
+  imap_qualify_path (buf, sizeof (buf), &mx, idata->selected_mailbox,
     NULL);
 
@@ -598 +595 @@
   do
   {
+    char *pc;
+    
     if (mutt_socket_read_line_d (buf, sizeof (buf), conn) < 0)
       break;
@@ -713 +712 @@
   IMAP_DATA* idata;
   CONNECTION* conn;
-  char host[SHORT_STRING];
-  int port;
   char curpath[LONG_STRING];
-  char* mbox = NULL;
+  IMAP_MBOX mx;
 
   strfcpy (curpath, path, sizeof (curpath));
   /* check that the target folder makes sense */
-  if (imap_parse_path (curpath, host, sizeof (host), &port, NULL, &mbox))
+  if (imap_parse_path (curpath, &mx))
     return -1;
 
   /* and that it's on the same server as the current folder */
-  conn = mutt_socket_select_connection (host, port, 0);
+  conn = mutt_socket_select_connection (&mx, 0);
   if (!CTX_DATA || !CONN_DATA || (CTX_DATA->conn != CONN_DATA->conn))
   {
@@ -748 +745 @@
   CONNECTION *conn;
   IMAP_DATA *idata;
-  char host[SHORT_STRING];
   char buf[LONG_STRING], mbox[LONG_STRING];
   char mailbox[LONG_STRING];
-  char *pc;
   int r;
-  int port;
-  int socktype;
-
-  if (imap_parse_path (ctx->path, host, sizeof (host), &port, &socktype, &pc))
+  IMAP_MBOX mx;
+
+  if (imap_parse_path (ctx->path, &mx))
     return (-1);
 
   ctx->magic = M_IMAP;
 
-  conn = mutt_socket_select_connection (host, port, 0);
+  conn = mutt_socket_select_connection (&mx, 0);
   idata = CONN_DATA;
 
@@ -780 +774 @@
   /* check mailbox existance */
 
-  imap_fix_path (idata, pc, mailbox, sizeof (mailbox));
+  imap_fix_path (idata, mx.mbox, mailbox, sizeof (mailbox));
 
   imap_quote_string (mbox, sizeof (mbox), mailbox);
@@ -1168 +1162 @@
   CONNECTION *conn;
   IMAP_DATA *idata;
-  char host[SHORT_STRING];
   char buf[LONG_STRING];
   char mbox[LONG_STRING];
@@ -1174 +1167 @@
   char seq[8];
   char *s;
-  char *pc;
   int msgcount = 0;
-  int port;
-
-  if (imap_parse_path (path, host, sizeof (host), &port, NULL, &pc))
-    return -1;
-
-  conn = mutt_socket_select_connection (host, port, 0);
+  IMAP_MBOX mx;
+  
+  if (imap_parse_path (path, &mx))
+    return -1;
+
+  conn = mutt_socket_select_connection (&mx, 0);
   idata = CONN_DATA;
 
@@ -1201 +1193 @@
   }
 
-  imap_fix_path (idata, pc, buf, sizeof (buf));
+  imap_fix_path (idata, mx.mbox, buf, sizeof (buf));
   /* Update the path, if it fits */
-  if (strlen (buf) < strlen (pc))
-      strcpy (pc, buf);
+  if (strlen (buf) < strlen (mx.mbox))
+      strcpy (mx.mbox, buf);
 
   imap_make_sequence (seq, sizeof (seq));               
@@ -1359 +1351 @@
   char buf[LONG_STRING];
   char mbox[LONG_STRING];
-  char host[SHORT_STRING];
-  char *ipath = NULL;
-  int port;
-
-  if (imap_parse_path (path, host, sizeof (host), &port, NULL, &ipath))
+  IMAP_MBOX mx;
+
+  if (imap_parse_path (path, &mx))
     return (-1);
 
-  conn = mutt_socket_select_connection (host, port, 0);
+  conn = mutt_socket_select_connection (&mx, 0);
   idata = CONN_DATA;
 
@@ -1382 +1372 @@
   }
 
-  imap_fix_path (idata, ipath, buf, sizeof (buf));
+  imap_fix_path (idata, mx.mbox, buf, sizeof (buf));
   if (subscribe)
     mutt_message (_("Subscribing to %s..."), buf);
@@ -1403 +1393 @@
   CONNECTION* conn;
   IMAP_DATA* idata;
-  char host[SHORT_STRING];
-  int port;
   char list[LONG_STRING];
   char buf[LONG_STRING];
   char seq[16];
-  char* mbox = NULL;
   char* list_word = NULL;
   int noselect, noinferiors;
@@ -1416 +1403 @@
   int completions = 0;
   int pos = 0;
+  IMAP_MBOX mx;
 
   /* verify passed in path is an IMAP path */
-  if (imap_parse_path (path, host, sizeof(host), &port, NULL, &mbox))
+  if (imap_parse_path (path, &mx))
   {
     dprint(2, (debugfile, "imap_complete: bad path %s\n", path));
@@ -1424 +1412 @@
   }
 
-  conn = mutt_socket_select_connection (host, port, 0);
+  conn = mutt_socket_select_connection (&mx, 0);
   idata = CONN_DATA;
 
@@ -1437 +1425 @@
   /* reformat path for IMAP list, and append wildcard */
   /* don't use INBOX in place of "" */
-  if (mbox[0])
-    imap_fix_path (idata, mbox, list, sizeof(list));
+  if (mx.mbox[0])
+    imap_fix_path (idata, mx.mbox, list, sizeof(list));
   else
     list[0] = '\0';
@@ -1449 +1437 @@
 
   /* and see what the results are */
-  strfcpy (completion, mbox, sizeof(completion));
+  strfcpy (completion, mx.mbox, sizeof(completion));
   do
   {
@@ -1493 +1481 @@
   {
     /* reformat output */
-    imap_qualify_path (dest, dlen, host, port, completion, NULL);
+    imap_qualify_path (dest, dlen, &mx, completion, NULL);
     mutt_pretty_mailbox (dest);
 

imap/imap.h

@@ -22 +22 @@
 #include "browser.h"
 #include "mailbox.h"
+
+typedef struct
+{
+  char user[32];
+  char pass[32];
+  char host[128];
+  int port;
+  char type[16];
+  int socktype;
+  char *mbox;
+  int flags;
+} IMAP_MBOX;
+
 
 /* imap.c */
@@ -48 +61 @@
 
 /* util.c */
-int imap_parse_path (char* path, char* host, size_t hlen, int* port,
-  int *socktype, char** mbox);
-void imap_qualify_path (char* dest, size_t len, const char* host, int port,
+int imap_parse_path (const char* path, IMAP_MBOX *mx);
+void imap_qualify_path (char* dest, size_t len, const IMAP_MBOX *mx,
   const char* path, const char* name);
 

imap/imap_private.h

@@ -32 +32 @@
 
 #define SEQLEN 5
+
+#define M_IMAP_USER (1<<0)
+#define M_IMAP_PORT (1<<1)