From 4dba720d8c883549e57a292a236c8ea44e1e0bca Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 26 Mar 2014 12:43:24 -0400 Subject: platform: fix handling of labels If an address has a label without a ':' in it (eg, its label is just $DEVICE, not $DEVICE:$NUM), then ignore it. --- src/platform/nm-linux-platform.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 252d30d197..d52ebfaf3a 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -892,7 +892,8 @@ init_ip4_address (NMPlatformIP4Address *address, struct rtnl_addr *rtnladdr) memcpy (&address->peer_address, nl_addr_get_binary_addr (nlpeer), sizeof (address->peer_address)); } label = rtnl_addr_get_label (rtnladdr); - if (label && *label) + /* Check for ':'; we're only interested in labels used as interface aliases */ + if (label && strchr (label, ':')) g_strlcpy (address->label, label, sizeof (address->label)); return TRUE; -- cgit v1.2.1