From 9ac56d0e5797883712f8c89d4bbf3339ebd44249 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Mon, 26 Jan 2009 01:10:59 +0000
Subject: [PATCH] drop krbv4 support

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24503 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/push/push.c | 68 +-----------------------------------------------
 1 file changed, 1 insertion(+), 67 deletions(-)

diff --git a/appl/push/push.c b/appl/push/push.c
index 3810fbdd1..d65276c7c 100644
--- a/appl/push/push.c
+++ b/appl/push/push.c
@@ -34,10 +34,6 @@
 #include "push_locl.h"
 RCSID("$Id$");
 
-#ifdef KRB4
-static int use_v4 = -1;
-#endif
-
 #ifdef KRB5
 static int use_v5 = -1;
 static krb5_context context;
@@ -54,10 +50,6 @@ static int do_count;
 static char *header_str;
 
 struct getargs args[] = {
-#ifdef KRB4
-    { "krb4",	'4', arg_flag,		&use_v4,	"Use Kerberos V4",
-      NULL },
-#endif
 #ifdef KRB5
     { "krb5",	'5', arg_flag,		&use_v5,	"Use Kerberos V5",
       NULL },
@@ -565,48 +557,6 @@ do_v5 (const char *host,
 }
 #endif
 
-#ifdef KRB4
-static int
-do_v4 (const char *host,
-       int port,
-       const char *user,
-       const char *filename,
-       const char *header_str,
-       int leavep,
-       int verbose,
-       int forkp)
-{
-    KTEXT_ST ticket;
-    MSG_DAT msg_data;
-    CREDENTIALS cred;
-    des_key_schedule sched;
-    int s;
-    int ret;
-
-    s = do_connect (host, port, 1);
-    if (s < 0)
-	return 1;
-    ret = krb_sendauth(0,
-		       s,
-		       &ticket,
-		       "pop",
-		       (char *)host,
-		       krb_realmofhost(host),
-		       getpid(),
-		       &msg_data,
-		       &cred,
-		       sched,
-		       NULL,
-		       NULL,
-		       "KPOPV0.1");
-    if(ret) {
-	warnx("krb_sendauth: %s", krb_get_err_text(ret));
-	return 1;
-    }
-    return doit (s, host, user, filename, header_str, leavep, verbose, forkp);
-}
-#endif /* KRB4 */
-
 #ifdef HESIOD
 
 #ifdef HESIOD_INTERFACES
@@ -763,13 +713,6 @@ main(int argc, char **argv)
     argc -= optind;
     argv += optind;
 
-#if defined(KRB4) && defined(KRB5)
-    if(use_v4 == -1 && use_v5 == 1)
-	use_v4 = 0;
-    if(use_v5 == -1 && use_v4 == 1)
-	use_v5 = 0;
-#endif
-
     if (do_help)
 	usage (0);
 
@@ -818,10 +761,8 @@ main(int argc, char **argv)
     if (port == 0) {
 #ifdef KRB5
 	port = krb5_getportbyname (context, "kpop", "tcp", 1109);
-#elif defined(KRB4)
-	port = k_getportbyname ("kpop", "tcp", htons(1109));
 #else
-#error must define KRB4 or KRB5
+#error must define KRB5
 #endif
     }
 
@@ -833,12 +774,5 @@ main(int argc, char **argv)
 		     do_leave, verbose_level, do_fork);
     }
 #endif
-
-#ifdef KRB4
-    if (ret && use_v4) {
-	ret = do_v4 (host, port, user, filename, header_str,
-		     do_leave, verbose_level, do_fork);
-    }
-#endif /* KRB4 */
     return ret;
 }