emacs-bug-tracker
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#49699: closed (28.0.50; [PATCH] tramp-scp-strict-file-name-checking


From: GNU bug Tracking System
Subject: bug#49699: closed (28.0.50; [PATCH] tramp-scp-strict-file-name-checking fails on macOS 10.14)
Date: Fri, 23 Jul 2021 18:34:02 +0000

Your message dated Fri, 23 Jul 2021 20:32:50 +0200
with message-id <87k0lgvq25.fsf@gmx.de>
and subject line Re: bug#49699: 28.0.50; [PATCH] 
tramp-scp-strict-file-name-checking fails on macOS 10.14
has caused the debbugs.gnu.org bug report #49699,
regarding 28.0.50; [PATCH] tramp-scp-strict-file-name-checking fails on macOS 
10.14
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
49699: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=49699
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
--- Begin Message --- Subject: 28.0.50; [PATCH] tramp-scp-strict-file-name-checking fails on macOS 10.14 Date: Thu, 22 Jul 2021 12:42:53 -0700 User-agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (darwin)
Hello!

On macOS 10.14 (and some 10.15) with a pre-8.0 OpenSSH, the check for
the `-T' option when using SCP gives an incorrect result because the
error message (presumably from the BSD getopt(3)) is different than what
is checked for. The below patch fixes that.

Apple upgraded OpenSSH from 7.9 to 8.1 for macOS 10.15.4 and with that
the `-T' option to SCP became available.
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 8b4c78fe65..f94508303d 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4782,7 +4782,9 @@ tramp-scp-strict-file-name-checking
              (with-temp-buffer
                (tramp-call-process vec "scp" nil t nil "-T")
                (goto-char (point-min))
-               (unless (search-forward-regexp "unknown option -- T" nil t)
+               (unless
+                    (search-forward-regexp
+                     "\\(illegal\\|unknown\\) option -- T" nil t)
                  (setq tramp-scp-strict-file-name-checking "-T")))))))
       tramp-scp-strict-file-name-checking)))
Thanks!

-- 
Alex.

--- End Message ---
--- Begin Message --- Subject: Re: bug#49699: 28.0.50; [PATCH] tramp-scp-strict-file-name-checking fails on macOS 10.14 Date: Fri, 23 Jul 2021 20:32:50 +0200 User-agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux)
Version: 28.1

Alex Bochannek <alex@bochannek.com> writes:

> Hello!

Hi Alex,

> On macOS 10.14 (and some 10.15) with a pre-8.0 OpenSSH, the check for
> the `-T' option when using SCP gives an incorrect result because the
> error message (presumably from the BSD getopt(3)) is different than what
> is checked for. The below patch fixes that.

Thanks for this, I've pushed it to master. Closing the bug.

> Thanks!

Best regards, Michael.


--- End Message ---

reply via email to

[Prev in Thread] Current Thread [Next in Thread]