diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-02-16 15:38:20 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2017-02-17 14:24:34 +0100 |
| commit | 324cf7ce8265ce551a977ceeb4d4693ffe45590b (patch) | |
| tree | bf69725cd2ec4d7260cb67ebff64460071d70c64 /libnm-core | |
| parent | 7a21ae3e7785e8c763316b6d2c5a1f96bb7abc50 (diff) | |
| download | NetworkManager-324cf7ce8265ce551a977ceeb4d4693ffe45590b.tar.gz | |
ifcfg-rh: reuse file-suffix from NMSetting8021xSchemeVtablelr/pkcs11-pin
Keyfile writer computes the file extension and only uses
the file suffix from the vtable.
Do that for ifcfg-rh too. No change in behavior.
Diffstat (limited to 'libnm-core')
| -rw-r--r-- | libnm-core/nm-core-internal.h | 2 | ||||
| -rw-r--r-- | libnm-core/nm-setting-8021x.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 0b244545ca..26827d0f37 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -353,7 +353,7 @@ typedef struct { const char * (*uri_func) (NMSetting8021x *setting); const char * (*passwd_func) (NMSetting8021x *setting); NMSettingSecretFlags (*pwflag_func) (NMSetting8021x *setting); - const char *keyfile_suffix; + const char *file_suffix; } NMSetting8021xSchemeVtable; enum { diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c index b0e45f1e26..e64769e42d 100644 --- a/libnm-core/nm-setting-8021x.c +++ b/libnm-core/nm-setting-8021x.c @@ -189,7 +189,7 @@ const NMSetting8021xSchemeVtable nm_setting_8021x_scheme_vtable[] = { .uri_func = nm_setting_802_1x_get_ca_cert_uri, .passwd_func = nm_setting_802_1x_get_ca_cert_password, .pwflag_func = nm_setting_802_1x_get_ca_cert_password_flags, - .keyfile_suffix = "ca-cert", + .file_suffix = "ca-cert", }, [NM_SETTING_802_1X_SCHEME_TYPE_PHASE2_CA_CERT] = { @@ -201,7 +201,7 @@ const NMSetting8021xSchemeVtable nm_setting_8021x_scheme_vtable[] = { .uri_func = nm_setting_802_1x_get_phase2_ca_cert_uri, .passwd_func = nm_setting_802_1x_get_phase2_ca_cert_password, .pwflag_func = nm_setting_802_1x_get_phase2_ca_cert_password_flags, - .keyfile_suffix = "inner-ca-cert", + .file_suffix = "inner-ca-cert", }, [NM_SETTING_802_1X_SCHEME_TYPE_CLIENT_CERT] = { @@ -213,7 +213,7 @@ const NMSetting8021xSchemeVtable nm_setting_8021x_scheme_vtable[] = { .uri_func = nm_setting_802_1x_get_client_cert_uri, .passwd_func = nm_setting_802_1x_get_client_cert_password, .pwflag_func = nm_setting_802_1x_get_client_cert_password_flags, - .keyfile_suffix = "client-cert", + .file_suffix = "client-cert", }, [NM_SETTING_802_1X_SCHEME_TYPE_PHASE2_CLIENT_CERT] = { @@ -225,7 +225,7 @@ const NMSetting8021xSchemeVtable nm_setting_8021x_scheme_vtable[] = { .uri_func = nm_setting_802_1x_get_phase2_client_cert_uri, .passwd_func = nm_setting_802_1x_get_phase2_client_cert_password, .pwflag_func = nm_setting_802_1x_get_phase2_client_cert_password_flags, - .keyfile_suffix = "inner-client-cert", + .file_suffix = "inner-client-cert", }, [NM_SETTING_802_1X_SCHEME_TYPE_PRIVATE_KEY] = { @@ -237,7 +237,7 @@ const NMSetting8021xSchemeVtable nm_setting_8021x_scheme_vtable[] = { .uri_func = nm_setting_802_1x_get_private_key_uri, .passwd_func = nm_setting_802_1x_get_private_key_password, .pwflag_func = nm_setting_802_1x_get_private_key_password_flags, - .keyfile_suffix = "private-key", + .file_suffix = "private-key", }, [NM_SETTING_802_1X_SCHEME_TYPE_PHASE2_PRIVATE_KEY] = { @@ -249,7 +249,7 @@ const NMSetting8021xSchemeVtable nm_setting_8021x_scheme_vtable[] = { .uri_func = nm_setting_802_1x_get_phase2_private_key_uri, .passwd_func = nm_setting_802_1x_get_phase2_private_key_password, .pwflag_func = nm_setting_802_1x_get_phase2_private_key_password_flags, - .keyfile_suffix = "inner-private-key", + .file_suffix = "inner-private-key", }, [NM_SETTING_802_1X_SCHEME_TYPE_UNKNOWN] = { NULL }, |