From 9d62685efdd6c79b9d23bc7236f8c3d963fe81a8 Mon Sep 17 00:00:00 2001
From: Luke Howard <lukeh@padl.com>
Date: Mon, 23 May 2011 16:18:48 -0400
Subject: [PATCH] ScopedAttribute/SimpleAttribute are displayable

---
 moonshot/mech_eap/util_shib.cpp | 10 ++++++++--
 openssh                         |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/moonshot/mech_eap/util_shib.cpp b/moonshot/mech_eap/util_shib.cpp
index 6124484..311de41 100644
--- a/moonshot/mech_eap/util_shib.cpp
+++ b/moonshot/mech_eap/util_shib.cpp
@@ -54,8 +54,9 @@
 #include <saml/saml2/core/Assertions.h>
 
 #include <shibsp/exceptions.h>
-#include <shibsp/attribute/BinaryAttribute.h>
 #include <shibsp/attribute/SimpleAttribute.h>
+#include <shibsp/attribute/BinaryAttribute.h>
+#include <shibsp/attribute/ScopedAttribute.h>
 #include <shibresolver/resolver.h>
 
 #include <sstream>
@@ -316,7 +317,12 @@ gss_eap_shib_attr_provider::getAttribute(const gss_buffer_t attr,
         valueBuf.value = (void *)str.c_str();
         valueBuf.length = str.length();
 
-        displayValueBuf = valueBuf;
+        const SimpleAttribute *simpleAttr =
+            dynamic_cast<const SimpleAttribute *>(shibAttr);
+        const ScopedAttribute *scopedAttr =
+            dynamic_cast<const ScopedAttribute *>(shibAttr);
+        if (simpleAttr != NULL || scopedAttr != NULL)
+            displayValueBuf = valueBuf;
     }
 
     if (authenticated != NULL)
diff --git a/openssh b/openssh
index 1a72587..ac0ba1f 160000
--- a/openssh
+++ b/openssh
@@ -1 +1 @@
-Subproject commit 1a7258779c5454494ac8e257cca2fc99a7e36dfe
+Subproject commit ac0ba1f390586dd0300f0a036ce30952b1dd5def
-- 
2.1.4