Merge pull request #4532 from grondo/issue#3731

fix ssh connector with csh/tcsh shells

Author: mergify[bot]

src/connectors/ssh/ssh.c

@@ -152,6 +152,8 @@ int build_ssh_command (const char *uri_path,
 
     /* LD_LIBRARY_PATH */
     if (ld_lib_path) {
+        if (argz_add (&argz, &argz_len, "env") != 0)
+            goto nomem;
         (void)snprintf (buf, sizeof (buf), "LD_LIBRARY_PATH=%s", ld_lib_path);
         if (argz_add (&argz, &argz_len, buf) != 0)
             goto nomem;

t/scripts/tssh

@@ -25,4 +25,4 @@ echo hostname=${hostname} >&2
 echo cmd=\"$*\" >&2
 
 unset FLUX_URI
-eval $*
+exec $SHELL -c "$*"

t/t1106-ssh-connector.t

@@ -21,6 +21,15 @@ test_expect_success 'ssh:// with local sockdir works' '
 	  grep hostname=localhost basic.err &&
 	  grep cmd= basic.err | grep "flux relay $TEST_SOCKDIR"
 '
+test -x /bin/tcsh && test_set_prereq HAVE_TCSH
+test_expect_success HAVE_TCSH 'ssh:// with local sockdir and SHELL=tcsh works' '
+	FLUX_URI=ssh://localhost${TEST_SOCKDIR} \
+	FLUX_SSH=$TEST_SSH \
+	SHELL=/bin/tcsh \
+	  flux getattr size 2>basic.err &&
+	  grep hostname=localhost basic.err &&
+	  grep cmd= basic.err | grep "flux relay $TEST_SOCKDIR"
+'
 
 test_expect_success 'ssh:// with local sockdir and port works' '
 	FLUX_URI=ssh://localhost:42${TEST_SOCKDIR} FLUX_SSH=$TEST_SSH \