From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Wed, 30 Jun 2021 12:27:49 +0000 (+0200)
Subject: Fix problem when creating an .authinfo entry with an existing machine name
X-Git-Tag: emacs-28.0.90~2005
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=81622484bc711f98bf7b4b5f84052590a0ae5d3f;p=emacs.git

Fix problem when creating an .authinfo entry with an existing machine name

* lisp/auth-source.el (auth-source-netrc-create): Don't return the
incorrect data if there's a matching host entry but the wrong user
name (bug#49289).
---

diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 9ca28ebb0a9..69197383982 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -1270,7 +1270,7 @@ See `auth-source-search' for details on SPEC."
 ;; (auth-source-search :host "nonesuch" :type 'netrc :max 1 :create t :create-extra-keys '((A "default A") (B)))
 
 (cl-defun auth-source-netrc-create (&rest spec
-                                    &key backend host port create
+                                    &key backend host port create user
                                     &allow-other-keys)
   (let* ((base-required '(host user port secret))
          ;; we know (because of an assertion in auth-source-search) that the
@@ -1278,6 +1278,7 @@ See `auth-source-search' for details on SPEC."
          (create-extra (if (eq t create) nil create))
          (current-data (car (auth-source-search :max 1
                                                 :host host
+                                                :user user
                                                 :port port)))
          (required (append base-required create-extra))
          (file (oref backend source))