From 613f9d20a47d84b3e0193f9868dc123c65e6ef80 Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Sat, 18 Apr 1998 19:12:56 +0000
Subject: [PATCH] Don't try v5 if (only) `-4' is specified.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4773 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/rsh/rsh.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/appl/rsh/rsh.c b/appl/rsh/rsh.c
index 20b2762f6..13bf46105 100644
--- a/appl/rsh/rsh.c
+++ b/appl/rsh/rsh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997, 1998 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -557,7 +557,7 @@ doit (char *hostname,
 #ifdef KRB4
 static int use_v4 = 0;
 #endif
-static int use_v5 = 1;
+static int use_v5 = 0;
 static int use_only_broken = 0;
 static int use_broken = 1;
 static char *port_str;
@@ -627,6 +627,12 @@ main(int argc, char **argv)
 		&optind))
 	usage (1);
 
+    /* default to v5 */
+#ifdef KRB4
+    if(use_v4 == 0 && use_v5 == 0)
+#endif
+	use_v5 = 1;
+
     if (use_only_broken) {
 #ifdef KRB4
 	use_v4 = 0;