From ee11009b1b229232ffa9c4443b2db211d6fa9717 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Wed, 3 Jun 2015 16:33:32 +0200
Subject: [PATCH] GSSAPI: Use modern headerfiles in preference to old.
Prefer <gssapi/gssapi.h> to <gssapi.h>, etc.
Fixes warnings with some implementations of gssapi.
---
src/post_modules/GSSAPI/configure.in | 12 ++++++------
src/post_modules/GSSAPI/gssapi.cmod | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/post_modules/GSSAPI/configure.in b/src/post_modules/GSSAPI/configure.in
index e915121d2b..973bc926ed 100644
--- a/src/post_modules/GSSAPI/configure.in
+++ b/src/post_modules/GSSAPI/configure.in
@@ -39,17 +39,17 @@ if test x$ac_cv_header_gssapi_h = xyes -o \
AC_MSG_CHECKING([for OID $1])
AC_CACHE_VAL(pike_cv_have_oid_$1, [
AC_TRY_LINK([
-#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>
#elif defined(HAVE_GSSGLUE_GSSAPI_GSSAPI_H)
#include <gssglue/gssapi/gssapi.h>
#endif
-#ifdef HAVE_GSSAPI_KRB5_H
-#include <gssapi_krb5.h>
-#elif defined(HAVE_GSSAPI_GSSAPI_KRB5_H)
+#ifdef HAVE_GSSAPI_GSSAPI_KRB5_H
#include <gssapi/gssapi_krb5.h>
+#elif defined(HAVE_GSSAPI_KRB5_H)
+#include <gssapi_krb5.h>
#elif defined(HAVE_GSSGLUE_GSSAPI_GSSAPI_KRB5_H)
#include <gssglue/gssapi/gssapi_krb5.h>
#endif
diff --git a/src/post_modules/GSSAPI/gssapi.cmod b/src/post_modules/GSSAPI/gssapi.cmod
index 2d196ab0e8..4f8e110b9c 100644
--- a/src/post_modules/GSSAPI/gssapi.cmod
+++ b/src/post_modules/GSSAPI/gssapi.cmod
@@ -55,10 +55,10 @@ DECLARATIONS
#ifdef HAVE_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>
#elif defined (HAVE_GSSGLUE_GSSAPI_GSSAPI_H)
#include <gssglue/gssapi/gssapi.h>
#endif
@@ -70,10 +70,10 @@ DECLARATIONS
}; \
static const gss_OID_desc * const NAME = &PIKE_CONCAT (NAME, _desc)
-#ifdef HAVE_GSSAPI_KRB5_H
-#include <gssapi_krb5.h>
-#elif defined (HAVE_GSSAPI_GSSAPI_KRB5_H)
+#ifdef HAVE_GSSAPI_GSSAPI_KRB5_H
#include <gssapi/gssapi_krb5.h>
+#elif defined (HAVE_GSSAPI_KRB5_H)
+#include <gssapi_krb5.h>
#elif defined (HAVE_GSSGLUE_GSSAPI_GSSAPI_KRB5_H)
#include <gssglue/gssapi/gssapi_krb5.h>
#elif !defined(HAVE_GSS_KRB5_NT_PRINCIPAL_NAME)
--
GitLab