GNU bug report logs - #49699
28.0.50; [PATCH] tramp-scp-strict-file-name-checking fails on macOS 10.14

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 49699 in the body.
You can then email your comments to 49699 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Alex Bochannek <alex <at> bochannek.com>
To: bug-gnu-emacs <at> gnu.org
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

[Message part 1 (text/plain, inline)]

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.

[Message part 2 (text/x-patch, inline)]

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)))

[Message part 3 (text/plain, inline)]

Thanks!

-- 
Alex.

Message #10 received at 49699-done <at> debbugs.gnu.org (full text, mbox):

From: Michael Albinus <michael.albinus <at> gmx.de>
To: Alex Bochannek <alex <at> bochannek.com>
Cc: 49699-done <at> debbugs.gnu.org
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

Version: 28.1

Alex Bochannek <alex <at> 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.

Message #13 received at 49699-done <at> debbugs.gnu.org (full text, mbox):

From: Alex Bochannek <alex <at> bochannek.com>
To: Michael Albinus <michael.albinus <at> gmx.de>
Cc: 49699-done <at> debbugs.gnu.org
Subject: Re: bug#49699: 28.0.50; [PATCH] tramp-scp-strict-file-name-checking
 fails on macOS 10.14
Date: Fri, 23 Jul 2021 14:24:53 -0700

Michael Albinus <michael.albinus <at> gmx.de> writes:

> Version: 28.1
>
> Alex Bochannek <alex <at> 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!

-- 
Alex.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.