Attachment #2224 for bug #2073





		AC_SEARCH_LIBS([k_hasafs], [kafs], [AC_DEFINE([USE_AFS], [1],
			[Define this if you want to use libkafs' AFS support])])

		AC_CHECK_DECLS([GSS_C_NT_HOSTBASED_SERVICE], [], [], [[
#ifdef HAVE_GSSAPI_H
# include <gssapi.h>
#elif defined(HAVE_GSSAPI_GSSAPI_H)
# include <gssapi/gssapi.h>
#endif

#ifdef HAVE_GSSAPI_GENERIC_H
# include <gssapi_generic.h>
#elif defined(HAVE_GSSAPI_GSSAPI_GENERIC_H)
# include <gssapi/gssapi_generic.h>
#endif
		]])
	fi
	]
)




#   include <gssapi/gssapi_generic.h>
#  endif

/* Old MIT Kerberos doesn't seem to define GSS_NT_HOSTBASED_SERVICE */

#  if !HAVE_DECL_GSS_C_NT_HOSTBASED_SERVICE
#   define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
#  endif /* !HAVE_DECL_GSS_C_NT_... */

# endif /* !HEIMDAL */
#endif /* KRB5 */

/* draft-ietf-secsh-gsskeyex-06 */

Return to bug 2073

Lines 3722-3727 Link Here

(-)configure.ac (+14 lines)
3722		3722
3723	AC_SEARCH_LIBS([k_hasafs], [kafs], [AC_DEFINE([USE_AFS], [1],	3723	AC_SEARCH_LIBS([k_hasafs], [kafs], [AC_DEFINE([USE_AFS], [1],
3724	[Define this if you want to use libkafs' AFS support])])	3724	[Define this if you want to use libkafs' AFS support])])
		3725
		3726	AC_CHECK_DECLS([GSS_C_NT_HOSTBASED_SERVICE], [], [], [[
		3727	#ifdef HAVE_GSSAPI_H
		3728	# include <gssapi.h>
		3729	#elif defined(HAVE_GSSAPI_GSSAPI_H)
		3730	# include <gssapi/gssapi.h>
		3731	#endif
		3732
		3733	#ifdef HAVE_GSSAPI_GENERIC_H
		3734	# include <gssapi_generic.h>
		3735	#elif defined(HAVE_GSSAPI_GSSAPI_GENERIC_H)
		3736	# include <gssapi/gssapi_generic.h>
		3737	#endif
		3738	]])
3725	fi	3739	fi
3726	]	3740	]
3727	)	3741	)

Lines 42-53 Link Here

(-)ssh-gss.h (-5 / +6 lines)
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 */