libnm-core: make _get_mac_address_blacklist() methods return arrays

Make nm_setting_wired_get_mac_address_blacklist() and
nm_setting_wireless_get_mac_address_blacklist() return a char**,
rather than a GSList.

libnm-core/nm-setting-wired.c

@@ -50,7 +50,7 @@ typedef struct {
 	gboolean auto_negotiate;
 	char *device_mac_address;
 	char *cloned_mac_address;
-	GSList *mac_address_blacklist;
+	GArray *mac_address_blacklist;
 	guint32 mtu;
 	char **s390_subchannels;
 	char *s390_nettype;
@@ -185,15 +185,17 @@ nm_setting_wired_get_cloned_mac_address (NMSettingWired *setting)
  * nm_setting_wired_get_mac_address_blacklist:
  * @setting: the #NMSettingWired
  *
- * Returns: (element-type utf8): the #NMSettingWired:mac-address-blacklist
+ * Returns: the #NMSettingWired:mac-address-blacklist property of the setting
- * property of the setting
  **/
-const GSList *
+const char * const *
 nm_setting_wired_get_mac_address_blacklist (NMSettingWired *setting)
 {
+	NMSettingWiredPrivate *priv;
+
 	g_return_val_if_fail (NM_IS_SETTING_WIRED (setting), NULL);
 
-	return NM_SETTING_WIRED_GET_PRIVATE (setting)->mac_address_blacklist;
+	priv = NM_SETTING_WIRED_GET_PRIVATE (setting);
+	return (const char * const *) priv->mac_address_blacklist->data;
 }
 
 /**
@@ -207,7 +209,7 @@ nm_setting_wired_get_num_mac_blacklist_items (NMSettingWired *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_WIRED (setting), 0);
 
-	return g_slist_length (NM_SETTING_WIRED_GET_PRIVATE (setting)->mac_address_blacklist);
+	return NM_SETTING_WIRED_GET_PRIVATE (setting)->mac_address_blacklist->len;
 }
 
 /**
@@ -226,9 +228,9 @@ nm_setting_wired_get_mac_blacklist_item (NMSettingWired *setting, guint32 idx)
 	g_return_val_if_fail (NM_IS_SETTING_WIRED (setting), NULL);
 
 	priv = NM_SETTING_WIRED_GET_PRIVATE (setting);
-	g_return_val_if_fail (idx <= g_slist_length (priv->mac_address_blacklist), NULL);
+	g_return_val_if_fail (idx <= priv->mac_address_blacklist->len, NULL);
 
-	return (const char *) g_slist_nth_data (priv->mac_address_blacklist, idx);
+	return g_array_index (priv->mac_address_blacklist, const char *, idx);
 }
 
 /**
@@ -245,7 +247,7 @@ gboolean
 nm_setting_wired_add_mac_blacklist_item (NMSettingWired *setting, const char *mac)
 {
 	NMSettingWiredPrivate *priv;
-	GSList *iter;
+	int i;
 
 	g_return_val_if_fail (NM_IS_SETTING_WIRED (setting), FALSE);
 	g_return_val_if_fail (mac != NULL, FALSE);
@@ -254,13 +256,13 @@ nm_setting_wired_add_mac_blacklist_item (NMSettingWired *setting, const char *ma
 		return FALSE;
 
 	priv = NM_SETTING_WIRED_GET_PRIVATE (setting);
-	for (iter = priv->mac_address_blacklist; iter; iter = g_slist_next (iter)) {
+	for (i = 0; i < priv->mac_address_blacklist->len; i++) {
-		if (!strcasecmp (mac, (char *) iter->data))
+		if (!strcasecmp (mac, g_array_index (priv->mac_address_blacklist, char *, i)))
 			return FALSE;
 	}
 
-	priv->mac_address_blacklist = g_slist_append (priv->mac_address_blacklist,
+	mac = g_ascii_strup (mac, -1);
-	                                              g_ascii_strup (mac, -1));
+	g_array_append_val (priv->mac_address_blacklist, mac);
 	g_object_notify (G_OBJECT (setting), NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST);
 	return TRUE;
 }
@@ -276,16 +278,13 @@ void
 nm_setting_wired_remove_mac_blacklist_item (NMSettingWired *setting, guint32 idx)
 {
 	NMSettingWiredPrivate *priv;
-	GSList *elt;
 
 	g_return_if_fail (NM_IS_SETTING_WIRED (setting));
 
 	priv = NM_SETTING_WIRED_GET_PRIVATE (setting);
-	elt = g_slist_nth (priv->mac_address_blacklist, idx);
+	g_return_if_fail (idx < priv->mac_address_blacklist->len);
-	g_return_if_fail (elt != NULL);
 
-	g_free (elt->data);
+	g_array_remove_index (priv->mac_address_blacklist, idx);
-	priv->mac_address_blacklist = g_slist_delete_link (priv->mac_address_blacklist, elt);
 	g_object_notify (G_OBJECT (setting), NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST);
 }
 
@@ -303,7 +302,7 @@ gboolean
 nm_setting_wired_remove_mac_blacklist_item_by_value (NMSettingWired *setting, const char *mac)
 {
 	NMSettingWiredPrivate *priv;
-	GSList *iter;
+	int i;
 
 	g_return_val_if_fail (NM_IS_SETTING_WIRED (setting), FALSE);
 	g_return_val_if_fail (mac != NULL, FALSE);
@@ -312,9 +311,9 @@ nm_setting_wired_remove_mac_blacklist_item_by_value (NMSettingWired *setting, co
 		return FALSE;
 
 	priv = NM_SETTING_WIRED_GET_PRIVATE (setting);
-	for (iter = priv->mac_address_blacklist; iter; iter = g_slist_next (iter)) {
+	for (i = 0; i < priv->mac_address_blacklist->len; i++) {
-		if (!strcasecmp (mac, (char *) iter->data)) {
+		if (!strcasecmp (mac, g_array_index (priv->mac_address_blacklist, char *, i))) {
-			priv->mac_address_blacklist = g_slist_delete_link (priv->mac_address_blacklist, iter);
+			g_array_remove_index (priv->mac_address_blacklist, i);
 			g_object_notify (G_OBJECT (setting), NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST);
 			return TRUE;
 		}
@@ -333,8 +332,7 @@ nm_setting_wired_clear_mac_blacklist_items (NMSettingWired *setting)
 {
 	g_return_if_fail (NM_IS_SETTING_WIRED (setting));
 
-	g_slist_free_full (NM_SETTING_WIRED_GET_PRIVATE (setting)->mac_address_blacklist, g_free);
+	g_array_set_size (NM_SETTING_WIRED_GET_PRIVATE (setting)->mac_address_blacklist, 0);
-	NM_SETTING_WIRED_GET_PRIVATE (setting)->mac_address_blacklist = NULL;
 	g_object_notify (G_OBJECT (setting), NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST);
 }
 
@@ -563,8 +561,8 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 	const char *valid_duplex[] = { "half", "full", NULL };
 	const char *valid_nettype[] = { "qeth", "lcs", "ctc", NULL };
 	GHashTableIter iter;
-	GSList* mac_blacklist_iter;
 	const char *key, *value;
+	int i;
 
 	if (priv->port && !_nm_utils_string_in_list (priv->port, valid_ports)) {
 		g_set_error (error,
@@ -595,14 +593,15 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 		return FALSE;
 	}
 
-	for (mac_blacklist_iter = priv->mac_address_blacklist; mac_blacklist_iter;
+	for (i = 0; i < priv->mac_address_blacklist->len; i++) {
-	     mac_blacklist_iter = mac_blacklist_iter->next) {
+		const char *mac = g_array_index (priv->mac_address_blacklist, const char *, i);
-		if (!nm_utils_hwaddr_valid (mac_blacklist_iter->data, ETH_ALEN)) {
+
+		if (!nm_utils_hwaddr_valid (mac, ETH_ALEN)) {
 			g_set_error (error,
 			             NM_CONNECTION_ERROR,
 			             NM_CONNECTION_ERROR_INVALID_PROPERTY,
 			             _("'%s' is not a valid MAC address"),
-			             (const char *) mac_blacklist_iter->data);
+			             mac);
 			g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST);
 			return FALSE;
 		}
@@ -657,12 +656,22 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 	return TRUE;
 }
 
+static void
+clear_blacklist_item (char **item_p)
+{
+	g_free (*item_p);
+}
+
 static void
 nm_setting_wired_init (NMSettingWired *setting)
 {
 	NMSettingWiredPrivate *priv = NM_SETTING_WIRED_GET_PRIVATE (setting);
 
 	priv->s390_options = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
+
+	/* We use GArray rather than GPtrArray so it will automatically be NULL-terminated */
+	priv->mac_address_blacklist = g_array_new (TRUE, FALSE, sizeof (char *));
+	g_array_set_clear_func (priv->mac_address_blacklist, (GDestroyNotify) clear_blacklist_item);
 }
 
 static void
