From: dtucker <dtucker>
Date: Fri, 3 Mar 2006 21:59:39 +0000 (+0000)
Subject:  - (dtucker) [gss-serv-krb5.c] Bug #1166: Correct #ifdefs for gssapi_krb5.h
X-Git-Tag: V_4_4_P1~435
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/a8d3dd477362a8043ad7f42f5b551f8e0737afe7

 - (dtucker) [gss-serv-krb5.c] Bug #1166: Correct #ifdefs for gssapi_krb5.h
   includes.  Patch from gentoo.riverrat at gmail.com.
---

diff --git a/ChangeLog b/ChangeLog
index 68844681..d12adb6e 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
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