summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2014-03-16 05:30:14 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2014-03-16 05:30:14 +0000
commit1f3bde285219a1c9ad1ad9b2d2ab547915f2886f (patch)
tree669dafabbeebe1df5adcaa962fbaff2bb352c750
parent4fed02f19c29a774886db2348dc9f16bc2afa6df (diff)
cope with the renaming of default _PATH_RSH
ok tedu
-rw-r--r--bin/rcp/pathnames.h4
-rw-r--r--bin/rcp/rcp.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/rcp/pathnames.h b/bin/rcp/pathnames.h
index 3735ddc4727..5f05275bb69 100644
--- a/bin/rcp/pathnames.h
+++ b/bin/rcp/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.3 2003/06/02 23:32:09 millert Exp $ */
+/* $OpenBSD: pathnames.h,v 1.4 2014/03/16 05:30:13 deraadt Exp $ */
/* $NetBSD: pathnames.h,v 1.5 1995/03/21 08:19:03 cgd Exp $ */
/*
@@ -35,4 +35,4 @@
#include <paths.h>
#define _PATH_CP "/bin/cp"
-#define _PATH_RSH "/usr/bin/rsh"
+#define _PATH_OLD_RSH "/usr/bin/rsh"
diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c
index 18cd765240a..6faa7159306 100644
--- a/bin/rcp/rcp.c
+++ b/bin/rcp/rcp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcp.c,v 1.54 2013/11/20 20:53:55 deraadt Exp $ */
+/* $OpenBSD: rcp.c,v 1.55 2014/03/16 05:30:13 deraadt Exp $ */
/* $NetBSD: rcp.c,v 1.9 1995/03/21 08:19:06 cgd Exp $ */
/*
@@ -254,7 +254,7 @@ toremote(char *targ, int argc, char *argv[])
src = colon(argv[i]);
if (src) { /* remote to remote */
freeargs(&alist);
- addargs(&alist, "%s", _PATH_RSH);
+ addargs(&alist, "%s", _PATH_OLD_RSH);
addargs(&alist, "%s", "-n");
*src++ = 0;