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

"SunOS 5.10".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 75ab96c57a0db705f0a5c3a2b01254ff7d2d0b33..0e04adc935928b10c6056d60341eb2abe69c5d74 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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)

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 4ac523a2a17393b276becb455664e686791b5271..025b4ab6cf322a201a75c68e639521ddc483f54d 100644 (file)
--- 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)