# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 804474442 0
# Node ID 597f9723ddf66dbda5a207edbd39cd1d707d94a7
# Parent  5f4248eb4bddabc61083bb29451a8472ccc92113
(ange-ftp-normal-login): if ange-ftp-smart-gateway
is set but ange-ftp-gateway-host is nil, use user@host proxy protocol.

diff -r 5f4248eb4bdd -r 597f9723ddf6 lisp/ange-ftp.el
--- a/lisp/ange-ftp.el	Fri Jun 30 00:23:08 1995 +0000
+++ b/lisp/ange-ftp.el	Fri Jun 30 01:07:22 1995 +0000
@@ -1861,9 +1861,10 @@
 (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 @@
 				(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