X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=mech_eap%2Futil_radius.h;h=f590d65ee695b79893b1cee6cdc63bb3d86d569e;hb=refs%2Fheads%2Fddf-name;hp=d6e4cf59d321dc0fdaed6782b2d53df0eea45da0;hpb=a4a91192e39832457581c00a484ae567b2f7e30f;p=moonshot.git

diff --git a/mech_eap/util_radius.h b/mech_eap/util_radius.h
index d6e4cf5..f590d65 100644
--- a/mech_eap/util_radius.h
+++ b/mech_eap/util_radius.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
@@ -66,9 +66,10 @@ public:
     void releaseAnyNameMapping(gss_buffer_t type_id,
                                gss_any_t input) const;
 
-    void exportToBuffer(gss_buffer_t buffer) const;
-    bool initFromBuffer(const gss_eap_attr_ctx *ctx,
-                        const gss_buffer_t buffer);
+    const char *marshallingKey(void) const;
+    bool unmarshallAndInit(const gss_eap_attr_ctx *manager,
+                           DDF &object GSSEAP_UNUSED);
+    DDF marshall(void) const;
 
     bool getAttribute(uint32_t attribute,
                       int *authenticated,
@@ -149,7 +150,6 @@ gssEapRadiusMapError(OM_uint32 *minor,
                      struct rs_error *err);
 
 #define RS_CONFIG_FILE      SYSCONFDIR "/radsec.conf"
-#define RS_DICT_FILE        DATAROOTDIR "/freeradius/dictionary"
 
 #define VENDORPEC_MS                        311 /* RFC 2548 */
 
@@ -165,7 +165,7 @@ gssEapRadiusMapError(OM_uint32 *minor,
 #define PW_SAML_AAA_ASSERTION               132
 
 #define IS_RADIUS_ERROR(code)               ((code) >= ERROR_TABLE_BASE_rse && \
-                                             (code) <= ERROR_TABLE_BASE_rse + RSE_SOME_ERROR)
+                                             (code) <= ERROR_TABLE_BASE_rse + RSE_TIMEOUT_IO)
 
 #ifdef __cplusplus
 }