diff options
author | Damien Miller <djm@mindrot.org> | 2003-05-14 13:40:06 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-05-14 13:40:06 +1000 |
commit | d558092522153caa627e33e4a76c6f64332bc609 (patch) | |
tree | 78618b9f2e8464d130d14739ee14b7786706934f /servconf.c | |
parent | 1a27a1ee8c0ddd6f390feade92259c001f36530f (diff) | |
download | openssh-git-d558092522153caa627e33e4a76c6f64332bc609.tar.gz |
- (djm) RCSID sync w/ OpenBSD
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 20 |
1 files changed, 12 insertions, 8 deletions
@@ -10,20 +10,24 @@ */ #include "includes.h" -RCSID("$OpenBSD: servconf.c,v 1.116 2003/02/21 09:05:53 markus Exp $"); +RCSID("$OpenBSD: servconf.c,v 1.118 2003/04/09 08:23:52 hin Exp $"); #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 +# 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 |