* forward.c: Remove unused #include <krb5/crc-32.h>.

* kerberos5.c (kerberos5_send):  Remove code for sending a checksum
of a zero-byte string; we can just send no checksum at all.  This
eliminates dependency on <krb5/crc-32.h>.
(kerberos5_forward):  Remove extra parameter to krb5_get_for_creds,
probably accidentally inserted during context changes -- which don't
seem to be here in the ChangeLog.
* kerberos.c:  Remove prototypes for krb4 functions, since
some of them are wrong with CNS (u_long vs. KRB_INT32 conflicts).

These changes BUILD but have not been RUN yet.  But at least they build.
My apologies.		-- John

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4878 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog
index 9c19cb5fb036a183e9e2385af838a2d38cf2c1e8..b3ff8064cc6b6cba66b23a5622a04ce9a83975dd 100644 (file)
--- a/src/appl/telnet/libtelnet/ChangeLog
+++ b/src/appl/telnet/libtelnet/ChangeLog
@@ -1,3 +1,15 @@
+Thu Feb  2 02:56:50 1995  John Gilmore  <gnu@cygnus.com>
+
+       * forward.c:  Remove unused #include <krb5/crc-32.h>.
+       * kerberos5.c (kerberos5_send):  Remove code for sending a checksum
+       of a zero-byte string; we can just send no checksum at all.  This
+       eliminates dependency on <krb5/crc-32.h>.
+       (kerberos5_forward):  Remove extra parameter to krb5_get_for_creds,
+       probably accidentally inserted during context changes -- which don't
+       seem to be here in the ChangeLog.
+       * kerberos.c:  Remove prototypes for krb4 functions, since
+       some of them are wrong with CNS (u_long vs. KRB_INT32 conflicts).
+
 Fri Nov 18 15:19:26 1994  Theodore Y. Ts'o  (tytso@dcl)
 
        * kerberos5.c (kerberos5_init): Initialize magic variable and

diff --git a/src/appl/telnet/libtelnet/forward.c b/src/appl/telnet/libtelnet/forward.c
index 1e3907ca2dca0cfe75baea0d9402e33a8ba882a7..069c957e27781e73e86a13df1fce43cf9c2d4e42 100644 (file)
--- a/src/appl/telnet/libtelnet/forward.c
+++ b/src/appl/telnet/libtelnet/forward.c
@@ -30,7 +30,6 @@
 
 #include <krb5/krb5.h>
 #include <krb5/asn1.h>
-#include <krb5/crc-32.h>
 #include <krb5/los-proto.h>
 #include <krb5/ext-proto.h>
 

diff --git a/src/appl/telnet/libtelnet/kerberos.c b/src/appl/telnet/libtelnet/kerberos.c
index b2d56a25ae8d59dddb788d0d2a5856aa070c3d23..92ba2cf4a6d86da7a6364c68ecb416aa2a1a1ae2 100644 (file)
--- a/src/appl/telnet/libtelnet/kerberos.c
+++ b/src/appl/telnet/libtelnet/kerberos.c
@@ -72,14 +72,6 @@
 #include "auth.h"
 #include "misc.h"
 
-int kerberos4_cksum P((unsigned char *, int));
-int krb_mk_req P((KTEXT, char *, char *, char *, u_long));
-int krb_rd_req P((KTEXT, char *, char *, u_long, AUTH_DAT *, char *));
-int krb_kntoln P((AUTH_DAT *, char *));
-int krb_get_cred P((char *, char *, char *, CREDENTIALS *));
-int krb_get_lrealm P((char *, int));
-int kuserok P((AUTH_DAT *, char *));
-
 extern auth_debug_mode;
 
 static unsigned char str_data[1024] = { IAC, SB, TELOPT_AUTHENTICATION, 0,
@@ -196,7 +188,7 @@ kerberos4_send(ap)
                printf("Kerberos V4: no realm for %s\r\n", RemoteHostName);
                return(0);
        }
-       if (r = krb_mk_req(&auth, KRB_SERVICE_NAME, instance, realm, 0L)) {
+       if (r = krb_mk_req(&auth, KRB_SERVICE_NAME, instance, realm, 0)) {
                printf("mk_req failed: %s\r\n", krb_err_txt[r]);
                return(0);
        }

diff --git a/src/appl/telnet/libtelnet/kerberos5.c b/src/appl/telnet/libtelnet/kerberos5.c
index 9e7724023724d778506ac72100f989704d981da4..510e89d2463d61123a564db36f00c19ecfeed089 100644 (file)
--- a/src/appl/telnet/libtelnet/kerberos5.c
+++ b/src/appl/telnet/libtelnet/kerberos5.c
@@ -63,7 +63,6 @@
 #include <stdio.h>
 #include <krb5/krb5.h>
 #include <krb5/asn1.h>
-#include <krb5/crc-32.h>
 #include <krb5/los-proto.h>
 #include <krb5/ext-proto.h>
 #include <com_err.h>
@@ -177,8 +176,6 @@ kerberos5_init(ap, server)
 kerberos5_send(ap)
        Authenticator *ap;
 {
-       krb5_checksum ksum;
-       krb5_octet sum[CRC32_CKSUM_LENGTH];
        krb5_error_code r;
        krb5_ccache ccache;
        krb5_creds creds;               /* telnet gets session key from here */
@@ -189,11 +186,6 @@ kerberos5_send(ap)
        krb5_keyblock *newkey = 0;
 #endif /* ENCRYPTION */
 
-       ksum.checksum_type = CKSUMTYPE_CRC32;
-       ksum.contents = sum;
-       ksum.length = sizeof(sum);
-       memset((Voidptr )sum, 0, sizeof(sum));
-       
         if (!UserNameRequested) {
                 if (auth_debug_mode) {
                         printf("Kerberos V5: no user name supplied\r\n");
@@ -240,7 +232,8 @@ kerberos5_send(ap)
        else
            ap_opts = 0;
            
-       r = krb5_mk_req_extended(telnet_context, ap_opts, &ksum, 
+       r = krb5_mk_req_extended(telnet_context, ap_opts,
+                                (krb5_checksum *) NULL,
                                 krb5_kdc_default_options, 0,
 #ifdef ENCRYPTION
                                 &newkey,
@@ -662,7 +655,7 @@ kerberos5_forward(ap)
        return;
     }
 
-    if (r = krb5_get_for_creds(telnet_context, ETYPE_DES_CBC_CRC,
+    if (r = krb5_get_for_creds(telnet_context,
                               krb5_kdc_req_sumtype,
                               RemoteHostName,
                               local_creds->client,