fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 14:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cloud-setup: strip whitespace from nmcs_utils_hwaddr_normalize()

Browse source 
This function should be accepting, and not reject leading/trailing
white space.
This commit is contained in:
Thomas Haller 2021-01-05 13:58:09 +01:00
parent 494819bbbf
commit 2ba984a80a
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
clients/cloud-setup/nm-cloud-setup-utils.c
View file

@ -485,22 +485,30 @@ char *
nmcs_utils_hwaddr_normalize(const char *hwaddr, gssize len)
{
gs_free char *hwaddr_clone = NULL;
char * hw;
guint8 buf[ETH_ALEN];
gsize l;
nm_assert(len >= -1);
if (len < 0) {
if (!hwaddr)
return NULL;
} else {
if (len == 0)
return NULL;
nm_assert(hwaddr);
hwaddr = nm_strndup_a(300, hwaddr, len, &hwaddr_clone);
}
l = strlen(hwaddr);
} else
l = len;
if (l == 0)
return NULL;
nm_assert(hwaddr);
hw = nm_strndup_a(300, hwaddr, l, &hwaddr_clone);
g_strstrip(hw);
/* we cannot use _nm_utils_hwaddr_aton() because that requires a delimiter.
* Azure exposes MAC addresses without delimiter, so accept that too. */
if (!nm_utils_hexstr2bin_full(hwaddr,
if (!nm_utils_hexstr2bin_full(hw,
FALSE,
FALSE,
FALSE,