X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=util_attr.h;h=90a8c91c3c35c61f0cb06d808c45ea3995dc0887;hb=refs%2Fheads%2Fmeeting%2Fmoonshot2;hp=b0e3c052ef9c5ca6560baf6125a6cad2fb9d366d;hpb=ca74c6d0366243341d3fb005790320dba5c93b07;p=mech_eap.orig

diff --git a/util_attr.h b/util_attr.h
index b0e3c05..90a8c91 100644
--- a/util_attr.h
+++ b/util_attr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, JANET(UK)
+ * Copyright (c) 2011, JANET(UK)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,6 +39,7 @@
 
 #ifdef __cplusplus
 #include <string>
+#include <new>
 
 struct gss_eap_attr_provider;
 struct gss_eap_attr_ctx;
@@ -74,48 +75,74 @@ public:
     }
 
     virtual bool initFromExistingContext(const gss_eap_attr_ctx *manager,
-                                         const gss_eap_attr_provider *ctx)
+                                         const gss_eap_attr_provider *ctx GSSEAP_UNUSED)
     {
         return initWithManager(manager);
     }
 
     virtual bool initFromGssContext(const gss_eap_attr_ctx *manager,
-                                    const gss_cred_id_t cred,
-                                    const gss_ctx_id_t ctx)
+                                    const gss_cred_id_t cred GSSEAP_UNUSED,
+                                    const gss_ctx_id_t ctx GSSEAP_UNUSED)
     {
         return initWithManager(manager);
     }
 
-    virtual bool getAttributeTypes(gss_eap_attr_enumeration_cb, void *data) const
+    virtual bool getAttributeTypes(gss_eap_attr_enumeration_cb GSSEAP_UNUSED,
+                                   void *data GSSEAP_UNUSED) const
+    {
+        return false;
+    }
+
+    virtual bool setAttribute(int complete GSSEAP_UNUSED,
+                              const gss_buffer_t attr GSSEAP_UNUSED,
+                              const gss_buffer_t value GSSEAP_UNUSED)
+    {
+        return false;
+    }
+
+    virtual bool deleteAttribute(const gss_buffer_t value GSSEAP_UNUSED)
     {
         return false;
     }
 
-    virtual bool setAttribute(int complete,
-                              const gss_buffer_t attr,
-                              const gss_buffer_t value) { return false; }
-    virtual bool deleteAttribute(const gss_buffer_t value) { return false; }
-    virtual bool getAttribute(const gss_buffer_t attr,
-                              int *authenticated,
-                              int *complete,
-                              gss_buffer_t value,
-                              gss_buffer_t display_value,
-                              int *more) const { return false; }
-
-    virtual gss_any_t mapToAny(int authenticated,
-                               gss_buffer_t type_id) const { return NULL; }
-    virtual void releaseAnyNameMapping(gss_buffer_t type_id,
-                                       gss_any_t input) const {}
-
-    virtual void exportToBuffer(gss_buffer_t buffer) const {}
+    virtual bool getAttribute(const gss_buffer_t attr GSSEAP_UNUSED,
+                              int *authenticated GSSEAP_UNUSED,
+                              int *complete GSSEAP_UNUSED,
+                              gss_buffer_t value GSSEAP_UNUSED,
+                              gss_buffer_t display_value GSSEAP_UNUSED,
+                              int *more GSSEAP_UNUSED) const
+    {
+        return false;
+    }
+
+    virtual gss_any_t mapToAny(int authenticated GSSEAP_UNUSED,
+                               gss_buffer_t type_id GSSEAP_UNUSED) const
+    {
+        return NULL;
+    }
+    virtual void releaseAnyNameMapping(gss_buffer_t type_id GSSEAP_UNUSED,
+                                       gss_any_t input GSSEAP_UNUSED) const
+    {
+    }
+
+    virtual void exportToBuffer(gss_buffer_t buffer GSSEAP_UNUSED) const
+    {
+    }
+
     virtual bool initFromBuffer(const gss_eap_attr_ctx *manager,
-                                const gss_buffer_t buffer)
+                                const gss_buffer_t buffer GSSEAP_UNUSED)
     {
         return initWithManager(manager);
     }
 
     virtual time_t getExpiryTime(void) const { return 0; }
 
+    virtual OM_uint32 mapException(OM_uint32 *minor GSSEAP_UNUSED,
+                                   std::exception &e GSSEAP_UNUSED) const
+    {
+        return GSS_S_CONTINUE_NEEDED;
+    }
+
     static bool init(void) { return true; }
     static void finalize(void) {}
 
@@ -208,6 +235,7 @@ public:
     unregisterProvider(unsigned int type);
 
     time_t getExpiryTime(void) const;
+    OM_uint32 mapException(OM_uint32 *minor, std::exception &e) const;
 
 private:
     bool providerEnabled(unsigned int type) const;
@@ -231,9 +259,6 @@ private:
 
 #ifdef __cplusplus
 
-#include <string>
-#include <new>
-
 static inline void
 duplicateBuffer(gss_buffer_desc &src, gss_buffer_t dst)
 {
@@ -272,7 +297,8 @@ OM_uint32
 gssEapCreateAttrContext(OM_uint32 *minor,
                         gss_cred_id_t acceptorCred,
                         gss_ctx_id_t acceptorCtx,
-                        struct gss_eap_attr_ctx **pAttrCtx);
+                        struct gss_eap_attr_ctx **pAttrCtx,
+                        time_t *pExpiryTime);
 
 OM_uint32
 gssEapInquireName(OM_uint32 *minor,