cleanup, plugin attr context

[mech_eap.orig] / util_radius.h

diff --git a/util_radius.h b/util_radius.h
index 1da66f2..bb9875d 100644 (file)
--- a/util_radius.h
+++ b/util_radius.h
@@ -90,40 +90,19 @@ private:
 extern "C" {
 #endif
 
-#ifndef __cplusplus
-static inline OM_uint32
-addRadiusAttributeFromBuffer(OM_uint32 *minor,
-                             rc_handle *rh,
-                             VALUE_PAIR **vp,
-                             int type,
-                             gss_buffer_t buffer)
-{
-    if (rc_avpair_add(rh, vp, type, buffer->value, buffer->length, 0) == NULL) {
-        *minor = ENOMEM;
-        return GSS_S_FAILURE;
-    }
-
-    return GSS_S_COMPLETE;
-}
-
-static inline OM_uint32
-getBufferFromRadiusAttributes(OM_uint32 *minor,
-                              VALUE_PAIR *vps,
-                              int type,
-                              gss_buffer_t buffer)
-{
-    VALUE_PAIR *vp;
-    gss_buffer_desc tmp = GSS_C_EMPTY_BUFFER;
-
-    vp = rc_avpair_get(vps, type, 0);
-    if (vp != NULL) {
-        tmp.length = vp->lvalue;
-        tmp.value = vp->strvalue;
-    }
-
-    return duplicateBuffer(minor, &tmp, buffer);
-}
-#endif
+OM_uint32
+addAvpFromBuffer(OM_uint32 *minor,
+                 rc_handle *rh,
+                 VALUE_PAIR **vp,
+                 int type,
+                 gss_buffer_t buffer);
+
+OM_uint32
+getBufferFromAvps(OM_uint32 *minor,
+                  VALUE_PAIR *vps,
+                  int type,
+                  gss_buffer_t buffer,
+                  int concat);
 
 OM_uint32 gssEapRadiusAttrProviderInit(OM_uint32 *minor);
 OM_uint32 gssEapRadiusAttrProviderFinalize(OM_uint32 *minor);