From 890909ec4821c2143ae6af4550aee977711bf914 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sat, 4 Mar 2006 08:59:39 +1100
Subject: [PATCH]  - (dtucker) [gss-serv-krb5.c] Bug #1166: Correct #ifdefs for
 gssapi_krb5.h    includes.  Patch from gentoo.riverrat at gmail.com.

---
 ChangeLog       | 4 +++-
 gss-serv-krb5.c | 4 ++--
 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 @@
  - (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 5c5837ffb..5a9b2cdd3 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