5 files changed, 8 insertions, 37 deletions

diff --git a/ChangeLog b/ChangeLog
index f40ba0423..ec6e4726d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20020625
+ - (stevesk) [INSTALL acconfig.h configure.ac defines.h] remove --with-rsh
+
 20020624
  - OpenBSD CVS Sync
    - deraadt@cvs.openbsd.org 2002/06/23 03:25:50
@@ -1082,4 +1085,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2264 2002/06/23 21:49:25 mouring Exp $
+$Id: ChangeLog,v 1.2265 2002/06/24 16:26:49 stevesk Exp $
diff --git a/INSTALL b/INSTALL
index a7f73e648..07da06b56 100644
--- a/INSTALL
+++ b/INSTALL
@@ -105,11 +105,6 @@ name).
 
 There are a few other options to the configure script:
 
---with-rsh=PATH allows you to specify the path to your rsh program. 
-Normally ./configure will search the current $PATH for 'rsh'. You 
-may need to specify this option if rsh is not in your path or has a
-different name.
-
 --with-pam enables PAM support.
 
 --enable-gnome-askpass will build the GNOME passphrase dialog. You
@@ -226,4 +221,4 @@ Please refer to the "reporting bugs" section of the webpage at
 http://www.openssh.com/
 
 
-$Id: INSTALL,v 1.53 2002/05/13 05:22:21 djm Exp $
+$Id: INSTALL,v 1.54 2002/06/24 16:26:49 stevesk Exp $
diff --git a/acconfig.h b/acconfig.h
index 713b094d6..682e2754c 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
-/* $Id: acconfig.h,v 1.138 2002/06/12 16:57:15 mouring Exp $ */
+/* $Id: acconfig.h,v 1.139 2002/06/24 16:26:49 stevesk Exp $ */
 
 #ifndef _CONFIG_H
 #define _CONFIG_H
@@ -228,9 +228,6 @@
 /* Define if xauth is found in your path */
 #undef XAUTH_PATH
 
-/* Define if rsh is found in your path */
-#undef RSH_PATH
-
 /* Define if you want to allow MD5 passwords */
 #undef HAVE_MD5_PASSWORDS
 
diff --git a/configure.ac b/configure.ac
index 85fb0d973..44ff46ab1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.68 2002/06/22 18:51:48 stevesk Exp $
+# $Id: configure.ac,v 1.69 2002/06/24 16:26:49 stevesk Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -247,7 +247,6 @@ mips-sony-bsd|mips-sony-newsos4)
         CPPFLAGS="$CPPFLAGS -Dftruncate=chsize -I/usr/local/include"
         LDFLAGS="$LDFLAGS -L/usr/local/lib"
         LIBS="$LIBS -los -lprot -lx -ltinfo -lm"
-        rsh_path="/usr/bin/rcmd"
         RANLIB=true
         no_dev_ptmx=1
         AC_DEFINE(BROKEN_SYS_TERMIO_H)
@@ -264,7 +263,6 @@ mips-sony-bsd|mips-sony-newsos4)
         LDFLAGS="$LDFLAGS -L/usr/local/lib"
         LIBS="$LIBS -lprot -lx -ltinfo -lm"
         no_dev_ptmx=1
-        rsh_path="/usr/bin/rcmd"
         AC_DEFINE(USE_PIPES)
         AC_DEFINE(HAVE_SECUREWARE)
         AC_DEFINE(DISABLE_SHADOW)
@@ -1790,17 +1788,6 @@ AC_ARG_WITH(afs,
 LIBS="$LIBS $KLIBS $K5LIBS"
 
 # Looking for programs, paths and files
-AC_ARG_WITH(rsh,
-        [  --with-rsh=PATH         Specify path to remote shell program ],
-        [
-                if test "x$withval" != "$no" ; then
-                        rsh_path=$withval
-                fi
-        ],
-        [
-                AC_PATH_PROG(rsh_path, rsh)
-        ]
-)
 
 PRIVSEP_PATH=/var/empty
 AC_ARG_WITH(privsep-path,
@@ -1836,9 +1823,6 @@ else
         XAUTH_PATH=$xauth_path
         AC_SUBST(XAUTH_PATH)
 fi
-if test ! -z "$rsh_path" ; then
-        AC_DEFINE_UNQUOTED(RSH_PATH, "$rsh_path")
-fi
 
 # Check for mail directory (last resort if we cannot get it from headers)
 if test ! -z "$MAIL" ; then
diff --git a/defines.h b/defines.h
index 90825f6b9..b87dbc51e 100644
--- a/defines.h
+++ b/defines.h
@@ -1,7 +1,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.91 2002/06/22 00:27:00 mouring Exp $ */
+/* $Id: defines.h,v 1.92 2002/06/24 16:26:49 stevesk Exp $ */
 
 
 /* Constants */
@@ -316,14 +316,6 @@ struct winsize {
 # define _PATH_MAILDIR MAILDIR
 #endif /* !defined(_PATH_MAILDIR) && defined(MAILDIR) */
 
-#ifndef _PATH_RSH
-# ifdef RSH_PATH
-#  define _PATH_RSH RSH_PATH
-# else /* RSH_PATH */
-#  define _PATH_RSH "/usr/bin/rsh"
-# endif /* RSH_PATH */
-#endif /* _PATH_RSH */
-
 #ifndef _PATH_NOLOGIN
 # define _PATH_NOLOGIN "/etc/nologin"
 #endif