[src/netbsd-1-5]: src/lib/libtelnet Pull up revisions 1.6-1.7 (requested by a...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a09c2a3b6b11
branches:  netbsd-1-5
changeset: 491169:a09c2a3b6b11
user:      he <he%NetBSD.org@localhost>
date:      Thu Apr 05 23:25:57 2001 +0000

description:
Pull up revisions 1.6-1.7 (requested by assar):
  Upgrade Heimdal to version 0.3e.

diffstat:

 lib/libtelnet/kerberos5.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r 73ed1d4f5290 -r a09c2a3b6b11 lib/libtelnet/kerberos5.c
--- a/lib/libtelnet/kerberos5.c Thu Apr 05 23:25:55 2001 +0000
+++ b/lib/libtelnet/kerberos5.c Thu Apr 05 23:25:57 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kerberos5.c,v 1.4.2.3 2000/07/23 22:14:19 thorpej Exp $        */
+/*     $NetBSD: kerberos5.c,v 1.4.2.4 2001/04/05 23:25:57 he Exp $     */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -71,6 +71,8 @@
 #include "auth.h"
 #include "misc.h"
 
+extern int net;
+
 int forward_flags;     /* Flags get set in telnet/main.c on -f and -F */
 int got_forwarded_creds;/* Tell telnetd to pass -F or -f to login. */
 
@@ -168,7 +170,6 @@
        int ap_opts;
        krb5_data cksum_data;
        char foo[2];
-       extern int net;
 
        printf("[ Trying KERBEROS5 ... ]\r\n");
 
@@ -344,7 +345,7 @@
                }
                if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) {
                        ret = krb5_mk_rep(telnet_context,
-                           &auth_context, &outbuf);
+                           auth_context, &outbuf);
                        if (ret) {
                                Data(ap, KRB_REJECT,
                                    "krb5_mk_rep failed", -1);
@@ -431,7 +432,7 @@
                                                ret));
                                break;
                        }
-                       ret = krb5_rd_cred(telnet_context, auth_context,
+                       ret = krb5_rd_cred2(telnet_context, auth_context,
                            ccache, &inbuf);
                        if (ret) {
                                char *errbuf;