===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rsh/Attic/rsh.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- src/usr.bin/rsh/Attic/rsh.c	1995/10/18 08:46:03	1.1
+++ src/usr.bin/rsh/Attic/rsh.c	1995/12/16 22:20:36	1.2
@@ -39,12 +39,12 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)rsh.c	5.24 (Berkeley) 7/1/91";*/
-static char rcsid[] = "$Id: rsh.c,v 1.1 1995/10/18 08:46:03 deraadt Exp $";
+static char rcsid[] = "$Id: rsh.c,v 1.2 1995/12/16 22:20:36 tholo Exp $";
 #endif /* not lint */
 
 /*
  * $Source: /cvsrepo/anoncvs/cvs/src/usr.bin/rsh/Attic/rsh.c,v $
- * $Header: /cvsrepo/anoncvs/cvs/src/usr.bin/rsh/Attic/rsh.c,v 1.1 1995/10/18 08:46:03 deraadt Exp $
+ * $Header: /cvsrepo/anoncvs/cvs/src/usr.bin/rsh/Attic/rsh.c,v 1.2 1995/12/16 22:20:36 tholo Exp $
  */
 
 #include <sys/types.h>
@@ -115,12 +115,8 @@
 	}
 
 #ifdef KERBEROS
-#ifdef CRYPT
 #define	OPTIONS	"8KLdek:l:nwx"
 #else
-#define	OPTIONS	"8KLdek:l:nw"
-#endif
-#else
 #define	OPTIONS	"8KLdel:nw"
 #endif
 	while ((ch = getopt(argc - argoff, argv + argoff, OPTIONS)) != EOF)
@@ -151,13 +147,11 @@
 			nflag = 1;
 			break;
 #ifdef KERBEROS
-#ifdef CRYPT
 		case 'x':
 			doencrypt = 1;
-			des_set_key(cred.session, schedule);
+			des_set_key(&cred.session, schedule);
 			break;
 #endif
-#endif
 		case '?':
 		default:
 			usage();
@@ -188,12 +182,10 @@
 		user = pw->pw_name;
 
 #ifdef KERBEROS
-#ifdef CRYPT
 	/* -x turns off -n */
 	if (doencrypt)
 		nflag = 0;
 #endif
-#endif
 
 	args = copyargs(argv);
 
@@ -223,12 +215,10 @@
 		if (dest_realm == NULL)
 			dest_realm = krb_realmofhost(host);
 
-#ifdef CRYPT
 		if (doencrypt)
 			rem = krcmd_mutual(&host, sp->s_port, user, args,
 			    &rfd2, dest_realm, &cred, schedule);
 		else
-#endif
 			rem = krcmd(&host, sp->s_port, user, args, &rfd2,
 			    dest_realm);
 		if (rem < 0) {
@@ -294,10 +284,8 @@
 	}
 
 #ifdef KERBEROS
-#ifdef CRYPT
 	if (!doencrypt)
 #endif
-#endif
 	{
 		(void)ioctl(rfd2, FIONBIO, &one);
 		(void)ioctl(rem, FIONBIO, &one);
@@ -340,12 +328,10 @@
 		if ((rembits & (1 << rem)) == 0)
 			goto rewrite;
 #ifdef KERBEROS
-#ifdef CRYPT
 		if (doencrypt)
 			wc = des_write(rem, bp, cc);
 		else
 #endif
-#endif
 			wc = write(rem, bp, cc);
 		if (wc < 0) {
 			if (errno == EWOULDBLOCK)
@@ -377,12 +363,10 @@
 		if (ready & (1 << rfd2)) {
 			errno = 0;
 #ifdef KERBEROS
-#ifdef CRYPT
 			if (doencrypt)
 				cc = des_read(rfd2, buf, sizeof buf);
 			else
 #endif
-#endif
 				cc = read(rfd2, buf, sizeof buf);
 			if (cc <= 0) {
 				if (errno != EWOULDBLOCK)
@@ -393,12 +377,10 @@
 		if (ready & (1 << rem)) {
 			errno = 0;
 #ifdef KERBEROS
-#ifdef CRYPT
 			if (doencrypt)
 				cc = des_read(rem, buf, sizeof buf);
 			else
 #endif
-#endif
 				cc = read(rem, buf, sizeof buf);
 			if (cc <= 0) {
 				if (errno != EWOULDBLOCK)
@@ -414,12 +396,10 @@
 	char signo;
 {
 #ifdef KERBEROS
-#ifdef CRYPT
 	if (doencrypt)
 		(void)des_write(rfd2, &signo, 1);
 	else
 #endif
-#endif
 		(void)write(rfd2, &signo, 1);
 }
 
@@ -469,11 +449,7 @@
 	(void)fprintf(stderr,
 	    "usage: rsh [-nd%s]%s[-l login] host [command]\n",
 #ifdef KERBEROS
-#ifdef CRYPT
 	    "x", " [-k realm] ");
-#else
-	    "", " [-k realm] ");
-#endif
 #else
 	    "", " ");
 #endif