1 files changed, 10 insertions, 1 deletions
diff --git a/servconf.c b/servconf.c
index 8e6ee5bb3..8b5ee7bf1 100644
--- a/servconf.c
+++ b/servconf.c
@@ -12,8 +12,17 @@
 #include "includes.h"
 RCSID("$OpenBSD: servconf.c,v 1.105 2002/03/20 19:12:24 stevesk Exp $");
-#if defined(KRB4) || defined(KRB5)
+#if defined(KRB4)
+#include <krb.h>
+#endif
+#if defined(KRB5)
+#ifdef HEIMDAL
 #include <krb.h>
+#else
+/* 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>

diff --git a/servconf.c b/servconf.c index 8e6ee5bb3..8b5ee7bf1 100644 --- a/servconf.c +++ b/servconf.c
@@ -12,8 +12,17 @@
12	#include "includes.h"	12	#include "includes.h"
13	RCSID("$OpenBSD: servconf.c,v 1.105 2002/03/20 19:12:24 stevesk Exp $");	13	RCSID("$OpenBSD: servconf.c,v 1.105 2002/03/20 19:12:24 stevesk Exp $");
14		14
15	#if defined(KRB4) \|\| defined(KRB5)	15	#if defined(KRB4)
		16	#include <krb.h>
		17	#endif
		18	#if defined(KRB5)
		19	#ifdef HEIMDAL
16	#include <krb.h>	20	#include <krb.h>
		21	#else
		22	/* Bodge - but then, so is using the kerberos IV KEYFILE to get a Kerberos V
		23	* keytab */
		24	#define KEYFILE "/etc/krb5.keytab"
		25	#endif
17	#endif	26	#endif
18	#ifdef AFS	27	#ifdef AFS
19	#include <kafs.h>	28	#include <kafs.h>