diff --git a/appl/telnet/libtelnet/auth-proto.h b/appl/telnet/libtelnet/auth-proto.h index 6dd24b1e7..8da516b0e 100644 --- a/appl/telnet/libtelnet/auth-proto.h +++ b/appl/telnet/libtelnet/auth-proto.h @@ -96,7 +96,8 @@ void sra_printsub P((unsigned char *, int, unsigned char *, int)); #ifdef KRB4 int kerberos4_init P((Authenticator *, int)); -int kerberos4_send P((Authenticator *)); +int kerberos4_send_mutual P((Authenticator *)); +int kerberos4_send_oneway P((Authenticator *)); void kerberos4_is P((Authenticator *, unsigned char *, int)); void kerberos4_reply P((Authenticator *, unsigned char *, int)); int kerberos4_status P((Authenticator *, char *, int)); diff --git a/appl/telnet/libtelnet/auth.c b/appl/telnet/libtelnet/auth.c index 85d622f7d..f25ba0c94 100644 --- a/appl/telnet/libtelnet/auth.c +++ b/appl/telnet/libtelnet/auth.c @@ -156,14 +156,14 @@ Authenticator authenticators[] = { #ifdef KRB4 { AUTHTYPE_KERBEROS_V4, AUTH_WHO_CLIENT|AUTH_HOW_MUTUAL, kerberos4_init, - kerberos4_send, + kerberos4_send_mutual, kerberos4_is, kerberos4_reply, kerberos4_status, kerberos4_printsub }, { AUTHTYPE_KERBEROS_V4, AUTH_WHO_CLIENT|AUTH_HOW_ONE_WAY, kerberos4_init, - kerberos4_send, + kerberos4_send_oneway, kerberos4_is, kerberos4_reply, kerberos4_status, diff --git a/appl/telnet/libtelnet/kerberos.c b/appl/telnet/libtelnet/kerberos.c index 58597db27..4be0ff756 100644 --- a/appl/telnet/libtelnet/kerberos.c +++ b/appl/telnet/libtelnet/kerberos.c @@ -161,9 +161,8 @@ kerberos4_init(ap, server) char dst_realm_buf[REALM_SZ], *dest_realm = NULL; int dst_realm_sz = REALM_SZ; - int -kerberos4_send(ap) - Authenticator *ap; +static int +kerberos4_send(char *name, Authenticator *ap) { KTEXT_ST auth; char instance[INST_SZ]; @@ -173,7 +172,7 @@ kerberos4_send(ap) CREDENTIALS cred; int r; - printf("[ Trying KERBEROS4 ... ]\n"); + printf("[ Trying %s ... ]\n", name); if (!UserNameRequested) { if (auth_debug_mode) { printf("Kerberos V4: no user name supplied\r\n"); @@ -254,6 +253,17 @@ kerberos4_send(ap) } return(1); } +int +kerberos4_send_mutual(Authenticator *ap) +{ + return kerberos4_send("mutual KERBEROS4", ap); +} + +int +kerberos4_send_oneway(Authenticator *ap) +{ + return kerberos4_send("KERBEROS4", ap); +} void kerberos4_is(ap, data, cnt)