From: Gerd Moellmann Date: Fri, 12 May 2000 18:38:28 +0000 (+0000) Subject: (ange-ftp-skip-msgs): Include 500 code.for X-Git-Tag: emacs-pretest-21.0.90~3980 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a8a3541c8e0d59a370620147212996f23f1df282;p=emacs.git (ange-ftp-skip-msgs): Include 500 code.for handling FTP security extensions. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 98963cf61ca..5fa54f59850 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -10,6 +10,9 @@ * time.el (display-time-mail-icon): Use `:ascent center'. + * ange-ftp.el (ange-ftp-skip-msgs): Include 500 code.for + handling FTP security extensions. + 2000-05-11 Dave Love * calendar/todo-mode.el: New file. diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 695a44fcaa5..fc39ae3eb51 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -666,11 +666,17 @@ parenthesized expressions in REGEXP for the components (in that order)." ;; mode and hangs. Have it ignore 550- instead. It will then barf ;; when it gets the 550 line, as it should. +;; RFC2228 "FTP Security Extensions" defines extensions to the FTP +;; protocol which involve the client requesting particular +;; authentication methods (typically) at connection establishment. Non +;; security-aware FTP servers should respond to this with a 500 code, +;; which we ignore. (defcustom ange-ftp-skip-msgs (concat "^200 \\(PORT\\|Port\\) \\|^331 \\|^150 \\|^350 \\|^[0-9]+ bytes \\|" "^Connected \\|^$\\|^Remote system\\|^Using\\|^ \\|Password:\\|" "^Data connection \\|" "^local:\\|^Trying\\|^125 \\|^550-\\|^221 .*oodbye\\|" + "^500 .*AUTH \\(KERBEROS\\|GSSAPI\\)\\|^KERBEROS\\|" "^227 .*[Pp]assive\\|^200 EPRT\\|^500 .*EPRT") "*Regular expression matching ftp messages that can be ignored." :group 'ange-ftp