From ef1ac12b5d0d2bf97b17b4259d8ae31676504b72 Mon Sep 17 00:00:00 2001
From: stevesk <stevesk>
Date: Mon, 24 Jun 2002 16:26:49 +0000
Subject: [PATCH 1/1]  - (stevesk) [INSTALL acconfig.h configure.ac defines.h]
 remove --with-rsh

---
 ChangeLog    |  3 +++
 INSTALL      |  5 -----
 acconfig.h   |  3 ---
 configure.ac | 16 ----------------
 defines.h    |  8 --------
 5 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4eac7c25..b764134f 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
diff --git a/INSTALL b/INSTALL
index 84e7b47d..f5b3546c 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
diff --git a/acconfig.h b/acconfig.h
index 96585331..82464b60 100644
--- a/acconfig.h
+++ b/acconfig.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 54acb7a9..8a533fb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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 c5646356..3f5b28a2 100644
--- a/defines.h
+++ b/defines.h
@@ -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
-- 
2.45.2