ifcfg-rh: fix typo in function name and enhance testcase

The testcase now includes an invalid value too.

Added by commit  8657b4229ce5c572139f3b14cfb790b42490c194.

3 files changed, 14 insertions, 11 deletions

diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c
index 139d158c48..901996f64f 100644
--- a/src/settings/plugins/ifcfg-rh/reader.c
+++ b/src/settings/plugins/ifcfg-rh/reader.c
@@ -3240,7 +3240,7 @@ make_wireless_security_setting (shvarFile *ifcfg,
 }
 
 static char **
-transform_hwddr_blacklist (const char *blacklist)
+transform_hwaddr_blacklist (const char *blacklist)
 {
 	char **strv, **iter;
 	int shift = 0;
@@ -3248,13 +3248,13 @@ transform_hwddr_blacklist (const char *blacklist)
 	strv = _nm_utils_strsplit_set (blacklist, " \t", 0);
 	for (iter = strv; iter && *iter; iter++) {
 		if (shift) {
-			*(iter-shift) = *iter;
+			*(iter - shift) = *iter;
 			*iter = NULL;
 		}
-		if (!nm_utils_hwaddr_valid (*(iter-shift), ETH_ALEN)) {
-			PARSE_WARNING ("invalid MAC in HWADDR_BLACKLIST '%s'", *(iter-shift));
-			g_free (*(iter-shift));
-			*(iter-shift) = NULL;
+		if (!nm_utils_hwaddr_valid (*(iter - shift), ETH_ALEN)) {
+			PARSE_WARNING ("invalid MAC in HWADDR_BLACKLIST '%s'", *(iter - shift));
+			g_free (*(iter - shift));
+			*(iter - shift) = NULL;
 			shift++;
 		}
 	}
@@ -3289,7 +3289,7 @@ make_wireless_setting (shvarFile *ifcfg,
 	if (value) {
 		char **strv;
 
-		strv = transform_hwddr_blacklist (value);
+		strv = transform_hwaddr_blacklist (value);
 		g_object_set (s_wireless, NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST, strv, NULL);
 		g_strfreev (strv);
 		g_free (value);
@@ -3618,7 +3618,7 @@ make_wired_setting (shvarFile *ifcfg,
 	if (value) {
 		char **strv;
 
-		strv = transform_hwddr_blacklist (value);
+		strv = transform_hwaddr_blacklist (value);
 		g_object_set (s_wired, NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST, strv, NULL);
 		g_strfreev (strv);
 		g_free (value);
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables
index 5649a84892..c7892a219d 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables
+++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables
@@ -1,3 +1,3 @@
 DEVICE=eth0
-HWADDR_BLACKLIST="00:16:41:11:22:88 00:16:41:11:22:99"
+HWADDR_BLACKLIST="00:16:41:11:22:88 00:16:41:11:22:99 XX:aa:invalid 6A:5D:5A:FA:DD:F0"
 
diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
index 39d4ffdd4e..c48e9ed44e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
@@ -245,13 +245,16 @@ test_read_miscellaneous_variables (void)
 	NMSettingWired *s_wired;
 	NMSettingIP4Config *s_ip4;
 	GError *error = NULL;
-	char *expected_mac_blacklist[2] = { "00:16:41:11:22:88", "00:16:41:11:22:99" };
+	char *expected_mac_blacklist[3] = { "00:16:41:11:22:88", "00:16:41:11:22:99", "6a:5d:5a:fa:dd:f0" };
 	int mac_blacklist_num, i;
 	guint64 expected_timestamp = 0;
 	gboolean success;
 
+	g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING,
+	                       "*invalid MAC in HWADDR_BLACKLIST 'XX:aa:invalid'*");
 	connection = connection_from_file (TEST_IFCFG_DIR"/network-scripts/ifcfg-test-misc-variables",
 	                                   NULL, TYPE_ETHERNET, NULL, NULL, NULL, NULL, &error, NULL);
+	g_test_assert_expected_messages ();
 	g_assert_no_error (error);
 	g_assert (connection);
 	success = nm_connection_verify (connection, &error);
@@ -271,7 +274,7 @@ test_read_miscellaneous_variables (void)
 
 	/* MAC blacklist */
 	mac_blacklist_num = nm_setting_wired_get_num_mac_blacklist_items (s_wired);
-	g_assert_cmpint (mac_blacklist_num, ==, 2);
+	g_assert_cmpint (mac_blacklist_num, ==, 3);
 	for (i = 0; i < mac_blacklist_num; i++)
 		g_assert (nm_utils_hwaddr_matches (nm_setting_wired_get_mac_blacklist_item (s_wired, i), -1, expected_mac_blacklist[i], -1));