From: Reiner Steib <Reiner.Steib@gmx.de>
Date: Wed, 20 Aug 2003 13:16:43 +0000 (+0000)
Subject: (nnimap-open-connection): Allow different user names
X-Git-Url: http://cgit.sxemacs.org/?a=commitdiff_plain;h=584912439dde34f39c8abde7dbdf9df7f7f75fdf;p=gnus

(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 da5932069..ea23d5955 100644
--- 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 d36f225d4..062780883 100644
--- 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)