cleanup

[cyrus-sasl.git] / mech_eap / util_shib.h

diff --git a/mech_eap/util_shib.h b/mech_eap/util_shib.h
index aa5cd14..8064aa7 100644 (file)
--- a/mech_eap/util_shib.h
+++ b/mech_eap/util_shib.h
@@ -41,12 +41,15 @@ namespace shibsp {
 
 struct gss_eap_shib_attr_provider : gss_eap_attr_provider {
 public:
-    gss_eap_shib_attr_provider(const gss_eap_attr_ctx *ctx);
-    gss_eap_shib_attr_provider(const gss_eap_attr_ctx *ctx,
-                               gss_cred_id_t acceptorCred,
-                               gss_ctx_id_t acceptorCtx);
+    gss_eap_shib_attr_provider(void) {}
     ~gss_eap_shib_attr_provider(void);
 
+    bool initFromExistingContext(const gss_eap_attr_ctx *source,
+                                 const gss_eap_attr_provider *ctx);
+    bool initFromGssContext(const gss_eap_attr_ctx *source,
+                            const gss_cred_id_t cred,
+                            const gss_ctx_id_t ctx);
+
     void setAttribute(int complete,
                       const gss_buffer_t attr,
                       const gss_buffer_t value);
@@ -71,10 +74,8 @@ public:
     static bool init();
     static void finalize();
 
-    static gss_eap_attr_provider *
-    createAttrContext(const gss_eap_attr_ctx *ctx,
-                      gss_cred_id_t acceptorCred,
-                           gss_ctx_id_t acceptorCtx);
+    static gss_eap_attr_provider *createAttrContext(void);
+
 private:
     int getAttributeIndex(const gss_buffer_t attr) const;
     const shibsp::Attribute *getAttribute(const gss_buffer_t attr) const;