* net/tramp-sh.el (tramp-find-shell): Apply workaround also for

"SunOS 5.10".

2 files changed, 10 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 75ab96c57a0..0e04adc9359 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2011-06-04  Michael Albinus  <michael.albinus@gmx.de>
 
+        * net/tramp-sh.el (tramp-find-shell): Apply workaround also for
+        "SunOS 5.10".
+
+2011-06-04  Michael Albinus  <michael.albinus@gmx.de>
+
         * net/tramp.el (tramp-set-completion-function, tramp-parse-rhosts)
         (tramp-parse-shosts, tramp-parse-sconfig, tramp-parse-shostkeys)
         (tramp-parse-hosts, tramp-parse-passwd, tramp-parse-netrc)
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 4ac523a2a17..025b4ab6cf3 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -3641,9 +3641,11 @@ file exists and nonzero exit status otherwise."
         (tramp-send-command vec "echo ~root" t)
         (cond
          ((or (string-match "^~root$" (buffer-string))
-              ;; The default shell (ksh93) of OpenSolaris is buggy.
-              (string-equal (tramp-get-connection-property vec "uname" "")
-                            "SunOS 5.11"))
+              ;; The default shell (ksh93) of OpenSolaris and Solaris
+              ;; is buggy.  We've got reports for "SunOS 5.10" and
+              ;; "SunOS 5.11" so far.
+              (string-match (regexp-opt '("SunOS 5.10" "SunOS 5.11"))
+                            (tramp-get-connection-property vec "uname" "")))
           (setq shell
                 (or (tramp-find-executable
                      vec "bash" (tramp-get-remote-path vec) t t)