* net/ange-ftp.el (ange-ftp-skip-msgs): Add "^504 ..." message.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 275bee9fa19c2fe0eb41360dc09f22b76b8a062b..e293d7612ba9d9ef293c6034edaaa7745e289d71 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index dcc6ddabcdcee85aa2fca84a1a9dde274dbeee02..4b63dfd75354d5858fc6c91978dacfef1d013586 100644 (file)
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -722,6 +722,7 @@ parenthesized expressions in REGEXP for the components (in that order)."
          "^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")