diff options
| author | Chong Yidong | 2008-03-31 22:02:24 +0000 |
|---|---|---|
| committer | Chong Yidong | 2008-03-31 22:02:24 +0000 |
| commit | 54acead6896e1c443d6f60e375c74bd121d3da5d (patch) | |
| tree | 518f575b8480927ff83fc586cc2a1aff45be783d | |
| parent | 114cfbb83b3c86c9bc7598fd86a36025d0ddf1ea (diff) | |
| download | emacs-54acead6896e1c443d6f60e375c74bd121d3da5d.tar.gz emacs-54acead6896e1c443d6f60e375c74bd121d3da5d.zip | |
(url-digest-auth): Changed an if so that the interaction between the
PROMPT and OVERWRITE arguments can no longer result in the user being
queried twice for the same login and password information.
| -rw-r--r-- | lisp/url/url-auth.el | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el index 17e03fe2804..584924c8cd6 100644 --- a/lisp/url/url-auth.el +++ b/lisp/url/url-auth.el | |||
| @@ -188,18 +188,18 @@ instead of hostname:portnum." | |||
| 188 | (string= data (substring file 0 (length data))))) | 188 | (string= data (substring file 0 (length data))))) |
| 189 | (setq retval (cdr (car byserv)))) | 189 | (setq retval (cdr (car byserv)))) |
| 190 | (setq byserv (cdr byserv)))) | 190 | (setq byserv (cdr byserv)))) |
| 191 | (if (or (and (not retval) prompt) overwrite) | 191 | (if overwrite |
| 192 | (progn | 192 | (if (and (not retval) prompt) |
| 193 | (setq user (read-string (url-auth-user-prompt url realm) | 193 | (setq user (read-string (url-auth-user-prompt url realm) |
| 194 | (user-real-login-name)) | 194 | (user-real-login-name)) |
| 195 | pass (read-passwd "Password: ") | 195 | pass (read-passwd "Password: ") |
| 196 | retval (setq retval | 196 | retval (setq retval |
| 197 | (cons user | 197 | (cons user |
| 198 | (url-digest-auth-create-key | 198 | (url-digest-auth-create-key |
| 199 | user pass realm | 199 | user pass realm |
| 200 | (or url-request-method "GET") | 200 | (or url-request-method "GET") |
| 201 | url))) | 201 | url))) |
| 202 | byserv (assoc server url-digest-auth-storage)) | 202 | byserv (assoc server url-digest-auth-storage)) |
| 203 | (setcdr byserv | 203 | (setcdr byserv |
| 204 | (cons (cons file retval) (cdr byserv)))))) | 204 | (cons (cons file retval) (cdr byserv)))))) |
| 205 | (t (setq retval nil))) | 205 | (t (setq retval nil))) |