automate check for gssapi_ext.h, cleanup headers

[openssh.git] / ssh-gss.h

diff --git a/ssh-gss.h b/ssh-gss.h
index 55eabc7..a3245ea 100644 (file)
--- a/ssh-gss.h
+++ b/ssh-gss.h
@@ -34,26 +34,12 @@
 #include <gssapi/gssapi.h>
 #endif
 
 #include <gssapi/gssapi.h>
 #endif
 

-#ifdef KRB5
-# ifndef HEIMDAL
-#  ifdef HAVE_GSSAPI_GENERIC_H
-#   include <gssapi_generic.h>
-#  elif defined(HAVE_GSSAPI_GSSAPI_GENERIC_H)
-#   include <gssapi/gssapi_generic.h>
-#  endif
-
-#ifndef HEIMDAL
+#ifdef HAVE_GSSAPI_EXT_H
+#include <gssapi_ext.h>
+#elif defined(HAVE_GSSAPI_GSSAPI_EXT_H)

 #include <gssapi/gssapi_ext.h>
 #endif
 
 #include <gssapi/gssapi_ext.h>
 #endif
 

-/* MIT Kerberos doesn't seem to define GSS_NT_HOSTBASED_SERVICE */
-
-#ifndef GSS_C_NT_HOSTBASED_SERVICE
-#define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
-#endif /* GSS_C_NT_... */
-#endif /* !HEIMDAL */
-#endif /* KRB5 */
-

 /* draft-ietf-secsh-gsskeyex-06 */
 #define SSH2_MSG_USERAUTH_GSSAPI_RESPONSE              60
 #define SSH2_MSG_USERAUTH_GSSAPI_TOKEN                 61
 /* draft-ietf-secsh-gsskeyex-06 */
 #define SSH2_MSG_USERAUTH_GSSAPI_RESPONSE              60
 #define SSH2_MSG_USERAUTH_GSSAPI_TOKEN                 61