1 files changed, 6 insertions, 5 deletions
diff --git a/ssh-gss.h b/ssh-gss.h
index c29a1b7e7..077e13ce4 100644
--- a/ssh-gss.h
+++ b/ssh-gss.h
@@ -42,12 +42,13 @@
 #   include <gssapi/gssapi_generic.h>
 #  endif
-/* MIT Kerberos doesn't seem to define GSS_NT_HOSTBASED_SERVICE */
+/* Old MIT Kerberos doesn't seem to define GSS_NT_HOSTBASED_SERVICE */
-#ifndef GSS_C_NT_HOSTBASED_SERVICE
+#  if !HAVE_DECL_GSS_C_NT_HOSTBASED_SERVICE
-#define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
+#   define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
-#endif /* GSS_C_NT_... */
+#  endif /* !HAVE_DECL_GSS_C_NT_... */
-#endif /* !HEIMDAL */
+# endif /* !HEIMDAL */
 #endif /* KRB5 */
 /* draft-ietf-secsh-gsskeyex-06 */

diff --git a/ssh-gss.h b/ssh-gss.h index c29a1b7e7..077e13ce4 100644 --- a/ssh-gss.h +++ b/ssh-gss.h
@@ -42,12 +42,13 @@
42	# include <gssapi/gssapi_generic.h>	42	# include <gssapi/gssapi_generic.h>
43	# endif	43	# endif
44		44
45	/* MIT Kerberos doesn't seem to define GSS_NT_HOSTBASED_SERVICE */	45	/* Old MIT Kerberos doesn't seem to define GSS_NT_HOSTBASED_SERVICE */
46		46
47	#ifndef GSS_C_NT_HOSTBASED_SERVICE	47	# if !HAVE_DECL_GSS_C_NT_HOSTBASED_SERVICE
48	#define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name	48	# define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
49	#endif /* GSS_C_NT_... */	49	# endif /* !HAVE_DECL_GSS_C_NT_... */
50	#endif /* !HEIMDAL */	50
		51	# endif /* !HEIMDAL */
51	#endif /* KRB5 */	52	#endif /* KRB5 */
52		53
53	/* draft-ietf-secsh-gsskeyex-06 */	54	/* draft-ietf-secsh-gsskeyex-06 */