(nnimap-open-connection): Allow different user names

on the same server (and in the same authinfo file).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index da59320..ea23d59 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-20  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * nnimap.el (nnimap-open-connection): Allow different user names
+       on the same server (and in the same authinfo file).
+
 2003-08-20  Jesper Harder  <harder@ifa.au.dk>
 
        * gnus-sieve.el (gnus-sieve-crosspost): Fix type.

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index d36f225..0627808 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -720,9 +720,11 @@ If EXAMINE is non-nil the group is selected read-only."
           (port (if nnimap-server-port
                     (int-to-string nnimap-server-port)
                   "imap"))
-          (alist (gnus-netrc-machine list (or nnimap-server-address
-                                              nnimap-address server)
-                                     port "imap"))
+          (alist (or (gnus-netrc-machine list server port "imap")
+                     (gnus-netrc-machine list
+                                         (or nnimap-server-address
+                                             nnimap-address)
+                                         port "imap")))
           (user (gnus-netrc-get alist "login"))
           (passwd (gnus-netrc-get alist "password")))
       (if (imap-authenticate user passwd nnimap-server-buffer)