diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2019-07-02 15:58:56 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2019-07-02 16:06:03 +0200 |
| commit | add691a901c7bd93bcbef9ed81521f57126680a6 (patch) | |
| tree | 62cb7e2791cc64db8c72b7bf4c02cc8a75449039 | |
| parent | 26317ec7e30753c9b0f2db7eabe236b39af4aa13 (diff) | |
| download | NetworkManager-add691a901c7bd93bcbef9ed81521f57126680a6.tar.gz | |
core/wired: include the invalide MAC address in error messages
Otherwise the errors don't make much sense:
802-3-ethernet.mac-address: is not a valid MAC address
| -rw-r--r-- | libnm-core/nm-setting-wired.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c index ccdbc2b5ed..379bd17361 100644 --- a/libnm-core/nm-setting-wired.c +++ b/libnm-core/nm-setting-wired.c @@ -766,10 +766,11 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) } if (priv->device_mac_address && !nm_utils_hwaddr_valid (priv->device_mac_address, ETH_ALEN)) { - g_set_error_literal (error, - NM_CONNECTION_ERROR, - NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("is not a valid MAC address")); + g_set_error (error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("'%s' is not a valid MAC address"), + priv->device_mac_address); g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MAC_ADDRESS); return FALSE; } @@ -831,10 +832,11 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) if ( priv->cloned_mac_address && !NM_CLONED_MAC_IS_SPECIAL (priv->cloned_mac_address) && !nm_utils_hwaddr_valid (priv->cloned_mac_address, ETH_ALEN)) { - g_set_error_literal (error, - NM_CONNECTION_ERROR, - NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("is not a valid MAC address")); + g_set_error (error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("'%s' is not a valid MAC address"), + priv->cloned_mac_address); g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_CLONED_MAC_ADDRESS); return FALSE; } @@ -873,10 +875,11 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) } if (priv->wol_password && !nm_utils_hwaddr_valid (priv->wol_password, ETH_ALEN)) { - g_set_error_literal (error, - NM_CONNECTION_ERROR, - NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("is not a valid MAC address")); + g_set_error (error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("'%s' is not a valid MAC address"), + priv->wol_password); g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD); return FALSE; } |