diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2021-09-02 20:43:59 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2021-11-08 23:59:37 +0000 |
| commit | a471dcbd681ed59c40f7b7a258b4cd8229168686 (patch) | |
| tree | b9213402b0a55dee586f3f30d4025e9b8e8ee40a | |
| parent | 4cef2da575c5f9b54f301d857455b97b96df2c9f (diff) | |
| download | src-a471dcbd681ed59c40f7b7a258b4cd8229168686.tar.gz src-a471dcbd681ed59c40f7b7a258b4cd8229168686.zip | |
openssh: restore local change to gssapi include logic
/usr/include/gssapi.h claims that it is deprecated, and gssapi/gssapi.h
should be used instead. So, test HAVE_GSSAPI_GSSAPI_H first falling
back to HAVE_GSSAPI_H.
This will be submitted upstream.
Fixes: 6eac665c8126 ("openssh: diff reduction against...")
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D31810
(cherry picked from commit 258f5f79bb36e3e6955e7fb149cd2f50265a9ea5)
| -rw-r--r-- | crypto/openssh/ssh-gss.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssh/ssh-gss.h b/crypto/openssh/ssh-gss.h index 1e2d00e47ff1..887399b6b00a 100644 --- a/crypto/openssh/ssh-gss.h +++ b/crypto/openssh/ssh-gss.h @@ -29,10 +29,10 @@ #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 |