diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | servconf.c | 12 |
2 files changed, 5 insertions, 13 deletions
@@ -1,4 +1,8 @@ | |||
1 | 20030603 | 1 | 20030603 |
2 | - (djm) Bug #573 - Remove unneeded Krb headers and compat goop. Patch from | ||
3 | simon@sxw.org.uk (Also matches a change in OpenBSD a while ago) | ||
4 | |||
5 | 20030603 | ||
2 | - (djm) Replace setproctitle replacement with code derived from | 6 | - (djm) Replace setproctitle replacement with code derived from |
3 | UCB sendmail | 7 | UCB sendmail |
4 | - (djm) OpenBSD CVS Sync | 8 | - (djm) OpenBSD CVS Sync |
@@ -425,4 +429,4 @@ | |||
425 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 429 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
426 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 430 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
427 | 431 | ||
428 | $Id: ChangeLog,v 1.2770 2003/06/03 03:09:16 djm Exp $ | 432 | $Id: ChangeLog,v 1.2771 2003/06/04 09:06:59 djm Exp $ |
diff --git a/servconf.c b/servconf.c index c501d7b64..6df2a255b 100644 --- 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 $"); | |||
16 | #include <krb.h> | 16 | #include <krb.h> |
17 | #endif | 17 | #endif |
18 | 18 | ||
19 | #if defined(KRB5) | ||
20 | # ifdef HEIMDAL | ||
21 | # include <krb.h> | ||
22 | # else | ||
23 | /* | ||
24 | * XXX: Bodge - but then, so is using the kerberos IV KEYFILE to get a | ||
25 | * Kerberos V keytab | ||
26 | */ | ||
27 | # define KEYFILE "/etc/krb5.keytab" | ||
28 | # endif | ||
29 | #endif | ||
30 | |||
31 | #ifdef AFS | 19 | #ifdef AFS |
32 | #include <kafs.h> | 20 | #include <kafs.h> |
33 | #endif | 21 | #endif |