FreeBSD's /usr/include/gssapi.h claims that it is deprecated, and gssapi/gssapi.h should be used instead. Check HAVE_GSSAPI_GSSAPI_H first, falling back to HAVE_GSSAPI_H. Do the same for gssapi_generic.h, for consistency. --- ssh-gss.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ssh-gss.h b/ssh-gss.h index a8af117d2..330e5c75c 100644 --- a/ssh-gss.h +++ b/ssh-gss.h @@ -28,18 +28,18 @@ #ifdef GSSAPI -#ifdef HAVE_GSSAPI_H -#include <gssapi.h> -#elif defined(HAVE_GSSAPI_GSSAPI_H) +#ifdef HAVE_GSSAPI_GSSAPI_H #include <gssapi/gssapi.h> +#elif defined(HAVE_GSSAPI_H) +#include <gssapi.h> #endif #ifdef KRB5 # ifndef HEIMDAL -# ifdef HAVE_GSSAPI_GENERIC_H -# include <gssapi_generic.h> -# elif defined(HAVE_GSSAPI_GSSAPI_GENERIC_H) +# ifdef HAVE_GSSAPI_GSSAPI_GENERIC_H # include <gssapi/gssapi_generic.h> +# elif defined(HAVE_GSSAPI_GENERIC_H) +# include <gssapi_generic.h> # endif /* Old MIT Kerberos doesn't seem to define GSS_NT_HOSTBASED_SERVICE */ -- 2.32.0 _______________________________________________ openssh-unix-dev mailing list openssh-unix-dev@xxxxxxxxxxx https://lists.mindrot.org/mailman/listinfo/openssh-unix-dev
