summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-03-04 08:59:21 +1100
committerDarren Tucker <dtucker@zip.com.au>2006-03-04 08:59:21 +1100
commit106a70847559fea1517f860f92d9998546c076b8 (patch)
tree1cca57562356b8491b7a768d528ca6beafb16ff0
parent56cf3dc50961bcc871a2d86984049e80c24d6456 (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--ChangeLog6
-rw-r--r--gss-serv-krb5.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c9b5018b..e1f3759c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20060304
+ - (dtucker) [gss-serv-krb5.c] Bug #1166: Correct #ifdefs for gssapi_krb5.h
+ includes. Patch from gentoo.riverrat at gmail.com.
+
20060211
- (dtucker) [README] Bump release notes URL.
- (djm) Release 4.3p2
@@ -3851,4 +3855,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.4117.2.10 2006/02/11 00:00:44 djm Exp $
+$Id: ChangeLog,v 1.4117.2.11 2006/03/03 21:59:21 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