# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1285058118 -7200
# Node ID 6a4fac654761b3fa425734c8e7c3163a0265f7b6
# Parent  f963581bbc727b979a231b45a0af3ba7a8b50537
* net/ange-ftp.el (ange-ftp-skip-msgs): Add "^504 ..." message.

diff -r f963581bbc72 -r 6a4fac654761 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Sep 21 09:34:26 2010 +0200
+++ b/lisp/ChangeLog	Tue Sep 21 10:35:18 2010 +0200
@@ -1,3 +1,7 @@
+2010-09-21  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/ange-ftp.el (ange-ftp-skip-msgs): Add "^504 ..." message.
+
 2010-09-21  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* menu-bar.el (menu-bar-set-tool-bar-position): customize-set-variable
diff -r f963581bbc72 -r 6a4fac654761 lisp/net/ange-ftp.el
--- a/lisp/net/ange-ftp.el	Tue Sep 21 09:34:26 2010 +0200
+++ b/lisp/net/ange-ftp.el	Tue Sep 21 10:35:18 2010 +0200
@@ -722,6 +722,7 @@
 	  "^Data connection \\|"
 	  "^local:\\|^Trying\\|^125 \\|^550-\\|^221 .*oodbye\\|"
           "^500 .*AUTH\\|^KERBEROS\\|"
+          "^504 Unknown security mechanism\\|"
 	  "^530 Please login with USER and PASS\\|" ; non kerberised vsFTPd
 	  "^534 Kerberos Authentication not enabled\\|"
 	  "^22[789] .*[Pp]assive\\|^200 EPRT\\|^500 .*EPRT")