From 5bbde2428fe8f902cab17a243345820a2c60befa Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Wed, 4 Aug 1999 17:03:54 +0000
Subject: [PATCH] add `-z' and `-G' options

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

diff --git a/appl/rsh/rsh.c b/appl/rsh/rsh.c
index e00919a87..35c230d67 100644
--- a/appl/rsh/rsh.c
+++ b/appl/rsh/rsh.c
@@ -739,8 +739,12 @@ struct getargs args[] = {
       NULL },
     { "encrypt", 'x', arg_flag,		&do_encrypt,	"Encrypt connection",
       NULL },
+    { "encrypt", 'z', arg_negative_flag,      &do_encrypt,
+      "Don't encrypt connection", NULL },
     { "forward", 'f', arg_flag,		&do_forward,	"Forward credentials",
       NULL },
+    { "forward", 'G', arg_negative_flag,&do_forward,	"Forward credentials",
+      NULL },
     { "forwardable", 'F', arg_flag,	&do_forwardable,
       "Forward forwardable credentials", NULL },
     { "unique", 'u', arg_flag,	&do_unique_tkfile,
@@ -803,14 +807,20 @@ main(int argc, char **argv)
     if (status)
         errx(1, "krb5_init_context failed: %u", status);
       
-    do_forwardable=krb5_config_get_bool (context, NULL,
-		    "libdefaults", "forwardable", NULL);
+    do_forwardable = krb5_config_get_bool (context, NULL,
+					   "libdefaults",
+					   "forwardable",
+					   NULL);
 	
-    do_forward=krb5_config_get_bool (context, NULL,
-                    "libdefaults", "forward", NULL);	    
+    do_forward = krb5_config_get_bool (context, NULL,
+				       "libdefaults",
+				       "forward",
+				       NULL);
 
-    do_encrypt=krb5_config_get_bool (context, NULL,
-                    "libdefaults", "encrypt", NULL);	    
+    do_encrypt = krb5_config_get_bool (context, NULL,
+				       "libdefaults",
+				       "encrypt",
+				       NULL);
 
     if (getarg (args, sizeof(args) / sizeof(args[0]), argc, argv,
 		&optind))