[extensions COMMIT] /cpp-sp-resolver/trunk/src/shibresolver/resolver.cpp

[noreply at shibboleth.net]

Author: scantor
Date: Tue Apr  3 22:38:27 2012
New Revision: 338

URL: http://svn.shibboleth.net/view/extensions?rev=338&view=rev
Log:
Add name-based API to GSSRequest

Modified:
    cpp-sp-resolver/trunk/src/shibresolver/resolver.cpp

Modified: cpp-sp-resolver/trunk/src/shibresolver/resolver.cpp
URL: http://svn.shibboleth.net/view/extensions/cpp-sp-resolver/trunk/src/shibresolver/resolver.cpp?rev=338&r1=337&r2=338&view=diff
==============================================================================
--- cpp-sp-resolver/trunk/src/shibresolver/resolver.cpp (original)
+++ cpp-sp-resolver/trunk/src/shibresolver/resolver.cpp Tue Apr  3 22:38:27 2012
@@ -144,9 +144,16 @@
     if (request) {
         const GSSRequest* gss = dynamic_cast<const GSSRequest*>(request);
         if (gss) {
-            // TODO: fix API to prevent destruction of contexts
+#ifdef SHIBRESOLVER_HAVE_GSSAPI_NAMINGEXTS
+            gss_name_t name = gss->getGSSName();
+            if (name != GSS_C_NO_NAME) {
+                addToken(name);
+                return;
+            }
+#endif
             gss_ctx_id_t ctx = gss->getGSSContext();
-            addToken(&ctx);
+            if (ctx != GSS_C_NO_CONTEXT)
+                addToken(&ctx);
         }
     }
 #endif