git: a471dcbd681e - stable/12 - openssh: restore local change to gssapi include logic

From: Ed Maste <>
Date: Tue, 09 Nov 2021 00:25:15 UTC
The branch stable/12 has been updated by emaste:


commit a471dcbd681ed59c40f7b7a258b4cd8229168686
Author:     Ed Maste <>
AuthorDate: 2021-09-02 20:43:59 +0000
Commit:     Ed Maste <>
CommitDate: 2021-11-08 23:59:37 +0000

    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:
    (cherry picked from commit 258f5f79bb36e3e6955e7fb149cd2f50265a9ea5)
 crypto/openssh/ssh-gss.h | 6 +++---
 1 file 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
-#include <gssapi.h>
-#elif defined(HAVE_GSSAPI_GSSAPI_H)
 #include <gssapi/gssapi.h>
+#elif defined(HAVE_GSSAPI_H)
+#include <gssapi.h>
 #ifdef KRB5