@@ -678,7 +687,7 @@ finalize (GObject *object)
 
 	g_free (priv->device_mac_address);
 	g_free (priv->cloned_mac_address);
-	g_slist_free_full (priv->mac_address_blacklist, g_free);
+	g_array_unref (priv->mac_address_blacklist);
 
 	if (priv->s390_subchannels)
 		g_strfreev (priv->s390_subchannels);
@@ -691,6 +700,7 @@ set_property (GObject *object, guint prop_id,
               const GValue *value, GParamSpec *pspec)
 {
 	NMSettingWiredPrivate *priv = NM_SETTING_WIRED_GET_PRIVATE (object);
+	char **blacklist;
 
 	switch (prop_id) {
 	case PROP_PORT:
@@ -716,8 +726,14 @@ set_property (GObject *object, guint prop_id,
 		priv->cloned_mac_address = g_value_dup_string (value);
 		break;
 	case PROP_MAC_ADDRESS_BLACKLIST:
-		g_slist_free_full (priv->mac_address_blacklist, g_free);
+		blacklist = g_value_dup_boxed (value);
-		priv->mac_address_blacklist = _nm_utils_strv_to_slist (g_value_get_boxed (value));
+		g_array_set_size (priv->mac_address_blacklist, 0);
+		if (blacklist) {
+			g_array_set_size (priv->mac_address_blacklist, g_strv_length (blacklist));
+			memcpy (priv->mac_address_blacklist->data, blacklist,
+			        priv->mac_address_blacklist->len * sizeof (char *));
+			g_free (blacklist);
+		}
 		break;
 	case PROP_MTU:
 		priv->mtu = g_value_get_uint (value);
@@ -768,7 +784,7 @@ get_property (GObject *object, guint prop_id,
 		g_value_set_string (value, nm_setting_wired_get_cloned_mac_address (setting));
 		break;
 	case PROP_MAC_ADDRESS_BLACKLIST:
-		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->mac_address_blacklist));
+		g_value_set_boxed (value, (char **) priv->mac_address_blacklist->data);
 		break;
 	case PROP_MTU:
 		g_value_set_uint (value, nm_setting_wired_get_mtu (setting));

libnm-core/nm-setting-wired.h

@@ -73,7 +73,7 @@ gboolean          nm_setting_wired_get_auto_negotiate   (NMSettingWired *setting
 const char *      nm_setting_wired_get_mac_address      (NMSettingWired *setting);
 const char *      nm_setting_wired_get_cloned_mac_address (NMSettingWired *setting);
 
-const GSList     *nm_setting_wired_get_mac_address_blacklist   (NMSettingWired *setting);
+const char * const *nm_setting_wired_get_mac_address_blacklist   (NMSettingWired *setting);
 guint32           nm_setting_wired_get_num_mac_blacklist_items (NMSettingWired *setting);
 const char *      nm_setting_wired_get_mac_blacklist_item      (NMSettingWired *setting,
                                                                 guint32 idx);

libnm-core/nm-setting-wireless.c

@@ -54,7 +54,7 @@ typedef struct {
 	guint32 tx_power;
 	char *device_mac_address;
 	char *cloned_mac_address;
-	GSList *mac_address_blacklist;
+	GArray *mac_address_blacklist;
 	guint32 mtu;
 	GSList *seen_bssids;
 	gboolean hidden;
@@ -419,15 +419,17 @@ nm_setting_wireless_get_cloned_mac_address (NMSettingWireless *setting)
  * nm_setting_wireless_get_mac_address_blacklist:
  * @setting: the #NMSettingWireless
  *
- * Returns: (element-type utf8): the
+ * Returns: the #NMSettingWireless:mac-address-blacklist property of the setting
- * #NMSettingWireless:mac-address-blacklist property of the setting
  **/
-const GSList *
+const char * const *
 nm_setting_wireless_get_mac_address_blacklist (NMSettingWireless *setting)
 {
+	NMSettingWirelessPrivate *priv;
+
 	g_return_val_if_fail (NM_IS_SETTING_WIRELESS (setting), NULL);
 
-	return NM_SETTING_WIRELESS_GET_PRIVATE (setting)->mac_address_blacklist;
+	priv = NM_SETTING_WIRELESS_GET_PRIVATE (setting);
+	return (const char * const *) priv->mac_address_blacklist->data;
 }
 
 /**
@@ -441,7 +443,7 @@ nm_setting_wireless_get_num_mac_blacklist_items (NMSettingWireless *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_WIRELESS (setting), 0);
 
-	return g_slist_length (NM_SETTING_WIRELESS_GET_PRIVATE (setting)->mac_address_blacklist);
+	return NM_SETTING_WIRELESS_GET_PRIVATE (setting)->mac_address_blacklist->len;
 }
 
 /**
@@ -460,9 +462,9 @@ nm_setting_wireless_get_mac_blacklist_item (NMSettingWireless *setting, guint32
 	g_return_val_if_fail (NM_IS_SETTING_WIRELESS (setting), NULL);
 
 	priv = NM_SETTING_WIRELESS_GET_PRIVATE (setting);
-	g_return_val_if_fail (idx <= g_slist_length (priv->mac_address_blacklist), NULL);
+	g_return_val_if_fail (idx <= priv->mac_address_blacklist->len, NULL);
 
-	return (const char *) g_slist_nth_data (priv->mac_address_blacklist, idx);
+	return g_array_index (priv->mac_address_blacklist, const char *, idx);
 }
 
 /**
@@ -479,7 +481,7 @@ gboolean
 nm_setting_wireless_add_mac_blacklist_item (NMSettingWireless *setting, const char *mac)
 {
 	NMSettingWirelessPrivate *priv;
-	GSList *iter;
+	int i;
 
 	g_return_val_if_fail (NM_IS_SETTING_WIRELESS (setting), FALSE);
 	g_return_val_if_fail (mac != NULL, FALSE);
@@ -488,13 +490,13 @@ nm_setting_wireless_add_mac_blacklist_item (NMSettingWireless *setting, const ch
 		return FALSE;
 
 	priv = NM_SETTING_WIRELESS_GET_PRIVATE (setting);
-	for (iter = priv->mac_address_blacklist; iter; iter = g_slist_next (iter)) {
+	for (i = 0; i < priv->mac_address_blacklist->len; i++) {
-		if (!strcasecmp (mac, (char *) iter->data))
+		if (!strcasecmp (mac, g_array_index (priv->mac_address_blacklist, char *, i)))
 			return FALSE;
 	}
 
-	priv->mac_address_blacklist = g_slist_append (priv->mac_address_blacklist,
+	mac = g_ascii_strup (mac, -1);
-	                                              g_ascii_strup (mac, -1));
+	g_array_append_val (priv->mac_address_blacklist, mac);
 	g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST);
 	return TRUE;
 }
@@ -510,16 +512,13 @@ void
 nm_setting_wireless_remove_mac_blacklist_item (NMSettingWireless *setting, guint32 idx)
 {
 	NMSettingWirelessPrivate *priv;
-	GSList *elt;
 
 	g_return_if_fail (NM_IS_SETTING_WIRELESS (setting));
 
 	priv = NM_SETTING_WIRELESS_GET_PRIVATE (setting);
-	elt = g_slist_nth (priv->mac_address_blacklist, idx);
+	g_return_if_fail (idx < priv->mac_address_blacklist->len);
-	g_return_if_fail (elt != NULL);
 
-	g_free (elt->data);
+	g_array_remove_index (priv->mac_address_blacklist, idx);
-	priv->mac_address_blacklist = g_slist_delete_link (priv->mac_address_blacklist, elt);
 	g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST);
 }
 
@@ -537,7 +536,7 @@ gboolean
 nm_setting_wireless_remove_mac_blacklist_item_by_value (NMSettingWireless *setting, const char *mac)
 {
 	NMSettingWirelessPrivate *priv;
-	GSList *iter;
+	int i;
 
 	g_return_val_if_fail (NM_IS_SETTING_WIRELESS (setting), FALSE);
 	g_return_val_if_fail (mac != NULL, FALSE);
@@ -546,9 +545,9 @@ nm_setting_wireless_remove_mac_blacklist_item_by_value (NMSettingWireless *setti
 		return FALSE;
 
 	priv = NM_SETTING_WIRELESS_GET_PRIVATE (setting);
-	for (iter = priv->mac_address_blacklist; iter; iter = g_slist_next (iter)) {
+	for (i = 0; i < priv->mac_address_blacklist->len; i++) {
-		if (!strcasecmp (mac, (char *) iter->data)) {
+		if (!strcasecmp (mac, g_array_index (priv->mac_address_blacklist, char *, i))) {
-			priv->mac_address_blacklist = g_slist_delete_link (priv->mac_address_blacklist, iter);
+			g_array_remove_index (priv->mac_address_blacklist, i);
 			g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST);
 			return TRUE;
 		}
@@ -567,8 +566,7 @@ nm_setting_wireless_clear_mac_blacklist_items (NMSettingWireless *setting)
 {
 	g_return_if_fail (NM_IS_SETTING_WIRELESS (setting));
 
-	g_slist_free_full (NM_SETTING_WIRELESS_GET_PRIVATE (setting)->mac_address_blacklist, g_free);
+	g_array_set_size (NM_SETTING_WIRELESS_GET_PRIVATE (setting)->mac_address_blacklist, 0);
-	NM_SETTING_WIRELESS_GET_PRIVATE (setting)->mac_address_blacklist = NULL;
 	g_object_notify (G_OBJECT (setting), NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST);
 }
 
@@ -683,6 +681,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 	const char *valid_modes[] = { NM_SETTING_WIRELESS_MODE_INFRA, NM_SETTING_WIRELESS_MODE_ADHOC, NM_SETTING_WIRELESS_MODE_AP, NULL };
 	const char *valid_bands[] = { "a", "bg", NULL };
 	GSList *iter;
+	int i;
 	gsize length;
 
 	if (!priv->ssid) {
@@ -773,13 +772,15 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 		return FALSE;
 	}
 
-	for (iter = priv->mac_address_blacklist; iter; iter = iter->next) {
+	for (i = 0; i < priv->mac_address_blacklist->len; i++) {
-		if (!nm_utils_hwaddr_valid (iter->data, ETH_ALEN)) {
+		const char *mac = g_array_index (priv->mac_address_blacklist, const char *, i);
+
+		if (!nm_utils_hwaddr_valid (mac, ETH_ALEN)) {
 			g_set_error (error,
 			             NM_CONNECTION_ERROR,
 			             NM_CONNECTION_ERROR_INVALID_PROPERTY,
 			             _("'%s' is not a valid MAC address"),
-			             (const char *) iter->data);
+			             mac);
 			g_prefix_error (error, "%s.%s: ", NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST);
 			return FALSE;
 		}
@@ -811,9 +812,20 @@ nm_setting_wireless_get_security (NMSetting    *setting,
 		return NULL;
 }
 
+static void
+clear_blacklist_item (char **item_p)
+{
+	g_free (*item_p);
+}
+
 static void
 nm_setting_wireless_init (NMSettingWireless *setting)
 {
+	NMSettingWirelessPrivate *priv = NM_SETTING_WIRELESS_GET_PRIVATE (setting);
+
+	/* We use GArray rather than GPtrArray so it will automatically be NULL-terminated */
+	priv->mac_address_blacklist = g_array_new (TRUE, FALSE, sizeof (char *));
+	g_array_set_clear_func (priv->mac_address_blacklist, (GDestroyNotify) clear_blacklist_item);
 }
 
 static void
@@ -829,7 +841,7 @@ finalize (GObject *object)
 	g_free (priv->bssid);
 	g_free (priv->device_mac_address);
 	g_free (priv->cloned_mac_address);
-	g_slist_free_full (priv->mac_address_blacklist, g_free);
+	g_array_unref (priv->mac_address_blacklist);
 	g_slist_free_full (priv->seen_bssids, g_free);
 
 	G_OBJECT_CLASS (nm_setting_wireless_parent_class)->finalize (object);
@@ -840,6 +852,7 @@ set_property (GObject *object, guint prop_id,
               const GValue *value, GParamSpec *pspec)
 {
 	NMSettingWirelessPrivate *priv = NM_SETTING_WIRELESS_GET_PRIVATE (object);
+	char **blacklist;
 
 	switch (prop_id) {
 	case PROP_SSID:
@@ -877,8 +890,14 @@ set_property (GObject *object, guint prop_id,
 		priv->cloned_mac_address = g_value_dup_string (value);
 		break;
 	case PROP_MAC_ADDRESS_BLACKLIST:
-		g_slist_free_full (priv->mac_address_blacklist, g_free);
+		blacklist = g_value_dup_boxed (value);
-		priv->mac_address_blacklist = _nm_utils_strv_to_slist (g_value_get_boxed (value));
+		g_array_set_size (priv->mac_address_blacklist, 0);
+		if (blacklist) {
+			g_array_set_size (priv->mac_address_blacklist, g_strv_length (blacklist));
+			memcpy (priv->mac_address_blacklist->data, blacklist,
+			        priv->mac_address_blacklist->len * sizeof (char *));
+			g_free (blacklist);
+		}
 		break;
 	case PROP_MTU:
 		priv->mtu = g_value_get_uint (value);
@@ -932,7 +951,7 @@ get_property (GObject *object, guint prop_id,
 		g_value_set_string (value, nm_setting_wireless_get_cloned_mac_address (setting));
 		break;
 	case PROP_MAC_ADDRESS_BLACKLIST:
-		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->mac_address_blacklist));
+		g_value_set_boxed (value, (char **) priv->mac_address_blacklist->data);
 		break;
 	case PROP_MTU:
 		g_value_set_uint (value, nm_setting_wireless_get_mtu (setting));

libnm-core/nm-setting-wireless.h

@@ -104,7 +104,7 @@ guint32           nm_setting_wireless_get_tx_power           (NMSettingWireless
 const char       *nm_setting_wireless_get_mac_address        (NMSettingWireless *setting);
 const char       *nm_setting_wireless_get_cloned_mac_address (NMSettingWireless *setting);
 
-const GSList     *nm_setting_wireless_get_mac_address_blacklist   (NMSettingWireless *setting);
+const char * const *nm_setting_wireless_get_mac_address_blacklist   (NMSettingWireless *setting);
 guint32           nm_setting_wireless_get_num_mac_blacklist_items (NMSettingWireless *setting);
 const char *      nm_setting_wireless_get_mac_blacklist_item      (NMSettingWireless *setting,
                                                                    guint32 idx);

src/devices/nm-device-ethernet.c

@@ -442,7 +442,8 @@ check_connection_compatible (NMDevice *device, NMConnection *connection)
 	if (s_wired) {
 		const char *mac;
 		gboolean try_mac = TRUE;
-		const GSList *mac_blacklist, *mac_blacklist_iter;
+		const char * const *mac_blacklist;
+		int i;
 
 		if (!match_subchans (self, s_wired, &try_mac))
 			return FALSE;
@@ -453,14 +454,13 @@ check_connection_compatible (NMDevice *device, NMConnection *connection)
 
 		/* Check for MAC address blacklist */
 		mac_blacklist = nm_setting_wired_get_mac_address_blacklist (s_wired);
-		for (mac_blacklist_iter = mac_blacklist; mac_blacklist_iter;
+		for (i = 0; mac_blacklist[i]; i++) {
-			 mac_blacklist_iter = g_slist_next (mac_blacklist_iter)) {
+			if (!nm_utils_hwaddr_valid (mac_blacklist[i], ETH_ALEN)) {
-			if (!nm_utils_hwaddr_valid (mac_blacklist_iter->data, ETH_ALEN)) {
 				g_warn_if_reached ();
 				return FALSE;
 			}
 
-			if (nm_utils_hwaddr_matches (mac_blacklist_iter->data, -1, priv->perm_hw_addr, -1))
+			if (nm_utils_hwaddr_matches (mac_blacklist[i], -1, priv->perm_hw_addr, -1))
 				return FALSE;
 		}
 	}

src/devices/wifi/nm-device-wifi.c

@@ -801,7 +801,8 @@ check_connection_compatible (NMDevice *device, NMConnection *connection)
 	NMSettingConnection *s_con;
 	NMSettingWireless *s_wireless;
 	const char *mac;
-	const GSList *mac_blacklist, *mac_blacklist_iter;
+	const char * const *mac_blacklist;
+	int i;
 	const char *mode;
 
 	if (!NM_DEVICE_CLASS (nm_device_wifi_parent_class)->check_connection_compatible (device, connection))
@@ -823,14 +824,13 @@ check_connection_compatible (NMDevice *device, NMConnection *connection)
 
 	/* Check for MAC address blacklist */
 	mac_blacklist = nm_setting_wireless_get_mac_address_blacklist (s_wireless);
-	for (mac_blacklist_iter = mac_blacklist; mac_blacklist_iter;
+	for (i = 0; mac_blacklist[i]; i++) {
-	     mac_blacklist_iter = g_slist_next (mac_blacklist_iter)) {
+		if (!nm_utils_hwaddr_valid (mac_blacklist[i], ETH_ALEN)) {
-		if (!nm_utils_hwaddr_valid (mac_blacklist_iter->data, ETH_ALEN)) {
 			g_warn_if_reached ();
 			return FALSE;
 		}
 
-		if (nm_utils_hwaddr_matches (mac_blacklist_iter->data, -1, priv->perm_hw_addr, -1))
+		if (nm_utils_hwaddr_matches (mac_blacklist[i], -1, priv->perm_hw_addr, -1))
 			return FALSE;
 	}
 

src/settings/plugins/ifcfg-rh/writer.c

@@ -811,7 +811,7 @@ write_wireless_setting (NMConnection *connection,
 	char buf[33];
 	guint32 mtu, chan, i;
 	gboolean adhoc = FALSE, hex_ssid = FALSE;
-	const GSList *macaddr_blacklist;
+	const char * const *macaddr_blacklist;
 
 	s_wireless = nm_connection_get_setting_wireless (connection);
 	if (!s_wireless) {
@@ -828,19 +828,12 @@ write_wireless_setting (NMConnection *connection,
 
 	svSetValue (ifcfg, "HWADDR_BLACKLIST", NULL, FALSE);
 	macaddr_blacklist = nm_setting_wireless_get_mac_address_blacklist (s_wireless);
-	if (macaddr_blacklist) {
+	if (macaddr_blacklist[0]) {
-		const GSList *iter;
+		char *blacklist_str;
-		GString *blacklist_str = g_string_new (NULL);
 
-		for (iter = macaddr_blacklist; iter; iter = g_slist_next (iter)) {
+		blacklist_str = g_strjoinv (" ", (char **) macaddr_blacklist);
-			g_string_append (blacklist_str, iter->data);
+		svSetValue (ifcfg, "HWADDR_BLACKLIST", blacklist_str, FALSE);
-			g_string_append_c (blacklist_str, ' ');
+		g_free (blacklist_str);
-
-		}
-		if (blacklist_str->len > 0)
-			g_string_truncate (blacklist_str, blacklist_str->len - 1);
-		svSetValue (ifcfg, "HWADDR_BLACKLIST", blacklist_str->str, FALSE);
-		g_string_free (blacklist_str, TRUE);
 	}
 
 	svSetValue (ifcfg, "MTU", NULL, FALSE);
@@ -1040,7 +1033,7 @@ write_wired_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
 	guint32 mtu, num_opts, i;
 	const char *const *s390_subchannels;
 	GString *str;
-	const GSList *macaddr_blacklist;
+	const char * const *macaddr_blacklist;
 
 	s_wired = nm_connection_get_setting_wired (connection);
 	if (!s_wired) {
@@ -1057,19 +1050,12 @@ write_wired_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
 
 	svSetValue (ifcfg, "HWADDR_BLACKLIST", NULL, FALSE);
 	macaddr_blacklist = nm_setting_wired_get_mac_address_blacklist (s_wired);
-	if (macaddr_blacklist) {
+	if (macaddr_blacklist[0]) {
-		const GSList *iter;
+		char *blacklist_str;
-		GString *blacklist_str = g_string_new (NULL);
 
-		for (iter = macaddr_blacklist; iter; iter = g_slist_next (iter)) {
+		blacklist_str = g_strjoinv (" ", (char **) macaddr_blacklist);
-			g_string_append (blacklist_str, iter->data);
+		svSetValue (ifcfg, "HWADDR_BLACKLIST", blacklist_str, FALSE);
-			g_string_append_c (blacklist_str, ' ');
+		g_free (blacklist_str);
-
-		}
-		if (blacklist_str->len > 0)
-			g_string_truncate (blacklist_str, blacklist_str->len - 1);
-		svSetValue (ifcfg, "HWADDR_BLACKLIST", blacklist_str->str, FALSE);
-		g_string_free (blacklist_str, TRUE);
 	}
 
 	svSetValue (ifcfg, "MTU", NULL, FALSE);