From 416874d66f218bfcd760c6331344726f5df179bf Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Thu, 10 Aug 2000 19:25:20 +0000
Subject: [PATCH] move code to do config/command parsing correctly.

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

diff --git a/appl/rsh/rsh.c b/appl/rsh/rsh.c
index b4d688646..d07dd9774 100644
--- a/appl/rsh/rsh.c
+++ b/appl/rsh/rsh.c
@@ -841,6 +841,10 @@ main(int argc, char **argv)
     if (status)
         errx(1, "krb5_init_context failed: %u", status);
       
+    if (getarg (args, sizeof(args) / sizeof(args[0]), argc, argv,
+		&optind))
+	usage (1);
+
     if (do_forwardable == -1)
 	do_forwardable = krb5_config_get_bool (context, NULL,
 					       "libdefaults",
@@ -852,6 +856,8 @@ main(int argc, char **argv)
 					   "libdefaults",
 					   "forward",
 					   NULL);
+    else if (do_forward == 0)
+	do_forwardable = 0;
 
     if (do_encrypt == -1)
 	do_encrypt = krb5_config_get_bool (context, NULL,
@@ -859,10 +865,6 @@ main(int argc, char **argv)
 					   "encrypt",
 					   NULL);
 
-    if (getarg (args, sizeof(args) / sizeof(args[0]), argc, argv,
-		&optind))
-	usage (1);
-
     if (do_forwardable)
 	do_forward = 1;