- (dtucker) [gss-serv-krb5.c] Bug #1166: Correct #ifdefs for gssapi_krb5.h

includes.  Patch from gentoo.riverrat at gmail.com.
This commit is contained in:
Darren Tucker 2006-03-04 08:59:39 +11:00
parent 18614c254d
commit 890909ec48
2 changed files with 5 additions and 3 deletions

View File

@ -2,6 +2,8 @@
- (dtucker) [contrib/cygwin/ssh-host-config] Require use of lastlog as a - (dtucker) [contrib/cygwin/ssh-host-config] Require use of lastlog as a
file rather than directory, required as Cygwin will be importing lastlog(1). file rather than directory, required as Cygwin will be importing lastlog(1).
Also tightens up permissions on the file. Patch from vinschen@redhat.com. Also tightens up permissions on the file. Patch from vinschen@redhat.com.
- (dtucker) [gss-serv-krb5.c] Bug #1166: Correct #ifdefs for gssapi_krb5.h
includes. Patch from gentoo.riverrat at gmail.com.
20060226 20060226
- (dtucker) [configure.ac] Bug #1156: QNX apparently needs SSHD_ACQUIRES_CTTY - (dtucker) [configure.ac] Bug #1156: QNX apparently needs SSHD_ACQUIRES_CTTY
@ -3890,4 +3892,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4136 2006/03/03 21:50:31 dtucker Exp $ $Id: ChangeLog,v 1.4137 2006/03/03 21:59:39 dtucker Exp $

View File

@ -41,9 +41,9 @@ extern ServerOptions options;
#ifdef HEIMDAL #ifdef HEIMDAL
# include <krb5.h> # include <krb5.h>
#else #else
# ifdef HAVE_GSSAPI_KRB5 # ifdef HAVE_GSSAPI_KRB5_H
# include <gssapi_krb5.h> # include <gssapi_krb5.h>
# elif HAVE_GSSAPI_GSSAPI_KRB5 # elif HAVE_GSSAPI_GSSAPI_KRB5_H
# include <gssapi/gssapi_krb5.h> # include <gssapi/gssapi_krb5.h>
# endif # endif
#endif #endif