git: 258f5f79bb36 - main - openssh: restore local change to gssapi include logic

[Ed Maste]

The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=258f5f79bb36e3e6955e7fb149cd2f50265a9ea5

commit 258f5f79bb36e3e6955e7fb149cd2f50265a9ea5
Author:     Ed Maste <emaste at FreeBSD.org>
AuthorDate: 2021-09-02 20:43:59 +0000
Commit:     Ed Maste <emaste at FreeBSD.org>
CommitDate: 2021-09-03 20:07:47 +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:  https://reviews.freebsd.org/D31810
---
 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
 
-#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