summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-03-04 08:59:39 +1100
committerDarren Tucker <dtucker@zip.com.au>2006-03-04 08:59:39 +1100
commit890909ec4821c2143ae6af4550aee977711bf914 (patch)
treeba8d195e8988c531f923e684ba194e8263662ee3
parent18614c254d83466ab706ffd0d4f58a8a018dcddf (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--ChangeLog4
-rw-r--r--gss-serv-krb5.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f714b84e0..880d5e56f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
2 - (dtucker) [contrib/cygwin/ssh-host-config] Require use of lastlog as a 2 - (dtucker) [contrib/cygwin/ssh-host-config] Require use of lastlog as a
3 file rather than directory, required as Cygwin will be importing lastlog(1). 3 file rather than directory, required as Cygwin will be importing lastlog(1).
4 Also tightens up permissions on the file. Patch from vinschen@redhat.com. 4 Also tightens up permissions on the file. Patch from vinschen@redhat.com.
5 - (dtucker) [gss-serv-krb5.c] Bug #1166: Correct #ifdefs for gssapi_krb5.h
6 includes. Patch from gentoo.riverrat at gmail.com.
5 7
620060226 820060226
7 - (dtucker) [configure.ac] Bug #1156: QNX apparently needs SSHD_ACQUIRES_CTTY 9 - (dtucker) [configure.ac] Bug #1156: QNX apparently needs SSHD_ACQUIRES_CTTY
@@ -3890,4 +3892,4 @@
3890 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3892 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3891 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3893 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3892 3894
3893$Id: ChangeLog,v 1.4136 2006/03/03 21:50:31 dtucker Exp $ 3895$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 5c5837ffb..5a9b2cdd3 100644
--- a/gss-serv-krb5.c
+++ b/gss-serv-krb5.c
@@ -41,9 +41,9 @@ extern ServerOptions options;
41#ifdef HEIMDAL 41#ifdef HEIMDAL
42# include <krb5.h> 42# include <krb5.h>
43#else 43#else
44# ifdef HAVE_GSSAPI_KRB5 44# ifdef HAVE_GSSAPI_KRB5_H
45# include <gssapi_krb5.h> 45# include <gssapi_krb5.h>
46# elif HAVE_GSSAPI_GSSAPI_KRB5 46# elif HAVE_GSSAPI_GSSAPI_KRB5_H
47# include <gssapi/gssapi_krb5.h> 47# include <gssapi/gssapi_krb5.h>
48# endif 48# endif
49#endif 49#endif