cleanup

diff --git a/mech_eap/util_radius.cpp b/mech_eap/util_radius.cpp
index 0d3e1ef..8373749 100644 (file)
--- a/mech_eap/util_radius.cpp
+++ b/mech_eap/util_radius.cpp
@@ -33,21 +33,21 @@
 #include "gssapiP_eap.h"
 
 bool
-gss_eap_radius_attr_source::initFromExistingContext(const gss_eap_attr_ctx *source,
+gss_eap_radius_attr_source::initFromExistingContext(const gss_eap_attr_ctx *manager,
                                                     const gss_eap_attr_source *ctx)
 {
-    if (!gss_eap_attr_source::initFromExistingContext(source, ctx))
+    if (!gss_eap_attr_source::initFromExistingContext(manager, ctx))
         return false;
 
     return true;
 }
 
 bool
-gss_eap_radius_attr_source::initFromGssContext(const gss_eap_attr_ctx *source,
+gss_eap_radius_attr_source::initFromGssContext(const gss_eap_attr_ctx *manager,
                                                const gss_cred_id_t gssCred,
                                                const gss_ctx_id_t gssCtx)
 {
-    if (!gss_eap_attr_source::initFromGssContext(source, gssCred, gssCtx))
+    if (!gss_eap_attr_source::initFromGssContext(manager, gssCred, gssCtx))
         return false;
 
     return true;

diff --git a/mech_eap/util_saml.cpp b/mech_eap/util_saml.cpp
index ca01dfb..f77a292 100644 (file)
--- a/mech_eap/util_saml.cpp
+++ b/mech_eap/util_saml.cpp
@@ -75,7 +75,7 @@ class auto_ptr_gss_buffer {
  * assertion.
  */
 bool
-gss_eap_saml_assertion_source::initFromExistingContext(const gss_eap_attr_ctx *source,
+gss_eap_saml_assertion_source::initFromExistingContext(const gss_eap_attr_ctx *manager,
                                                        const gss_eap_attr_source *ctx)
 {
     /* Then we may be creating from an existing attribute context */
@@ -83,7 +83,7 @@ gss_eap_saml_assertion_source::initFromExistingContext(const gss_eap_attr_ctx *s
 
     assert(m_assertion == NULL);
 
-    if (!gss_eap_attr_source::initFromExistingContext(source, ctx))
+    if (!gss_eap_attr_source::initFromExistingContext(manager, ctx))
         return false;
 
     saml = dynamic_cast<const gss_eap_saml_assertion_source *>(ctx);
@@ -93,7 +93,7 @@ gss_eap_saml_assertion_source::initFromExistingContext(const gss_eap_attr_ctx *s
 }
 
 bool
-gss_eap_saml_assertion_source::initFromGssContext(const gss_eap_attr_ctx *source,
+gss_eap_saml_assertion_source::initFromGssContext(const gss_eap_attr_ctx *manager,
                                                   const gss_cred_id_t gssCred,
                                                   const gss_ctx_id_t gssCtx)
 {
@@ -104,7 +104,7 @@ gss_eap_saml_assertion_source::initFromGssContext(const gss_eap_attr_ctx *source
 
     assert(m_assertion == NULL);
 
-    if (!gss_eap_attr_source::initFromGssContext(source, gssCred, gssCtx))
+    if (!gss_eap_attr_source::initFromGssContext(manager, gssCred, gssCtx))
         return false;
 
     radius = dynamic_cast<const gss_eap_radius_attr_source *>

diff --git a/mech_eap/util_shib.cpp b/mech_eap/util_shib.cpp
index 64179b4..f29e521 100644 (file)
--- a/mech_eap/util_shib.cpp
+++ b/mech_eap/util_shib.cpp
@@ -77,12 +77,12 @@ using namespace xercesc;
 using namespace std;
 
 bool
-gss_eap_shib_attr_source::initFromExistingContext(const gss_eap_attr_ctx *source,
+gss_eap_shib_attr_source::initFromExistingContext(const gss_eap_attr_ctx *manager,
                                                   const gss_eap_attr_source *ctx)
 {
     const gss_eap_shib_attr_source *shib;
 
-    if (!gss_eap_attr_source::initFromExistingContext(source, ctx))
+    if (!gss_eap_attr_source::initFromExistingContext(manager, ctx))
         return false;
 
     shib = dynamic_cast<const gss_eap_shib_attr_source *>(ctx);
@@ -140,7 +140,7 @@ addRadiusAttribute(const gss_eap_attr_source *provider,
 }
 
 bool
-gss_eap_shib_attr_source::initFromGssContext(const gss_eap_attr_ctx *source,
+gss_eap_shib_attr_source::initFromGssContext(const gss_eap_attr_ctx *manager,
                                              const gss_cred_id_t gssCred,
                                              const gss_ctx_id_t gssCtx)
 {
@@ -150,13 +150,13 @@ gss_eap_shib_attr_source::initFromGssContext(const gss_eap_attr_ctx *source,
     ShibbolethResolver *resolver = NULL;
     OM_uint32 minor;
 
-    if (!gss_eap_attr_source::initFromGssContext(source, gssCred, gssCtx))
+    if (!gss_eap_attr_source::initFromGssContext(manager, gssCred, gssCtx))
         return false;
 
     saml = dynamic_cast<const gss_eap_saml_assertion_source *>
-        (source->getProvider(ATTR_TYPE_SAML_ASSERTION));
+        (manager->getProvider(ATTR_TYPE_SAML_ASSERTION));
     radius = dynamic_cast<const gss_eap_radius_attr_source *>
-        (source->getProvider(ATTR_TYPE_RADIUS));
+        (manager->getProvider(ATTR_TYPE_RADIUS));
 
     if (gssCred != GSS_C_NO_CREDENTIAL &&
         gss_display_name(&minor, gssCred->name, &nameBuf, NULL) == GSS_S_COMPLETE)