procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(ange-ftp-normal-login): if ange-ftp-smart-gateway

Browse source 
is set but ange-ftp-gateway-host is nil, use user@host proxy protocol.
This commit is contained in:
Richard M. Stallman 1995-06-30 01:07:22 +00:00
parent 83656a198b
commit 222e97c1b9
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/ange-ftp.el
View file

@ -1861,9 +1861,10 @@ host specified in ``ange-ftp-gateway-host''."
(defun ange-ftp-normal-login (host user pass account proc)
"Connect to the FTP-server on HOST as USER using PASSWORD and ACCOUNT.
PROC is the process to the FTP-client."
(let ((result (ange-ftp-raw-send-cmd
(let* ((nshost (ange-ftp-nslookup-host host))
(result (ange-ftp-raw-send-cmd
proc
(format "open %s" (ange-ftp-nslookup-host host))
(format "open %s" nshost)
(format "Opening FTP connection to %s" host))))
(or (car result)
(ange-ftp-error host user
@ -1871,7 +1872,9 @@ PROC is the process to the FTP-client."
(cdr result))))
(setq result (ange-ftp-raw-send-cmd
proc
(format "user \"%s\" %s %s" user pass account)
(if (ange-ftp-use-smart-gateway-p host)
(format "user \"%s\"@%s %s %s" user nshost pass account)
(format "user \"%s\" %s %s" user pass account))
(format "Logging in as user %s@%s" user host)))
(or (car result)
(progn