diff options
| author | Dan Williams <dcbw@redhat.com> | 2008-11-21 18:59:37 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2008-11-21 18:59:37 +0000 |
| commit | f30fba23ee19822fc73ec6268b8d6be887db1c70 (patch) | |
| tree | de9471f401cc7ea36a158cef625cef72cf8caa82 /libnm-util/nm-setting-8021x.h | |
| parent | 9ea3dafe7d61cd0751d0a8800c7cf2d9b9104370 (diff) | |
| download | NetworkManager-f30fba23ee19822fc73ec6268b8d6be887db1c70.tar.gz | |
2008-11-21 Dan Williams <dcbw@redhat.com>
Patch from Tambet Ingo <tambet@gmail.com>
* configure.in
libnm-util/libnm-util.ver
libnm-util/nm-setting-8021x.c
libnm-util/nm-setting-8021x.h
- Add configure-time option for the system CA path
- Add 'system-ca-certs' option to 802.1x setting, which directs
NetworkManager to use system CA certificates instead of any
connection-defined CA certificates
* src/supplicant-manager/nm-supplicant-config.c
src/supplicant-manager/nm-supplicant-settings-verify.c
- Use system CA certificates if the connection says to do so
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4326 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'libnm-util/nm-setting-8021x.h')
| -rw-r--r-- | libnm-util/nm-setting-8021x.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libnm-util/nm-setting-8021x.h b/libnm-util/nm-setting-8021x.h index 91d494d9b3..e956e685ae 100644 --- a/libnm-util/nm-setting-8021x.h +++ b/libnm-util/nm-setting-8021x.h @@ -81,6 +81,7 @@ GQuark nm_setting_802_1x_error_quark (void); #define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD "phase2-private-key-password" #define NM_SETTING_802_1X_PIN "pin" #define NM_SETTING_802_1X_PSK "psk" +#define NM_SETTING_802_1X_SYSTEM_CA_CERTS "system-ca-certs" typedef struct { NMSetting parent; @@ -133,6 +134,7 @@ gboolean nm_setting_802_1x_set_phase2_ca_cert_from_file (NMSetting8 const char *filename, NMSetting8021xCKType *out_ck_type, GError **err); +gboolean nm_setting_802_1x_get_system_ca_certs (NMSetting8021x *setting); const GByteArray *nm_setting_802_1x_get_phase2_client_cert (NMSetting8021x *setting); gboolean nm_setting_802_1x_set_phase2_client_cert_from_file (NMSetting8021x *setting, |