try to guard against multiple shibboleth library initializations

[mech_eap.orig] / util_radius.cpp

diff --git a/util_radius.cpp b/util_radius.cpp
index 09f4559..5a109fe 100644 (file)
--- a/util_radius.cpp
+++ b/util_radius.cpp
@@ -63,12 +63,12 @@ gss_eap_radius_attr_provider::~gss_eap_radius_attr_provider(void)
 }
 
 bool
-gss_eap_radius_attr_provider::initFromExistingContext(const gss_eap_attr_ctx *manager,
+gss_eap_radius_attr_provider::initWithExistingContext(const gss_eap_attr_ctx *manager,
                                                       const gss_eap_attr_provider *ctx)
 {
     const gss_eap_radius_attr_provider *radius;
 
-    if (!gss_eap_attr_provider::initFromExistingContext(manager, ctx))
+    if (!gss_eap_attr_provider::initWithExistingContext(manager, ctx))
         return false;
 
     radius = static_cast<const gss_eap_radius_attr_provider *>(ctx);
@@ -82,11 +82,11 @@ gss_eap_radius_attr_provider::initFromExistingContext(const gss_eap_attr_ctx *ma
 }
 
 bool
-gss_eap_radius_attr_provider::initFromGssContext(const gss_eap_attr_ctx *manager,
+gss_eap_radius_attr_provider::initWithGssContext(const gss_eap_attr_ctx *manager,
                                                  const gss_cred_id_t gssCred,
                                                  const gss_ctx_id_t gssCtx)
 {
-    if (!gss_eap_attr_provider::initFromGssContext(manager, gssCred, gssCtx))
+    if (!gss_eap_attr_provider::initWithGssContext(manager, gssCred, gssCtx))
         return false;
 
     if (gssCtx != GSS_C_NO_CONTEXT) {
@@ -190,7 +190,6 @@ copyAvps(const VALUE_PAIR *src)
         if (vpcopy == NULL) {
             pairfree(&dst);
             throw std::bad_alloc();
-            return NULL;
         }
         *pDst = vpcopy;
         pDst = &vpcopy->next;
@@ -673,10 +672,8 @@ jsonToAvp(VALUE_PAIR **pVp, JSONObject &obj)
         /* Assume unknown attributes are octet strings */
         vp = paircreate(attrid, PW_TYPE_OCTETS);
     }
-    if (vp == NULL) {
+    if (vp == NULL)
         throw std::bad_alloc();
-        goto fail;
-    }
 
     switch (vp->type) {
     case PW_TYPE_INTEGER: