From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 7 Nov 2019 17:40:13 +0000 (+0100)
Subject: Handle different system names of w32 in Tramp (Bug#38079)
X-Git-Tag: emacs-27.0.90~705
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e8bcf45f306bcf4c9e8d643d68e4aabe0c69c7ca;p=emacs.git

Handle different system names of w32 in Tramp (Bug#38079)

* lisp/net/tramp.el (tramp-restricted-shell-hosts-alist):
Initialize with `system-name' in small and capital chars.
---

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 09d125945a1..50f8c5d9915 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -458,15 +458,20 @@ interpreted as a regular expression which always matches."
   :version "24.3"
   :type 'boolean)
 
+;; For some obscure technical reasons, `system-name' on w32 returns
+;; either lower case or upper case letters.  See
+;; <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=38079#20>.
 (defcustom tramp-restricted-shell-hosts-alist
   (when (memq system-type '(windows-nt))
-    (list (concat "\\`" (regexp-quote (system-name)) "\\'")))
+    (list (format "\\`\\(%s\\|%s\\)\\'"
+		  (regexp-quote (downcase (system-name)))
+		  (regexp-quote (upcase (system-name))))))
   "List of hosts, which run a restricted shell.
 This is a list of regular expressions, which denote hosts running
-a registered shell like \"rbash\".  Those hosts can be used as
+a restricted shell like \"rbash\".  Those hosts can be used as
 proxies only, see `tramp-default-proxies-alist'.  If the local
-host runs a registered shell, it shall be added to this list, too."
-  :version "24.3"
+host runs a restricted shell, it shall be added to this list, too."
+  :version "27.1"
   :type '(repeat (regexp :tag "Host regexp")))
 
 (defcustom tramp-local-host-regexp