summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--servconf.c4
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 @@
34 - markus@cvs.openbsd.org 2001/07/10 21:49:12 34 - markus@cvs.openbsd.org 2001/07/10 21:49:12
35 [readpass.c] 35 [readpass.c]
36 don't panic if fork or pipe fail (just return an empty passwd). 36 don't panic if fork or pipe fail (just return an empty passwd).
37 - itojun@cvs.openbsd.org 2001/07/11 00:24:53
38 [servconf.c]
39 make it compilable in all 4 combination of KRB4/KRB5 settings.
40 dugsong ok
41 XXX isn't it sensitive to the order of -I/usr/include/kerberosIV and
42 -I/usr/include/kerberosV?
37 43
3820010711 4420010711
39 - (djm) dirname(3) may modify its argument on glibc and other systems. 45 - (djm) dirname(3) may modify its argument on glibc and other systems.
@@ -6009,4 +6015,4 @@
6009 - Wrote replacements for strlcpy and mkdtemp 6015 - Wrote replacements for strlcpy and mkdtemp
6010 - Released 1.0pre1 6016 - Released 1.0pre1
6011 6017
6012$Id: ChangeLog,v 1.1395 2001/07/14 02:19:56 djm Exp $ 6018$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 @@
10 */ 10 */
11 11
12#include "includes.h" 12#include "includes.h"
13RCSID("$OpenBSD: servconf.c,v 1.87 2001/07/08 15:23:38 stevesk Exp $"); 13RCSID("$OpenBSD: servconf.c,v 1.88 2001/07/11 00:24:53 itojun Exp $");
14 14
15#ifdef KRB4 15#if defined(KRB4) || defined(KRB5)
16#include <krb.h> 16#include <krb.h>
17#endif 17#endif
18#ifdef AFS 18#ifdef AFS