From 2d5457348ea074a1bf757429b2e2bdba0789f504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Mon, 26 Jan 2009 01:11:40 +0000 Subject: [PATCH] drop krbv4 support git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24506 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/rsh/rsh_locl.h | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/appl/rsh/rsh_locl.h b/appl/rsh/rsh_locl.h index 118cca117..088729772 100644 --- a/appl/rsh/rsh_locl.h +++ b/appl/rsh/rsh_locl.h @@ -96,10 +96,6 @@ #include #include #include -#ifdef KRB4 -#include -#include -#endif #ifdef KRB5 #include /* XXX */ @@ -112,7 +108,7 @@ struct krb5_dh_moduli; #include "crypto-headers.h" #include /* for _krb5_{get,put}_int */ #endif -#if defined(KRB4) || defined(KRB5) +#if defined(KRB5) #include #endif @@ -130,7 +126,7 @@ struct krb5_dh_moduli; * */ -enum auth_method { AUTH_KRB4, AUTH_KRB5, AUTH_BROKEN }; +enum auth_method { AUTH_KRB5, AUTH_BROKEN }; extern enum auth_method auth_method; extern int do_encrypt; @@ -143,10 +139,6 @@ extern void *ivec_in[2]; extern void *ivec_out[2]; void init_ivecs(int, int); #endif -#ifdef KRB4 -extern des_key_schedule schedule; -extern des_cblock iv; -#endif #define KCMD_OLD_VERSION "KCMDV0.1" #define KCMD_NEW_VERSION "KCMDV0.2" @@ -161,7 +153,7 @@ extern des_cblock iv; #define PATH_RSH BINDIR "/rsh" -#if defined(KRB4) || defined(KRB5) +#if defined(KRB5) ssize_t do_read (int, void*, size_t, void*); ssize_t do_write (int, void*, size_t, void*); #else