- (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 d301d91d2a20454fa71f0e786b0d75246ccd0c01..501a75cdde5ce0ac77078dca20ac817ae06ffdf7 100644 (file)
--- 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 c501d7b64050e116822dd8c7d65c909e8ff734c7..6df2a255bd3e5afd197fdd430204f4d2c014abd8 100644 (file)
--- 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