remove --with-rsh

Kevin Steves kevin at atomicgears.com
Mon Jun 24 10:50:22 EST 2002


is this ok (complete, correct)?

Index: INSTALL
===================================================================
RCS file: /var/cvs/openssh/INSTALL,v
retrieving revision 1.53
diff -u -r1.53 INSTALL
--- INSTALL	13 May 2002 05:22:21 -0000	1.53
+++ INSTALL	24 Jun 2002 00:50:20 -0000
@@ -105,11 +105,6 @@
 
 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
Index: acconfig.h
===================================================================
RCS file: /var/cvs/openssh/acconfig.h,v
retrieving revision 1.138
diff -u -r1.138 acconfig.h
--- acconfig.h	12 Jun 2002 16:57:15 -0000	1.138
+++ acconfig.h	24 Jun 2002 00:50:20 -0000
@@ -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
 
Index: configure.ac
===================================================================
RCS file: /var/cvs/openssh/configure.ac,v
retrieving revision 1.68
diff -u -r1.68 configure.ac
--- configure.ac	22 Jun 2002 18:51:48 -0000	1.68
+++ configure.ac	24 Jun 2002 00:50:32 -0000
@@ -247,7 +247,6 @@
 	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 @@
 	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 @@
 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,
@@ -1835,9 +1822,6 @@
 	AC_DEFINE_UNQUOTED(XAUTH_PATH, "$xauth_path")
 	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)
Index: defines.h
===================================================================
RCS file: /var/cvs/openssh/defines.h,v
retrieving revision 1.91
diff -u -r1.91 defines.h
--- defines.h	22 Jun 2002 00:27:00 -0000	1.91
+++ defines.h	24 Jun 2002 00:50:33 -0000
@@ -316,14 +316,6 @@
 # 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



More information about the openssh-unix-dev mailing list