RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) Bug #573 - Remove unneeded Krb headers and compat goop. Patch from 

simon@sxw.org.uk (Also matches a change in OpenBSD a while ago)
This commit is contained in:
Damien Miller 2003-06-04 19:06:59 +10:00
parent d311c4e54b
commit 865173ee03
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,7 @@
20030603
- (djm) Bug #573 - Remove unneeded Krb headers and compat goop. Patch from
simon@sxw.org.uk (Also matches a change in OpenBSD a while ago)
20030603 20030603
- (djm) Replace setproctitle replacement with code derived from - (djm) Replace setproctitle replacement with code derived from
UCB sendmail UCB sendmail
@ -425,4 +429,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.2770 2003/06/03 03:09:16 djm Exp $ $Id: ChangeLog,v 1.2771 2003/06/04 09:06:59 djm Exp $

12
servconf.c
View File

@ -16,18 +16,6 @@ RCSID("$OpenBSD: servconf.c,v 1.122 2003/06/02 09:17:34 markus Exp $");
#include <krb.h> #include <krb.h>
#endif #endif
#if defined(KRB5)
# 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 #ifdef AFS
#include <kafs.h> #include <kafs.h>
#endif #endif