add export_sec_context variant that does not reenter local attribute path

[mech_eap.orig] / util_json.h

diff --git a/util_json.h b/util_json.h
index 639e7b0..f987d34 100644 (file)
--- a/util_json.h
+++ b/util_json.h
@@ -31,7 +31,7 @@
  */
 
 /*
- * JSON object wrapper with toll-free DDF bridging.
+ * JSON object wrapper with not-entirely-toll-free DDF bridging.
  */
 
 #ifndef _UTIL_JSON_H_
@@ -46,7 +46,7 @@
 
 using namespace shibsp;
 
-namespace gss_eap {
+namespace gss_eap_util {
     class JSONObject;
 
     class JSONIterator {
@@ -130,7 +130,7 @@ namespace gss_eap {
         friend class JSONIterator;
 
         json_t *get(void) const {
-            return m_obj ? json_incref(m_obj) : json_null();
+            return json_incref(m_obj);
         }
 
         void set(json_t *obj) {
@@ -144,7 +144,6 @@ namespace gss_eap {
 
         json_t *m_obj;
     };
-
 }
 
 #endif /* __cplusplus */