From: Ted Zlatanov <tzz@lifelogs.com>
Date: Tue, 29 Oct 2013 13:19:11 +0000 (-0400)
Subject: Search the netrc entries for the logical server name, then the actual.
X-Git-Url: http://cgit.sxemacs.org/?a=commitdiff_plain;h=9910a6dc485cc75301c8e69913f92836b90f3b63;p=gnus

Search the netrc entries for the logical server name, then the actual.

* nnimap.el (nnimap-open-connection-1): `auth-source-search' for the
`nnoo-current-server' first, then for the actual `nnimap-address' to
allow netrc entries for the nnoo server to coexist with netrc entries
for the `nnimap-address'.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cf1d4fff8..87ff85536 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-10-29  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* nnimap.el (nnimap-open-connection-1): `auth-source-search' for the
+	`nnoo-current-server' first, then for the actual `nnimap-address' to
+	allow netrc entries for the nnoo server to coexist with netrc entries
+	for the `nnimap-address'.
+
 2013-10-23  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* mm-decode.el (mm-dissect-buffer): Revert last change.
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index f8c2b24cc..2220c81e7 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -456,8 +456,8 @@ textual parts.")
                                (nnimap-credentials
 				(gnus-delete-duplicates
 				 (list
-				  nnimap-address
-				  (nnoo-current-server 'nnimap)))
+                                  (nnoo-current-server 'nnimap)
+				  nnimap-address))
                                 ports
                                 nnimap-user))))
 		  (setq nnimap-object nil)