On Sun, Jun 11, 2006 at 11:30:13AM +0200, steven mestdagh wrote: > i had a very brief look at this, and think it would be more sane if it > used ssh/scp by default instead of rsh/rcp. maybe can you modify that?
Sure. I agree -- I've never used rsh as the RCMD. Here's a patch
(against the most recent tarball I posted) and updated tarball
(since there are a couple versions of the port floating around). I
don't have access to a machine with X11 right now, but dsh/pcp test
out fine on i386.
Should the documentation be patched to reflect this change as well?
Thanks for your help!
--
o--------------------------{ Will Maier }--------------------------o
| jabber:[EMAIL PROTECTED] | [EMAIL PROTECTED] |
| freenode:..............lt_kije | freenode:........#madlug,#wilug |
*------------------[ BSD Unix: Live Free or Die ]------------------*
diff -urN ../clusterit-old/Makefile ./Makefile
--- ../clusterit-old/Makefile Tue May 30 16:37:05 2006
+++ ./Makefile Sun Jun 11 17:56:45 2006
@@ -25,7 +25,7 @@
.if ${FLAVOR:L:Mno_x11}
# Don't build dvt/rvt, which require X11
-PATCH_LIST+= no_x11-*
+PATCH_LIST= patch-* no_x11-*
CONFIGURE_ARGS= --without-x11
.else
USE_X11= Yes
diff -urN ../clusterit-old/patches/patch-dsh_dsh_c ./patches/patch-dsh_dsh_c
--- ../clusterit-old/patches/patch-dsh_dsh_c Wed Dec 31 18:00:00 1969
+++ ./patches/patch-dsh_dsh_c Sun Jun 11 17:10:29 2006
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- dsh/dsh.c.orig Sun Jun 11 17:06:15 2006
++++ dsh/dsh.c Sun Jun 11 17:08:58 2006
+@@ -226,9 +226,9 @@ main(int argc, char *argv[])
+ /* we need to find or guess the port number */
+ if (testflag && rshport == 0) {
+ if (!getenv("RCMD_CMD"))
+- rshport = 514;
+- else if (strcmp("ssh", getenv("RCMD_CMD")) == 0)
+ rshport = 22;
++ else if (strcmp("rsh", getenv("RCMD_CMD")) == 0)
++ rshport = 514;
+ else {
+ (void)fprintf(stderr, "-t argument given, but port number to test "
+ "could not be guessed. Please set RSHPORT "
+@@ -352,7 +352,7 @@ do_command(char **argv, int fanout, char
+ /* gather the rsh data */
+ rsh = getenv("RCMD_CMD");
+ if (rsh == NULL)
+- rsh = strdup("rsh");
++ rsh = strdup("ssh");
+ if (rsh == NULL)
+ bailout();
+
diff -urN ../clusterit-old/patches/patch-dsh_rseq_c ./patches/patch-dsh_rseq_c
--- ../clusterit-old/patches/patch-dsh_rseq_c Wed Dec 31 18:00:00 1969
+++ ./patches/patch-dsh_rseq_c Sun Jun 11 17:12:22 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- dsh/rseq.c.orig Sun Jun 11 17:12:09 2006
++++ dsh/rseq.c Sun Jun 11 17:12:12 2006
+@@ -324,7 +324,7 @@ do_command(char **argv, int allrun, char
+ /* set up the remote command */
+ rsh = getenv("RCMD_CMD");
+ if (rsh == NULL)
+- rsh = strdup("rsh");
++ rsh = strdup("ssh");
+ if (rsh == NULL)
+ bailout();
+ if (getenv("RCMD_CMD_ARGS") != NULL)
diff -urN ../clusterit-old/patches/patch-dsh_run_c ./patches/patch-dsh_run_c
--- ../clusterit-old/patches/patch-dsh_run_c Wed Dec 31 18:00:00 1969
+++ ./patches/patch-dsh_run_c Sun Jun 11 17:13:23 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- dsh/run.c.orig Sun Jun 11 17:12:44 2006
++++ dsh/run.c Sun Jun 11 17:13:15 2006
+@@ -292,7 +292,7 @@ do_command(char **argv, int allrun, char
+ /* get the rsh data */
+ rsh = getenv("RCMD_CMD");
+ if (rsh == NULL)
+- rsh = strdup("rsh");
++ rsh = strdup("ssh");
+ if (rsh == NULL)
+ bailout();
+ if (getenv("RCMD_CMD_ARGS") != NULL)
diff -urN ../clusterit-old/patches/patch-jsd_jsd_c ./patches/patch-jsd_jsd_c
--- ../clusterit-old/patches/patch-jsd_jsd_c Wed Dec 31 18:00:00 1969
+++ ./patches/patch-jsd_jsd_c Sun Jun 11 17:15:53 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- jsd/jsd.c.orig Sun Jun 11 17:15:18 2006
++++ jsd/jsd.c Sun Jun 11 17:15:29 2006
+@@ -458,7 +458,7 @@ do_bench_command(char *argv, int fanout,
+
+ rsh = getenv("RCMD_CMD");
+ if (rsh == NULL)
+- rsh = strdup("rsh");
++ rsh = strdup("ssh");
+ if (rsh == NULL)
+ bailout();
+ if (getenv("RCMD_CMD_ARGS") != NULL)
diff -urN ../clusterit-old/patches/patch-jsd_jsh_c ./patches/patch-jsd_jsh_c
--- ../clusterit-old/patches/patch-jsd_jsh_c Wed Dec 31 18:00:00 1969
+++ ./patches/patch-jsd_jsh_c Sun Jun 11 17:17:23 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- jsd/jsh.c.orig Sun Jun 11 17:16:28 2006
++++ jsd/jsh.c Sun Jun 11 17:17:19 2006
+@@ -319,7 +319,7 @@ do_command(char **argv, int allrun, char
+ }
+ rsh = getenv("RCMD_CMD");
+ if (rsh == NULL)
+- rsh = strdup("rsh");
++ rsh = strdup("ssh");
+ if (rsh == NULL)
+ bailout();
+
diff -urN ../clusterit-old/patches/patch-pcp_pcp_c ./patches/patch-pcp_pcp_c
--- ../clusterit-old/patches/patch-pcp_pcp_c Wed Dec 31 18:00:00 1969
+++ ./patches/patch-pcp_pcp_c Sun Jun 11 18:11:51 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- pcp/pcp.c.orig Sun Jun 11 18:09:22 2006
++++ pcp/pcp.c Sun Jun 11 18:10:18 2006
+@@ -276,7 +276,7 @@ void do_copy(char **argv, int recurse, i
+
+ rcp = getenv("RCP_CMD");
+ if (rcp == NULL)
+- rcp = strdup("rcp");
++ rcp = strdup("scp");
+ if (rcp == NULL)
+ bailout();
+ (void)snprintf(args, 64, " ");
diff -urN ../clusterit-old/patches/patch-rvt_rvt_c ./patches/patch-rvt_rvt_c
--- ../clusterit-old/patches/patch-rvt_rvt_c Wed Dec 31 18:00:00 1969
+++ ./patches/patch-rvt_rvt_c Sun Jun 11 17:18:30 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- rvt/rvt.c.orig Sun Jun 11 17:17:54 2006
++++ rvt/rvt.c Sun Jun 11 17:18:18 2006
+@@ -166,7 +166,7 @@ char **argv;
+ com_argv = (char**) cmalloc( (i+1) * sizeof(char**) );
+
+ command = getenv("RLOGIN_CMD");
+- if(command == NULL) command = "/usr/bin/rsh";
++ if(command == NULL) command = "/usr/bin/ssh";
+ i = 0;
+ com_argv[i++] = command;
+ if(remote_username != NULL)
clusterit.tgz
Description: application/tar-gz
