X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fauth-source.el;h=caead4fabfaba53b5dfb1d00235b1cfd25959736;hb=8339220cc25db3fbdab4367d6252e596bddd9cb1;hp=a86d8d87146475c36e487e9392689c3ce9af49ee;hpb=22e72ea454638f909a7827690b880909c8badcd0;p=gnus

diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index a86d8d871..caead4fab 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -32,9 +32,9 @@
 ;;; Code:
 
 (require 'gnus-util)
+(require 'netrc)
 
 (eval-when-compile (require 'cl))
-(autoload 'netrc-machine-user-or-password "netrc")
 (autoload 'secrets-create-item "secrets")
 (autoload 'secrets-delete-item "secrets")
 (autoload 'secrets-get-alias "secrets")
@@ -312,22 +312,41 @@ Return structure as specified by MODE."
     (setq result
 	  (mapcar
 	   (lambda (m)
-	     (if (equal "password" m)
-		 (let ((passwd (read-passwd "Password: ")))
-		   (cond
-		    ;; Secret Service API.
-		    ((consp source)
-		     (apply
-		      'secrets-create-item
-		      (auth-get-source entry) name passwd spec))
-		    (t)) ;; netrc not implemented yes.
-		   passwd)
-	       (or
-		;; the originally requested :user
-		user
-		"unknown-user")))
+	     (cons
+	      m
+	      (cond
+	       ((equal "password" m)
+		(let ((passwd (read-passwd
+			       (format "Password for %s on %s: " prot host))))
+		  (cond
+		   ;; Secret Service API.
+		   ((consp source)
+		    (apply
+		     'secrets-create-item
+		     (auth-get-source entry) name passwd spec))
+		   (t)) ;; netrc not implemented yes.
+		  passwd))
+	       ((equal "login" m)
+		(or user
+		    (read-string (format "User name for %s on %s: " prot host))))
+	       (t
+		"unknownuser"))))
 	   (if (consp mode) mode (list mode))))
-    (if (consp mode) result (car result))))
+    ;; Allow the source to save the data.
+    (cond
+     ((consp source)
+      ;; Secret Service API -- not implemented.
+      )
+     (t
+      ;; netrc interface.
+      (when (y-or-n-p (format "Do you want to save this password in %s? "
+			      source))
+	(netrc-store-data source host prot
+			  (or user (cdr (assoc "login" result)))
+			  (cdr (assoc "password" result))))))
+    (if (consp mode)
+	(mapcar #'cdr result)
+      (cdar result))))
 
 (defun auth-source-delete (entry &rest spec)
   "Delete credentials according to SPEC in ENTRY."
@@ -427,8 +446,12 @@ MODE can be \"login\" or \"password\"."
 	  (and found (return found)))
 
 	;; We haven't found something, so we will create it interactively.
-	(when (and (not found) choices create-missing)
-	  (setq found (apply 'auth-source-create mode (car choices) search)))
+	(when (and (not found) create-missing)
+	  (setq found (apply 'auth-source-create
+			     mode (if choices
+				      (car choices)
+				    (car auth-sources))
+			     search)))
 
 	;; Cache the result.
 	(when found