diff options
| author | Martin Willi <martin@revosec.ch> | 2011-12-08 16:42:11 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-03-20 17:31:15 +0100 |
| commit | 1fe6cdfac2631434464a2a550414f45b60558369 (patch) | |
| tree | 2a75220c67aed067682c5364be5969a274b1294b /src/libstrongswan/plugins/plugin_feature.h | |
| parent | 4e73f85b818c3abf48f5c5ae3db98cc6be7dd34f (diff) | |
| download | strongswan-1fe6cdfac2631434464a2a550414f45b60558369.tar.bz2 strongswan-1fe6cdfac2631434464a2a550414f45b60558369.tar.xz | |
Use a string to identify xauth backends, no need for integer types
Diffstat (limited to 'src/libstrongswan/plugins/plugin_feature.h')
| -rw-r--r-- | src/libstrongswan/plugins/plugin_feature.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libstrongswan/plugins/plugin_feature.h b/src/libstrongswan/plugins/plugin_feature.h index 89c954471..54fd2c67f 100644 --- a/src/libstrongswan/plugins/plugin_feature.h +++ b/src/libstrongswan/plugins/plugin_feature.h @@ -25,7 +25,6 @@ typedef struct plugin_feature_t plugin_feature_t; #include <library.h> #include <eap/eap.h> -#include <xauth/xauth.h> #include <plugins/plugin.h> /** @@ -188,7 +187,7 @@ struct plugin_feature_t { /** FEATURE_CUSTOM */ char *custom; /** FEATURE_XAUTH_SERVER/CLIENT */ - xauth_type_t xauth; + char *xauth; /** FEATURE_REGISTER */ struct { @@ -273,8 +272,8 @@ struct plugin_feature_t { #define _PLUGIN_FEATURE_DATABASE(kind, type) __PLUGIN_FEATURE(kind, DATABASE, .database = type) #define _PLUGIN_FEATURE_FETCHER(kind, type) __PLUGIN_FEATURE(kind, FETCHER, .fetcher = type) #define _PLUGIN_FEATURE_CUSTOM(kind, name) __PLUGIN_FEATURE(kind, CUSTOM, .custom = name) -#define _PLUGIN_FEATURE_XAUTH_SERVER(kind, type) __PLUGIN_FEATURE(kind, XAUTH_SERVER, .xauth = type) -#define _PLUGIN_FEATURE_XAUTH_PEER(kind, type) __PLUGIN_FEATURE(kind, XAUTH_PEER, .xauth = type) +#define _PLUGIN_FEATURE_XAUTH_SERVER(kind, name) __PLUGIN_FEATURE(kind, XAUTH_SERVER, .xauth = name) +#define _PLUGIN_FEATURE_XAUTH_PEER(kind, name) __PLUGIN_FEATURE(kind, XAUTH_PEER, .xauth = name) #define __PLUGIN_FEATURE_REGISTER(type, _f) (plugin_feature_t){ FEATURE_REGISTER, FEATURE_##type, .arg.reg.f = _f } #define __PLUGIN_FEATURE_REGISTER_BUILDER(type, _f, _final) (plugin_feature_t){ FEATURE_REGISTER, FEATURE_##type, .arg.reg = {.f = _f, .final = _final, }} |