stupid mistake in execl

[unix-history] / usr / src / usr.bin / rsh / rsh.c

diff --git a/usr/src/usr.bin/rsh/rsh.c b/usr/src/usr.bin/rsh/rsh.c
index 56ca56f..a65c3c5 100644 (file)
--- a/usr/src/usr.bin/rsh/rsh.c
+++ b/usr/src/usr.bin/rsh/rsh.c
@@ -1,3 +1,9 @@
+
+/*
+ *     $Source: /a/staff/kfall/mit/rsh/RCS/rsh.c,v $
+ *     $Header: /a/staff/kfall/mit/rsh/RCS/rsh.c,v 5.1 89/07/31 19:28:59 kfall Exp Locker: kfall $
+ */
+

 /*
  * Copyright (c) 1983 The Regents of the University of California.
  * All rights reserved.
 /*
  * Copyright (c) 1983 The Regents of the University of California.
  * All rights reserved.


@@ -12,7 +18,7 @@
  * from this software without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * from this software without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED

- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint


@@ -22,7 +28,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)rsh.c      5.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)rsh.c      5.12 (Berkeley) 5/11/89";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>


@@ -37,6 +43,17 @@ static char sccsid[] = "@(#)rsh.c    5.7 (Berkeley) %G%";
 #include <signal.h>
 #include <pwd.h>
 #include <netdb.h>
 #include <signal.h>
 #include <pwd.h>
 #include <netdb.h>

+#include "pathnames.h"
+
+#ifdef KERBEROS
+#include <krb.h>
+char   dst_realm_buf[REALM_SZ];
+char   *dest_realm = NULL;
+int    use_kerberos = 1, encrypt = 0;
+CREDENTIALS    cred;
+Key_schedule   schedule;
+extern char    *krb_realmofhost();
+#endif /* KERBEROS */

 
 /*
  * rsh - remote shell
 
 /*
  * rsh - remote shell


@@ -88,7 +105,10 @@ another:
        }
        if (argc > 0 && !strcmp(*argv, "-n")) {
                argv++, argc--;
        }
        if (argc > 0 && !strcmp(*argv, "-n")) {
                argv++, argc--;

-               nflag++;
+#ifdef KERBEROS
+               if (!encrypt)
+                       nflag++;
+#endif

                goto another;
        }
        if (argc > 0 && !strcmp(*argv, "-d")) {
                goto another;
        }
        if (argc > 0 && !strcmp(*argv, "-d")) {


@@ -118,13 +138,37 @@ another:
                argv++, argc--;
                goto another;
        }
                argv++, argc--;
                goto another;
        }

+
+#ifdef KERBEROS
+       if(argc > 0 && !strncmp(*argv, "-x", 2)) {
+               encrypt = 1;
+               des_set_key(cred.session, schedule);
+               if (nflag)
+                       nflag = 0;
+               argv++, argc--;
+               goto another;
+       }
+
+       if(argc > 0 && !strcmp(*argv, "-k")) {
+               argv++, argc--;
+               if(argc <= 0 || (**argv == '-')) {
+                       fprintf(stderr, "-k option requires an argument\n");
+                       exit(1);
+               }
+               dest_realm = dst_realm_buf;
+               strncpy(dest_realm, *argv, REALM_SZ);
+               argv++, argc--;
+               goto another;
+       }
+#endif
+

        if (host == 0)
                goto usage;
        if (argv[0] == 0) {
                if (asrsh)
                        *argv0 = "rlogin";
        if (host == 0)
                goto usage;
        if (argv[0] == 0) {
                if (asrsh)
                        *argv0 = "rlogin";

-               execv("/usr/ucb/rlogin", argv0);
-               perror("/usr/ucb/rlogin");
+               execv(_PATH_RLOGIN, argv0);
+               perror(_PATH_RLOGIN);

                exit(1);
        }
        pwd = getpwuid(getuid());
                exit(1);
        }
        pwd = getpwuid(getuid());


@@ -143,15 +187,81 @@ another:
                if (ap[1])
                        *cp++ = ' ';
        }
                if (ap[1])
                        *cp++ = ' ';
        }

+#ifdef KERBEROS
+       sp = getservbyname((encrypt ? "ekshell" : "kshell"), "tcp");
+       if (sp == NULL) {
+               char    msgbuf[64];
+               use_kerberos = 0;
+               (void) sprintf(msgbuf, "can't get entry for %s/tcp service",
+                       (encrypt ? "ekshell" : "kshell"));
+               old_warning(msgbuf);
+               sp = getservbyname("shell", "tcp");
+       }
+#else

        sp = getservbyname("shell", "tcp");
        sp = getservbyname("shell", "tcp");

-       if (sp == 0) {
+#endif
+
+       if (sp == NULL) {

                fprintf(stderr, "rsh: shell/tcp: unknown service\n");
                exit(1);
        }
                fprintf(stderr, "rsh: shell/tcp: unknown service\n");
                exit(1);
        }

+
+#ifdef KERBEROS
+try_connect:
+       if (use_kerberos) {
+               rem = KSUCCESS;
+               errno = 0;
+               if (dest_realm == NULL)
+                       dest_realm = krb_realmofhost(host);
+
+               if (encrypt) {
+                       rem = krcmd_mutual(
+                               &host, sp->s_port,
+                               user ? user : pwd->pw_name,
+                               args,
+                               &rfd2,
+                               dest_realm,
+                               &cred, schedule);
+               } else {
+                       rem = krcmd(
+                               &host,
+                               sp->s_port,
+                               user ? user : pwd->pw_name,
+                               args,
+                               &rfd2,
+                               dest_realm);
+               }
+               if (rem < 0) {
+                       use_kerberos = 0;
+                       sp = getservbyname("shell", "tcp");
+                       if (sp == NULL) {
+                               fprintf(stderr, "unknown service shell/tcp\n");
+                               exit(1);
+                       }
+                       if (errno == ECONNREFUSED)
+                               old_warning("remote host doesn't support Kerberos");
+                       if (errno == ENOENT)
+                               old_warning("Can't provide Kerberos auth data");
+                       goto try_connect;
+               }
+       } else {
+               if (encrypt) {
+                       fprintf(stderr,"The -x flag requires Kerberos authentication\n");
+                       exit(1);
+               }
+               rem = rcmd(&host, sp->s_port, pwd->pw_name,
+                       user ? user : pwd->pw_name, args, &rfd2);
+       }
+
+#else
+                          

         rem = rcmd(&host, sp->s_port, pwd->pw_name,
         rem = rcmd(&host, sp->s_port, pwd->pw_name,

-           user ? user : pwd->pw_name, args, &rfd2);
+               user ? user : pwd->pw_name, args, &rfd2);
+#endif
+

         if (rem < 0)
                 exit(1);
         if (rem < 0)
                 exit(1);

+

        if (rfd2 < 0) {
                fprintf(stderr, "rsh: can't establish stderr\n");
                exit(2);
        if (rfd2 < 0) {
                fprintf(stderr, "rsh: can't establish stderr\n");
                exit(2);


@@ -177,8 +287,13 @@ another:
                        exit(1);
                }
        }
                        exit(1);
                }
        }

-       ioctl(rfd2, FIONBIO, &one);
-       ioctl(rem, FIONBIO, &one);
+#ifdef KERBEROS
+       if (!encrypt)
+#endif
+       {
+               ioctl(rfd2, FIONBIO, &one);
+               ioctl(rem, FIONBIO, &one);
+       }

         if (nflag == 0 && pid == 0) {
                char *bp; int rembits, wc;
                (void) close(rfd2);
         if (nflag == 0 && pid == 0) {
                char *bp; int rembits, wc;
                (void) close(rfd2);


@@ -199,7 +314,12 @@ another:
                }
                if ((rembits & (1<<rem)) == 0)
                        goto rewrite;
                }
                if ((rembits & (1<<rem)) == 0)
                        goto rewrite;

-               wc = write(rem, bp, cc);
+#ifdef KERBEROS
+               if (encrypt)
+                       wc = des_write(rem, bp, cc);
+               else
+                       wc = write(rem, bp, cc);
+#endif

                if (wc < 0) {
                        if (errno == EWOULDBLOCK)
                                goto rewrite;
                if (wc < 0) {
                        if (errno == EWOULDBLOCK)
                                goto rewrite;


@@ -226,7 +346,12 @@ another:
                }
                if (ready & (1<<rfd2)) {
                        errno = 0;
                }
                if (ready & (1<<rfd2)) {
                        errno = 0;

-                       cc = read(rfd2, buf, sizeof buf);
+#ifdef KERBEROS
+                       if (encrypt)
+                               cc = des_read(rfd2, buf, sizeof buf);
+                       else
+#endif
+                               cc = read(rfd2, buf, sizeof buf);

                        if (cc <= 0) {
                                if (errno != EWOULDBLOCK)
                                        readfrom &= ~(1<<rfd2);
                        if (cc <= 0) {
                                if (errno != EWOULDBLOCK)
                                        readfrom &= ~(1<<rfd2);


@@ -235,7 +360,12 @@ another:
                }
                if (ready & (1<<rem)) {
                        errno = 0;
                }
                if (ready & (1<<rem)) {
                        errno = 0;

-                       cc = read(rem, buf, sizeof buf);
+#ifdef KERBEROS
+                       if (encrypt)
+                               cc = des_read(rem, buf, sizeof buf);
+                       else
+                               cc = read(rem, buf, sizeof buf);
+#endif

                        if (cc <= 0) {
                                if (errno != EWOULDBLOCK)
                                        readfrom &= ~(1<<rem);
                        if (cc <= 0) {
                                if (errno != EWOULDBLOCK)
                                        readfrom &= ~(1<<rem);


@@ -248,13 +378,30 @@ another:
        exit(0);
 usage:
        fprintf(stderr,
        exit(0);
 usage:
        fprintf(stderr,

+#ifdef KERBEROS
+           "usage: rsh host [ -l login ] [ -n ] [ -k realm ] command\n");
+#else

            "usage: rsh host [ -l login ] [ -n ] command\n");
            "usage: rsh host [ -l login ] [ -n ] command\n");

+#endif

        exit(1);
 }
 
 sendsig(signo)
        char signo;
 {
        exit(1);
 }
 
 sendsig(signo)
        char signo;
 {

+#ifdef KERBEROS
+       if (encrypt)
+               (void) des_write(rfd2, &signo, 1);
+       else
+#endif
+               (void) write(rfd2, &signo, 1);
+}

 
 

-       (void) write(rfd2, &signo, 1);
+#ifdef KERBEROS
+int
+old_warning(str)
+       char    *str;
+{
+       fprintf(stderr,"Warning: %s, using standard rsh\n", str);

 }
 }

+#endif