aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2010-02-02 12:19:36 +0100
committerMichael Albinus2010-02-02 12:19:36 +0100
commitc35fcd52222a74cbb94b97f1e169aabd79e97417 (patch)
tree112c93188107cf78f39b6245b4cbaafb84d683e6
parent6ba973c19390ff813c5dd072df4b30ea2731a682 (diff)
downloademacs-c35fcd52222a74cbb94b97f1e169aabd79e97417.tar.gz
emacs-c35fcd52222a74cbb94b97f1e169aabd79e97417.zip
* net/ange-ftp.el (ange-ftp-skip-msgs): Ignore all ""^500 .*AUTH"
messages.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/ange-ftp.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b3de5b8baed..2f9b8510350 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-02-02 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/ange-ftp.el (ange-ftp-skip-msgs): Ignore all ""^500 .*AUTH"
4 messages.
5
12010-02-01 Juri Linkov <juri@jurta.org> 62010-02-01 Juri Linkov <juri@jurta.org>
2 7
3 * arc-mode.el (archive-zip-extract): Use `member-ignore-case' to 8 * arc-mode.el (archive-zip-extract): Use `member-ignore-case' to
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 98a3f557595..d443532ce2a 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -720,7 +720,7 @@ parenthesized expressions in REGEXP for the components (in that order)."
720 "^Connected \\|^$\\|^Remote system\\|^Using\\|^ \\|Password:\\|" 720 "^Connected \\|^$\\|^Remote system\\|^Using\\|^ \\|Password:\\|"
721 "^Data connection \\|" 721 "^Data connection \\|"
722 "^local:\\|^Trying\\|^125 \\|^550-\\|^221 .*oodbye\\|" 722 "^local:\\|^Trying\\|^125 \\|^550-\\|^221 .*oodbye\\|"
723 "^500 .*AUTH \\(KERBEROS\\|GSSAPI\\)\\|^KERBEROS\\|" 723 "^500 .*AUTH\\|^KERBEROS\\|"
724 "^530 Please login with USER and PASS\\|" ; non kerberised vsFTPd 724 "^530 Please login with USER and PASS\\|" ; non kerberised vsFTPd
725 "^534 Kerberos Authentication not enabled\\|" 725 "^534 Kerberos Authentication not enabled\\|"
726 "^22[789] .*[Pp]assive\\|^200 EPRT\\|^500 .*EPRT") 726 "^22[789] .*[Pp]assive\\|^200 EPRT\\|^500 .*EPRT")