From: djm <djm>
Date: Wed, 4 Jun 2003 09:06:59 +0000 (+0000)
Subject:  - (djm) Bug #573 - Remove unneeded Krb headers and compat goop. Patch from
X-Git-Tag: PRE_KRB4_REMOVAL~103
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/d60e487c6187af8c012abf84d7f9be80a6b7db4d

 - (djm) Bug #573 - Remove unneeded Krb headers and compat goop. Patch from
   simon@sxw.org.uk (Also matches a change in OpenBSD a while ago)
---

diff --git a/ChangeLog b/ChangeLog
index d301d91d..501a75cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20030603
+ - (djm) Bug #573 - Remove unneeded Krb headers and compat goop. Patch from
+   simon@sxw.org.uk (Also matches a change in OpenBSD a while ago)
+
 20030603
  - (djm) Replace setproctitle replacement with code derived from 
    UCB sendmail
diff --git a/servconf.c b/servconf.c
index c501d7b6..6df2a255 100644
--- a/servconf.c
+++ b/servconf.c
@@ -16,18 +16,6 @@ RCSID("$OpenBSD: servconf.c,v 1.122 2003/06/02 09:17:34 markus Exp $");
 #include <krb.h>
 #endif
 
-#if defined(KRB5)
-# ifdef HEIMDAL
-#  include <krb.h>
-# else
-/*
- * XXX: Bodge - but then, so is using the kerberos IV KEYFILE to get a 
- * Kerberos V keytab
- */
-#  define KEYFILE "/etc/krb5.keytab"
-# endif
-#endif
-
 #ifdef AFS
 #include <kafs.h>
 #endif