- (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)

2 files changed, 5 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index e8df3ba4a..47df87cf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 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
  - (djm) OpenBSD CVS Sync
@@ -425,4 +429,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2770 2003/06/03 03:09:16 djm Exp $
+$Id: ChangeLog,v 1.2771 2003/06/04 09:06:59 djm Exp $
diff --git a/servconf.c b/servconf.c
index c501d7b64..6df2a255b 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