diff options
author | Darren Tucker <dtucker@zip.com.au> | 2006-03-04 08:59:39 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2006-03-04 08:59:39 +1100 |
commit | 890909ec4821c2143ae6af4550aee977711bf914 (patch) | |
tree | ba8d195e8988c531f923e684ba194e8263662ee3 | |
parent | 18614c254d83466ab706ffd0d4f58a8a018dcddf (diff) |
- (dtucker) [gss-serv-krb5.c] Bug #1166: Correct #ifdefs for gssapi_krb5.h
includes. Patch from gentoo.riverrat at gmail.com.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | gss-serv-krb5.c | 4 |
2 files changed, 5 insertions, 3 deletions
@@ -2,6 +2,8 @@ - (dtucker) [contrib/cygwin/ssh-host-config] Require use of lastlog as a file rather than directory, required as Cygwin will be importing lastlog(1). 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 - (dtucker) [configure.ac] Bug #1156: QNX apparently needs SSHD_ACQUIRES_CTTY @@ -3890,4 +3892,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (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 $ diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c index 5c5837ff..5a9b2cdd 100644 --- a/gss-serv-krb5.c +++ b/gss-serv-krb5.c @@ -41,9 +41,9 @@ extern ServerOptions options; #ifdef HEIMDAL # include <krb5.h> #else -# ifdef HAVE_GSSAPI_KRB5 +# ifdef HAVE_GSSAPI_KRB5_H # include <gssapi_krb5.h> -# elif HAVE_GSSAPI_GSSAPI_KRB5 +# elif HAVE_GSSAPI_GSSAPI_KRB5_H # include <gssapi/gssapi_krb5.h> # endif #endif |