Re: [PATCH] supplicant, ifnet: Fix spelling of "private_key2_passwd" option

[Dan Williams <dcbw redhat com>]

On Fri, 2014-08-22 at 17:31 -0700, Geoffrey Thomas wrote:
> This wpa_supplicant option is not named "private_key_passwd2". Looks
> like this regressed in e5ed391f288d7e2a653aa19d58ae0dedbc9a67f7.

Looks good, you win a prize for a 5 year old bug :)

Pushed to master, 0.9.10, and 0.9.8.

Thanks,
Dan

> Signed-off-by: Geoffrey Thomas <gthomas mokafive com>
> ---
>   src/settings/plugins/ifnet/connection_parser.c |    4 ++--
>   src/supplicant-manager/nm-supplicant-config.c  |    2 +-
>   2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/settings/plugins/ifnet/connection_parser.c b/src/settings/plugins/ifnet/connection_parser.c
> index 86a734b..a9383a6 100644
> --- a/src/settings/plugins/ifnet/connection_parser.c
> +++ b/src/settings/plugins/ifnet/connection_parser.c
> @@ -207,7 +207,7 @@ eap_tls_reader (const char *eap_method,
>
>       /* Private key password */
>       privkey_password = wpa_get_value (ssid,
> -                                       phase2 ? "private_key_passwd2" :
> +                                       phase2 ? "private_key2_passwd" :
>                                         "private_key_passwd");
>
>       if (!privkey_password) {
> @@ -1932,7 +1932,7 @@ write_8021x_certs (NMSetting8021x *s_8021x,
>               goto out;
>
>       if (phase2)
> -             wpa_set_data (conn_name, "private_key_passwd2", password);
> +             wpa_set_data (conn_name, "private_key2_passwd", password);
>       else
>               wpa_set_data (conn_name, "private_key_passwd", password);
>
> diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant-manager/nm-supplicant-config.c
> index 5eb4b47..3f7fd72 100644
> --- a/src/supplicant-manager/nm-supplicant-config.c
> +++ b/src/supplicant-manager/nm-supplicant-config.c
> @@ -1020,7 +1020,7 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self,
>                        * isn't decrypted at all.
>                        */
>                       value = nm_setting_802_1x_get_phase2_private_key_password (setting);
> -                     if (!add_string_val (self, value, "private_key_passwd2", FALSE, TRUE))
> +                     if (!add_string_val (self, value, "private_key2_passwd", FALSE, TRUE))
>                               return FALSE;
>               }