colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ifcfg-rh: get rid of useless EAP reader prototypes

Browse Source 
Shuffle stuff around and we don't need these prototypes.
This commit is contained in:
Dan Williams
2011-02-28 16:07:36 -06:00
parent 3b6e88d0d0
commit a1a5342f1d
1 changed files with 24 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/settings/plugins/ifcfg-rh/reader.c
View File

@@ -64,35 +64,6 @@
#define PLUGIN_WARN(pname, fmt, args...) \ #define PLUGIN_WARN(pname, fmt, args...) \
{ g_warning (" " pname ": " fmt, ##args); } { g_warning (" " pname ": " fmt, ##args); }
static gboolean eap_simple_reader (const char *eap_method,
shvarFile *ifcfg,
shvarFile *keys,
NMSetting8021x *s_8021x,
gboolean phase2,
GError **error);
static gboolean eap_tls_reader (const char *eap_method,
shvarFile *ifcfg,
shvarFile *keys,
NMSetting8021x *s_8021x,
gboolean phase2,
GError **error);
static gboolean eap_peap_reader (const char *eap_method,
shvarFile *ifcfg,
shvarFile *keys,
NMSetting8021x *s_8021x,
gboolean phase2,
GError **error);
static gboolean eap_ttls_reader (const char *eap_method,
shvarFile *ifcfg,
shvarFile *keys,
NMSetting8021x *s_8021x,
gboolean phase2,
GError **error);
static gboolean static gboolean
get_int (const char *str, int *value) get_int (const char *str, int *value)
{ {
@@ -1977,30 +1948,6 @@ out:
return hashed; return hashed;
} }
typedef struct {
const char *method;
gboolean (*reader)(const char *eap_method,
shvarFile *ifcfg,
shvarFile *keys,
NMSetting8021x *s_8021x,
gboolean phase2,
GError **error);
gboolean wifi_phase2_only;
} EAPReader;
static EAPReader eap_readers[] = {
{ "md5", eap_simple_reader, TRUE },
{ "pap", eap_simple_reader, TRUE },
{ "chap", eap_simple_reader, TRUE },
{ "mschap", eap_simple_reader, TRUE },
{ "mschapv2", eap_simple_reader, TRUE },
{ "leap", eap_simple_reader, TRUE },
{ "tls", eap_tls_reader, FALSE },
{ "peap", eap_peap_reader, FALSE },
{ "ttls", eap_ttls_reader, FALSE },
{ NULL, NULL }
};
static gboolean static gboolean
eap_simple_reader (const char *eap_method, eap_simple_reader (const char *eap_method,
shvarFile *ifcfg, shvarFile *ifcfg,
@@ -2404,6 +2351,30 @@ done:
return success; return success;
} }
typedef struct {
const char *method;
gboolean (*reader)(const char *eap_method,
shvarFile *ifcfg,
shvarFile *keys,
NMSetting8021x *s_8021x,
gboolean phase2,
GError **error);
gboolean wifi_phase2_only;
} EAPReader;
static EAPReader eap_readers[] = {
{ "md5", eap_simple_reader, TRUE },
{ "pap", eap_simple_reader, TRUE },
{ "chap", eap_simple_reader, TRUE },
{ "mschap", eap_simple_reader, TRUE },
{ "mschapv2", eap_simple_reader, TRUE },
{ "leap", eap_simple_reader, TRUE },
{ "tls", eap_tls_reader, FALSE },
{ "peap", eap_peap_reader, FALSE },
{ "ttls", eap_ttls_reader, FALSE },
{ NULL, NULL }
};
static NMSetting8021x * static NMSetting8021x *
fill_8021x (shvarFile *ifcfg, fill_8021x (shvarFile *ifcfg,
const char *file, const char *file,