delete data-stream encryption for the foreign sites (4.3-Reno)

SCCS-vsn: bin/rcp/rcp.c 5.30.1.1
SCCS-vsn: bin/rcp/Makefile 5.4.1.1

diff --git a/usr/src/bin/rcp/Makefile b/usr/src/bin/rcp/Makefile
index 513a46e..2431c1d 100644 (file)
--- a/usr/src/bin/rcp/Makefile
+++ b/usr/src/bin/rcp/Makefile
@@ -1,10 +1,11 @@
-#      @(#)Makefile    5.4 (Berkeley) %G%
+#      @(#)Makefile    5.4.1.1 (Berkeley) %G%

 
 PROG=  rcp
 
 PROG=  rcp

-SRCS=  rcp.c krcmd.c kcmd.c
-CFLAGS+=-DKERBEROS -DCRYPT
-DPADD= ${LIBKRB} ${LIBDES}
-LDADD= -lkrb -ldes
+SRCS=  rcp.c
+#SRCS= rcp.c krcmd.c kcmd.c
+#CFLAGS+=-DKERBEROS -DCRYPT
+#DPADD=        ${LIBKRB} ${LIBDES}
+#LDADD=        -lkrb -ldes

 BINOWN=        root
 BINMODE=4555
 .PATH: ${.CURDIR}/../../usr.bin/rlogin
 BINOWN=        root
 BINMODE=4555
 .PATH: ${.CURDIR}/../../usr.bin/rlogin

diff --git a/usr/src/bin/rcp/rcp.c b/usr/src/bin/rcp/rcp.c
index 893129d..44c4f43 100644 (file)
--- a/usr/src/bin/rcp/rcp.c
+++ b/usr/src/bin/rcp/rcp.c
@@ -12,7 +12,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)rcp.c      5.30 (Berkeley) %G%";
+static char sccsid[] = "@(#)rcp.c      5.30.1.1 (Berkeley) %G%";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -45,12 +45,7 @@ int  use_kerberos = 1;
 CREDENTIALS    cred;
 Key_schedule   schedule;
 extern char    *krb_realmofhost();
 CREDENTIALS    cred;
 Key_schedule   schedule;
 extern char    *krb_realmofhost();

-#ifdef CRYPT
-int    encrypt = 0;
-#define        OPTIONS "dfkprtx"
-#else

 #define        OPTIONS "dfkprt"
 #define        OPTIONS "dfkprt"

-#endif

 #else
 #define        OPTIONS "dfprt"
 #endif
 #else
 #define        OPTIONS "dfprt"
 #endif


@@ -96,12 +91,6 @@ main(argc, argv)
                        strncpy(dst_realm_buf, ++argv, REALM_SZ);
                        dest_realm = dst_realm_buf;
                        break;
                        strncpy(dst_realm_buf, ++argv, REALM_SZ);
                        dest_realm = dst_realm_buf;
                        break;

-#ifdef CRYPT
-               case 'x':
-                       encrypt = 1;
-                       /* des_set_key(cred.session, schedule); */
-                       break;
-#endif

 #endif
                /* rshd-invoked options (server) */
                case 'd':
 #endif
                /* rshd-invoked options (server) */
                case 'd':


@@ -124,11 +113,7 @@ main(argc, argv)
        argv += optind;
 
 #ifdef KERBEROS
        argv += optind;
 
 #ifdef KERBEROS

-#ifdef CRYPT
-       shell = encrypt ? "ekshell" : "kshell";
-#else

        shell = "kshell";
        shell = "kshell";

-#endif

        sp = getservbyname(shell, "tcp");
        if (sp == NULL) {
                char    msgbuf[64];
        sp = getservbyname(shell, "tcp");
        if (sp == NULL) {
                char    msgbuf[64];


@@ -176,11 +161,7 @@ main(argc, argv)
        /* command to be executed on remote system using "rsh" */
 #ifdef KERBEROS
        (void)sprintf(cmd, "rcp%s%s%s%s", iamrecursive ? " -r" : "",
        /* command to be executed on remote system using "rsh" */
 #ifdef KERBEROS
        (void)sprintf(cmd, "rcp%s%s%s%s", iamrecursive ? " -r" : "",

-#ifdef CRYPT
-           ((encrypt && use_kerberos) ? " -x" : ""),
-#else

            "",
            "",

-#endif

            pflag ? " -p" : "", targetshouldbedirectory ? " -d" : "");
 #else
        (void)sprintf(cmd, "rcp%s%s%s", iamrecursive ? " -r" : "",
            pflag ? " -p" : "", targetshouldbedirectory ? " -d" : "");
 #else
        (void)sprintf(cmd, "rcp%s%s%s", iamrecursive ? " -r" : "",


@@ -865,15 +846,9 @@ nospace()
 usage()
 {
 #ifdef KERBEROS
 usage()
 {
 #ifdef KERBEROS

-#ifdef CRYPT
-       (void)fprintf(stderr, "%s\n\t%s\n",
-           "usage: rcp [-k realm] [-px] f1 f2",
-           "or: rcp [-k realm] [-rpx] f1 ... fn directory");
-#else

        (void)fprintf(stderr, "%s\n\t%s\n",
            "usage: rcp [-k realm] [-p] f1 f2",
            "or: rcp [-k realm] [-rp] f1 ... fn directory");
        (void)fprintf(stderr, "%s\n\t%s\n",
            "usage: rcp [-k realm] [-p] f1 f2",
            "or: rcp [-k realm] [-rp] f1 ... fn directory");

-#endif

 #else
        (void)fprintf(stderr,
            "usage: rcp [-p] f1 f2; or: rcp [-rp] f1 ... fn directory\n");
 #else
        (void)fprintf(stderr,
            "usage: rcp [-p] f1 f2; or: rcp [-rp] f1 ... fn directory\n");


@@ -902,15 +877,6 @@ again:
                if (dest_realm == NULL)
                        dest_realm = krb_realmofhost(*host);
 
                if (dest_realm == NULL)
                        dest_realm = krb_realmofhost(*host);
 

-#ifdef CRYPT
-               if (encrypt)
-                       rem = krcmd_mutual(
-                               host, port,
-                               user, bp, 0,
-                               dest_realm,
-                               &cred, schedule);
-               else
-#endif

                        rem = krcmd(
                                host, port,
                                user, bp, 0, dest_realm);
                        rem = krcmd(
                                host, port,
                                user, bp, 0, dest_realm);


@@ -934,13 +900,6 @@ again:
                        goto again;
                }
        } else {
                        goto again;
                }
        } else {

-#ifdef CRYPT
-               if (encrypt) {
-                       fprintf(stderr,
-                           "The -x option requires Kerberos authentication\n");
-                       exit(1);
-               }
-#endif

                rem = rcmd(host, sp->s_port, locuser, user, bp, 0);
        }
        return(rem);
                rem = rcmd(host, sp->s_port, locuser, user, bp, 0);
        }
        return(rem);