GSSAPI headers

[Dag-Erling Smørgrav]

FreeBSD has both <gssapi.h> and <gssapi/gssapi.h>, but the former is a
wrapper that prints a warning before including the latter.  This is a
problem when building with -Werror.  This patch reverses the order of
preference so <gssapi/gssapi.h> wins over <gssapi.h>.

Index: ssh-gss.h
===================================================================
--- ssh-gss.h	(revision 255802)
+++ ssh-gss.h	(working copy)
@@ -28,10 +28,10 @@
 
 #ifdef GSSAPI
 
-#ifdef HAVE_GSSAPI_H
+#if defined(HAVE_GSSAPI_GSSAPI_H)
+#include <gssapi/gssapi.h>
+#elif defined(HAVE_GSSAPI_H)
 #include <gssapi.h>
-#elif defined(HAVE_GSSAPI_GSSAPI_H)
-#include <gssapi/gssapi.h>
 #endif
 
 #ifdef KRB5
Index: sshd.c
===================================================================
--- sshd.c	(revision 255802)
+++ sshd.c	(working copy)
@@ -88,10 +88,10 @@
 
 #ifdef __FreeBSD__
 #include <resolv.h>
-#if defined(GSSAPI) && defined(HAVE_GSSAPI_H)
+#if defined(GSSAPI) && defined(HAVE_GSSAPI_GSSAPI_H)
+#include <gssapi/gssapi.h>
+#elif defined(GSSAPI) && defined(HAVE_GSSAPI_H)
 #include <gssapi.h>
-#elif defined(GSSAPI) && defined(HAVE_GSSAPI_GSSAPI_H)
-#include <gssapi/gssapi.h>
 #endif
 #endif
 

DES
-- 
Dag-Erling Smørgrav - des at des.no