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

SCCS-vsn: libexec/rlogind/rlogind.c 5.50.1.1
SCCS-vsn: libexec/rlogind/Makefile 5.9.1.1

diff --git a/usr/src/libexec/rlogind/Makefile b/usr/src/libexec/rlogind/Makefile
index 3ba862a..5f6632c 100644 (file)
--- a/usr/src/libexec/rlogind/Makefile
+++ b/usr/src/libexec/rlogind/Makefile
@@ -1,11 +1,14 @@
-#      @(#)Makefile    5.9 (Berkeley) %G%
+#      @(#)Makefile    5.9.1.1 (Berkeley) %G%

 
 PROG=  rlogind
 
 PROG=  rlogind

-CFLAGS+=-DKERBEROS -DCRYPT
-SRCS=  rlogind.c des_rw.c
+SRCS=  rlogind.c
+#SRCS= rlogind.c des_rw.c
+#CFLAGS+=-DKERBEROS -DCRYPT

 MAN8=  rlogind.0
 MAN8=  rlogind.0

-DPADD= ${LIBUTIL} ${LIBKRB} ${LIBDES}
-LDADD= -lutil -lkrb -ldes
+#DPADD=        ${LIBUTIL} ${LIBKRB} ${LIBDES}
+#LDADD=        -lutil -lkrb -ldes
+DPADD= ${LIBUTIL}
+LDADD= -lutil

 .PATH: ${.CURDIR}/../../usr.bin/rlogin
 
 .include <bsd.prog.mk>
 .PATH: ${.CURDIR}/../../usr.bin/rlogin
 
 .include <bsd.prog.mk>

diff --git a/usr/src/libexec/rlogind/rlogind.c b/usr/src/libexec/rlogind/rlogind.c
index 20060d9..90d34a8 100644 (file)
--- a/usr/src/libexec/rlogind/rlogind.c
+++ b/usr/src/libexec/rlogind/rlogind.c
@@ -22,7 +22,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)rlogind.c  5.50 (Berkeley) %G%";
+static char sccsid[] = "@(#)rlogind.c  5.50.1.1 (Berkeley) %G%";

 #endif /* not lint */
 
 #ifdef KERBEROS
 #endif /* not lint */
 
 #ifdef KERBEROS


@@ -123,11 +123,6 @@ main(argc, argv)
                case 'v':
                        vacuous = 1;
                        break;
                case 'v':
                        vacuous = 1;
                        break;

-#ifdef CRYPT
-               case 'x':
-                       encrypt = 1;
-                       break;
-#endif

 #endif
                case '?':
                default:
 #endif
                case '?':
                default:


@@ -258,10 +253,6 @@ doit(f, fromp)
                confirmed = 1;          /* we sent the null! */
        }
 #ifdef KERBEROS
                confirmed = 1;          /* we sent the null! */
        }
 #ifdef KERBEROS

-#ifdef CRYPT
-       if (encrypt)
-               (void) des_write(f, SECURE_MESSAGE, sizeof(SECURE_MESSAGE));
-#endif

        if (use_kerberos == 0)
 #endif
           if (!authenticated && !hostok)
        if (use_kerberos == 0)
 #endif
           if (!authenticated && !hostok)