;;; .netrc and .authinfo rc parsing
;;;
-;; use encrypt if loaded (encrypt-file-alist has to be set as well)
-(autoload 'encrypt-find-model "encrypt")
-(autoload 'encrypt-insert-file-contents "encrypt")
(defalias 'netrc-point-at-eol
(if (fboundp 'point-at-eol)
'point-at-eol
'line-end-position))
-(defvar encrypt-file-alist)
(eval-when-compile
;; This is unnecessary in the compiled version as it is a macro.
(if (fboundp 'bound-and-true-p)
(let ((tokens '("machine" "default" "login"
"password" "account" "macdef" "force"
"port"))
- (encryption-model (when (netrc-bound-and-true-p encrypt-file-alist)
- (encrypt-find-model file)))
alist elem result pair)
- (if encryption-model
- (encrypt-insert-file-contents file encryption-model)
- (insert-file-contents file))
+ (insert-file-contents file)
(goto-char (point-min))
;; Go through the file, line by line.
(while (not (eobp))
;; No machine name matches, so we look for default entries.
(while rest
(when (assoc "default" (car rest))
- (push (car rest) result))
+ (let ((elem (car rest)))
+ (setq elem (delete (assoc "default" elem) elem))
+ (push elem result)))
(pop rest)))
(when result
(setq result (nreverse result))
- (while (and result
- (not (netrc-port-equal
- (or port defaultport "nntp")
- ;; when port is not given in the netrc file,
- ;; it should mean "any port"
- (or (netrc-get (car result) "port")
- defaultport port))))
- (pop result))
- (car result))))
+ (if (not port)
+ (car result)
+ (while (and result
+ (not (netrc-port-equal
+ (or port defaultport "nntp")
+ ;; when port is not given in the netrc file,
+ ;; it should mean "any port"
+ (or (netrc-get (car result) "port")
+ defaultport port))))
+ (pop result))
+ (car result)))))
(defun netrc-machine-user-or-password (mode authinfo-file-or-list machines ports defaults)
"Get the user name or password according to MODE from AUTHINFO-FILE-OR-LIST.
(eq type (car (cddr service)))))))
(cadr service)))
+(defun netrc-store-data (file host port user password)
+ (with-temp-buffer
+ (when (file-exists-p file)
+ (insert-file-contents file))
+ (goto-char (point-max))
+ (unless (bolp)
+ (insert "\n"))
+ (insert (format "machine %s login %s password %s port %s\n"
+ host user password port))
+ (write-region (point-min) (point-max) file nil 'silent)))
+
;;;###autoload
(defun netrc-credentials (machine &rest ports)
"Return a user name/password pair.
listed in the PORTS list."
(let ((list (netrc-parse))
found)
- (while (and ports
- (not found))
- (setq found (netrc-machine list machine (pop ports))))
+ (if (not ports)
+ (setq found (netrc-machine list machine))
+ (while (and ports
+ (not found))
+ (setq found (netrc-machine list machine (pop ports)))))
(when found
(list (cdr (assoc "login" found))
(cdr (assoc "password" found))))))