summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-09-08 14:16:22 -0400
committerJiří Klimeš <jklimes@redhat.com>2014-09-09 11:13:00 +0200
commit730d096fe17897c0e4c6a1e809424bbc2959335f (patch)
tree8d654b41bc5db08c8de86c2784ef534f2d59d497
parent886c3d7586ded79b7462498f8c8d6aab3ddb999a (diff)
downloadNetworkManager-730d096fe17897c0e4c6a1e809424bbc2959335f.tar.gz
cli: fix MAC address validation (bgo #736275)
nm_utils_hwaddr_valid() accepts length while check_mac() mistakenly passes type. (broken by 3a54d050985d6ef2067b025571910a8ccd3cbd57) https://bugzilla.gnome.org/show_bug.cgi?id=736275
-rw-r--r--clients/cli/connections.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index e3a8e182a8..666247870c 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -2466,7 +2466,7 @@ check_mac (const char *mac,
if (!mac)
return TRUE;
- if (!nm_utils_hwaddr_valid (mac, type)) {
+ if (!nm_utils_hwaddr_valid (mac, nm_utils_hwaddr_len (type))) {
g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
_("Error: '%s': '%s' is not a valid %s MAC address."),
keyword, mac, type == ARPHRD_INFINIBAND ? _("InfiniBand") : _("Ethernet"));