From 6538a9e5bb4a3a5918a8306b00e32f5a507b4147 Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Tue, 19 Apr 2011 18:17:06 +0000
Subject: [PATCH] Support for GSS names anytime naming extensions are
 available.

---
 configure.ac                        | 14 +-------------
 src/shibresolver/config_pub.h.in    |  4 ++--
 src/shibresolver/config_pub_win32.h |  4 ++--
 src/shibresolver/resolver.cpp       |  4 ++--
 src/shibresolver/resolver.h         |  2 +-
 5 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3902b63..1ff8bec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -402,19 +402,7 @@ if test x"$want_gss" = xyes; then
   AC_COMPILE_IFELSE(
     [AC_LANG_PROGRAM([[#include <gssapi/gssapi_ext.h>]],
     [[gss_get_name_attribute(NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);]])],
-    [AC_MSG_RESULT([yes])AC_DEFINE([HAVE_GSSAPI_NAMINGEXTS],[1],[Define to 1 if GSS-API naming extensions are available.])],
-    [AC_MSG_RESULT([no])])
-
-  AC_MSG_CHECKING([whether GSS-API composite name import is available])
-  AC_COMPILE_IFELSE(
-    [AC_LANG_PROGRAM([[#include <gssapi/gssapi_ext.h>]],
-    [[
-    OM_uint32 minor;
-    gss_name_t srcname;
-    gss_buffer_desc importbuf;
-    gss_import_name(&minor, &importbuf, GSS_C_NT_EXPORT_NAME_COMPOSITE, &srcname);
-    ]])],
-    [AC_MSG_RESULT([yes])AC_DEFINE([SHIBRESOLVER_HAVE_GSSAPI_COMPOSITE_NAME],[1],[Define to 1 if GSS-API composite name import is available.])],
+    [AC_MSG_RESULT([yes])AC_DEFINE([SHIBRESOLVER_HAVE_GSSAPI_NAMINGEXTS],[1],[Define to 1 if GSS-API naming extensions are available.])],
     [AC_MSG_RESULT([no])])
 
 else
diff --git a/src/shibresolver/config_pub.h.in b/src/shibresolver/config_pub.h.in
index 27e0991..17e2a23 100644
--- a/src/shibresolver/config_pub.h.in
+++ b/src/shibresolver/config_pub.h.in
@@ -10,5 +10,5 @@
 /* if you have the MIT gssapi libraries */
 #undef SHIBRESOLVER_HAVE_GSSMIT
 
-/* if you have GSS composite name support */
-#undef SHIBRESOLVER_HAVE_GSSAPI_COMPOSITE_NAME
+/* if you have GSS naming extensions support */
+#undef SHIBRESOLVER_HAVE_GSSAPI_NAMINGEXTS
diff --git a/src/shibresolver/config_pub_win32.h b/src/shibresolver/config_pub_win32.h
index 27e0991..17e2a23 100644
--- a/src/shibresolver/config_pub_win32.h
+++ b/src/shibresolver/config_pub_win32.h
@@ -10,5 +10,5 @@
 /* if you have the MIT gssapi libraries */
 #undef SHIBRESOLVER_HAVE_GSSMIT
 
-/* if you have GSS composite name support */
-#undef SHIBRESOLVER_HAVE_GSSAPI_COMPOSITE_NAME
+/* if you have GSS naming extensions support */
+#undef SHIBRESOLVER_HAVE_GSSAPI_NAMINGEXTS
diff --git a/src/shibresolver/resolver.cpp b/src/shibresolver/resolver.cpp
index bc80d8c..6b847e7 100644
--- a/src/shibresolver/resolver.cpp
+++ b/src/shibresolver/resolver.cpp
@@ -22,7 +22,7 @@
 
 #include "internal.h"
 
-#ifdef SHIBRESOLVER_HAVE_GSSAPI_COMPOSITE_NAME
+#ifdef SHIBRESOLVER_HAVE_GSSAPI_NAMINGEXTS
 # include <gssapi/gssapi_ext.h>
 #endif
 
@@ -198,7 +198,7 @@ void ShibbolethResolver::addToken(const gss_buffer_t contextbuf)
     }
 }
 
-#ifdef SHIBRESOLVER_HAVE_GSSAPI_COMPOSITE_NAME
+#ifdef SHIBRESOLVER_HAVE_GSSAPI_NAMINGEXTS
 void ShibbolethResolver::addToken(gss_name_t name)
 {
     if (m_gsswrapper) {
diff --git a/src/shibresolver/resolver.h b/src/shibresolver/resolver.h
index ffbdc7c..1c334d7 100644
--- a/src/shibresolver/resolver.h
+++ b/src/shibresolver/resolver.h
@@ -116,7 +116,7 @@ namespace shibresolver {
          */
         void addToken(const gss_buffer_t token);
 
-# ifndef SHIBRESOLVER_HAVE_GSSAPI_COMPOSITE_NAME
+# ifdef SHIBRESOLVER_HAVE_GSSAPI_NAMINGEXTS
         /**
          * Adds a GSS-API mechanism name as input to the resolver.
          * <p>The caller retains ownership of the name.
-- 
2.1.4