From c4b7feabe0f65e8fc67aa1a213749b974e9fced9 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sat, 14 Jul 2001 12:20:32 +1000 Subject: - itojun@cvs.openbsd.org 2001/07/11 00:24:53 [servconf.c] make it compilable in all 4 combination of KRB4/KRB5 settings. dugsong ok XXX isn't it sensitive to the order of -I/usr/include/kerberosIV and -I/usr/include/kerberosV? --- ChangeLog | 8 +++++++- servconf.c | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 866903664..2e3f57a3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,12 @@ - markus@cvs.openbsd.org 2001/07/10 21:49:12 [readpass.c] don't panic if fork or pipe fail (just return an empty passwd). + - itojun@cvs.openbsd.org 2001/07/11 00:24:53 + [servconf.c] + make it compilable in all 4 combination of KRB4/KRB5 settings. + dugsong ok + XXX isn't it sensitive to the order of -I/usr/include/kerberosIV and + -I/usr/include/kerberosV? 20010711 - (djm) dirname(3) may modify its argument on glibc and other systems. @@ -6009,4 +6015,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1395 2001/07/14 02:19:56 djm Exp $ +$Id: ChangeLog,v 1.1396 2001/07/14 02:20:32 djm Exp $ diff --git a/servconf.c b/servconf.c index 47eb66d83..0f16c851e 100644 --- a/servconf.c +++ b/servconf.c @@ -10,9 +10,9 @@ */ #include "includes.h" -RCSID("$OpenBSD: servconf.c,v 1.87 2001/07/08 15:23:38 stevesk Exp $"); +RCSID("$OpenBSD: servconf.c,v 1.88 2001/07/11 00:24:53 itojun Exp $"); -#ifdef KRB4 +#if defined(KRB4) || defined(KRB5) #include #endif #ifdef AFS -- cgit v1.2.3