From b7a4b794034411c451d5cf4157bfb59a65d5bb00 Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Tue, 31 Jul 2001 08:16:16 +0000
Subject: [PATCH] iff -d, set the SO_DEBUG flags of the stdout and stderr
 socket; implement parsing user@host

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10413 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/rsh/rsh.c | 58 ++++++++++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/appl/rsh/rsh.c b/appl/rsh/rsh.c
index 4c0994a1a..23e8dd155 100644
--- a/appl/rsh/rsh.c
+++ b/appl/rsh/rsh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -48,6 +48,7 @@ krb5_crypto crypto;
 des_key_schedule schedule;
 des_cblock iv;
 #endif
+int sock_debug	     = 0;
 
 
 /*
@@ -522,6 +523,15 @@ proto (int s, int errsock,
 	return 1;
     }
 
+    if (sock_debug) {
+	int one = 1;
+	if (setsockopt(s, SOL_SOCKET, SO_DEBUG, &one, sizeof(one)) < 0)
+	    warn("setsockopt remote");
+	if (errsock2 != -1 &&
+	    setsockopt(errsock2, SOL_SOCKET, SO_DEBUG, &one, sizeof(one)) < 0)
+	    warn("setsockopt stderr");
+    }
+
     return loop (s, errsock2);
 }
 
@@ -765,38 +775,29 @@ static int do_errsock = 1;
 
 struct getargs args[] = {
 #ifdef KRB4
-    { "krb4",	'4', arg_flag,		&use_v4,	"Use Kerberos V4",
-      NULL },
+    { "krb4",	'4', arg_flag,		&use_v4,	"Use Kerberos V4" },
 #endif
-    { "krb5",	'5', arg_flag,		&use_v5,	"Use Kerberos V5",
-      NULL },
-    { "broken", 'K', arg_flag,		&use_only_broken, "Use priv port",
-      NULL },
-    { "input",	'n', arg_negative_flag,	&input,		"Close stdin",
-      NULL },
-    { "encrypt", 'x', arg_flag,		&do_encrypt,	"Encrypt connection",
-      NULL },
+    { "krb5",	'5', arg_flag,		&use_v5,	"Use Kerberos V5" },
+    { "broken", 'K', arg_flag,		&use_only_broken, "Use priv port" },
+    { NULL,	'd', arg_flag,		&sock_debug, "Enable socket debugging" },
+    { "input",	'n', arg_negative_flag,	&input,		"Close stdin" },
+    { "encrypt", 'x', arg_flag,		&do_encrypt,	"Encrypt connection" },
     { NULL, 	'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 },
+    { "forward", 'f', arg_flag,		&do_forward,	"Forward credentials"},
+    { NULL, 'G', arg_negative_flag,&do_forward,	"Don't forward credentials" },
     { "forwardable", 'F', arg_flag,	&do_forwardable,
-      "Forward forwardable credentials", NULL },
+      "Forward forwardable credentials" },
     { "unique", 'u', arg_flag,	&do_unique_tkfile,
-      "Use unique remote tkfile", NULL },
+      "Use unique remote tkfile" },
     { "tkfile", 'U', arg_string,  &unique_tkfile,
-      "Use that remote tkfile", NULL },
+      "Use that remote tkfile" },
     { "port",	'p', arg_string,	&port_str,	"Use this port",
       "number-or-service" },
-    { "user",	'l', arg_string,	&user,		"Run as this user",
-      NULL },
-    { "stderr", 'e', arg_negative_flag, &do_errsock,	"don't open stderr"},
-    { "version", 0,  arg_flag,		&do_version,	"Print version",
-      NULL },
-    { "help",	 0,  arg_flag,		&do_help,	NULL,
-      NULL }
+    { "user",	'l', arg_string,	&user,		"Run as this user" },
+    { "stderr", 'e', arg_negative_flag, &do_errsock,	"Don't open stderr"},
+    { "version", 0,  arg_flag,		&do_version,	NULL },
+    { "help",	 0,  arg_flag,		&do_help,	NULL }
 };
 
 static void
@@ -822,6 +823,7 @@ main(int argc, char **argv)
     int optind = 0;
     int ret = 1;
     char *cmd;
+    char *tmp;
     size_t cmd_len;
     const char *local_user;
     char *host = NULL;
@@ -916,6 +918,12 @@ main(int argc, char **argv)
 	else
 	    host = argv[host_index = optind++];
     }
+    
+    if((tmp = strchr(host, '@')) != NULL) {
+	*tmp++ = '\0';
+	user = host;
+	host = tmp;
+    }
 
     if (optind == argc) {
 	close (priv_socket1);