diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-08-10 23:18:06 +0200 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2014-08-18 16:57:14 -0500 |
| commit | 141851b1cee156c56f1a2acd4ef5d37b475b3439 (patch) | |
| tree | 9b116f23ba4380c5fddc10a5c82962fa1c283a45 | |
| parent | 34a25aeae0963f4dd68c1857c417c6cec2cb958c (diff) | |
| download | NetworkManager-141851b1cee156c56f1a2acd4ef5d37b475b3439.tar.gz | |
fixup! ibft: add settings plugin for reading iBFT configuration (bgo #734009)
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | include/nm-test-utils.h | 13 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | src/settings/plugins/ibft/reader.c | 6 |
4 files changed, 14 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index 2c3ccc4c6a..155b3cdd2d 100644 --- a/.gitignore +++ b/.gitignore @@ -215,6 +215,7 @@ valgrind-*.log /src/dhcp-manager/tests/test-dnsmasq-utils /src/settings/plugins/keyfile/tests/test-keyfile +/src/settings/plugins/ibft/tests/test-ibft /src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh /src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils /src/settings/plugins/ifcfg-rh/tests/network-scripts/Test_Write_* diff --git a/include/nm-test-utils.h b/include/nm-test-utils.h index 4bf4cde41d..cd1fa18752 100644 --- a/include/nm-test-utils.h +++ b/include/nm-test-utils.h @@ -937,7 +937,7 @@ nmtst_create_minimal_connection (const char *id, const char *uuid, const char *t static inline void nmtst_assert_ip4_address_equals (guint32 addr, const char *expected, const char *loc) { - guint32 addr2 = nmtst_inet4_from_string (expected ? expected : "0.0.0.0"); + guint32 addr2 = nmtst_inet4_from_string (expected); if (addr != addr2) g_error ("assert: %s: ip4 address '%s' expected, but got %s", @@ -946,16 +946,19 @@ nmtst_assert_ip4_address_equals (guint32 addr, const char *expected, const char #define nmtst_assert_ip4_address_equals(addr, expected) \ nmtst_assert_ip4_address_equals (addr, expected, G_STRLOC) +#ifdef __NM_UTILS_H__ static inline void nmtst_assert_hwaddr_equals (gconstpointer hwaddr1, gssize hwaddr1_len, const char *expected, const char *loc) { - if (!nm_utils_hwaddr_matches (hwaddr1, hwaddr1_len, expected, -1)) { - g_error ("assert: %s: hwaddr '%s' expected, but got %s", - loc, expected ? expected : "any", - nm_utils_hwaddr_ntoa (hwaddr1, hwaddr1_len)); + g_assert (expected); + + if (!nm_utils_hwaddr_matches (hwaddr1, hwaddr1_len, expected, -1)) { + g_error ("assert: %s: hwaddr '%s' expected, but got %s", + loc, expected, nm_utils_hwaddr_ntoa (hwaddr1, hwaddr1_len)); } } #define nmtst_assert_hwaddr_equals(hwaddr1, hwaddr1_len, expected) \ nmtst_assert_hwaddr_equals (hwaddr1, hwaddr1_len, expected, G_STRLOC) +#endif #endif /* __NM_TEST_UTILS_H__ */ diff --git a/po/POTFILES.in b/po/POTFILES.in index 37fd6199a6..e0e917b3e5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -121,5 +121,6 @@ src/nm-config.c src/nm-logging.c src/nm-manager.c src/nm-sleep-monitor-systemd.c +src/settings/plugins/ibft/plugin.c src/settings/plugins/ifcfg-rh/reader.c src/settings/nm-settings-utils.c diff --git a/src/settings/plugins/ibft/reader.c b/src/settings/plugins/ibft/reader.c index dd0203bc8e..cb47427a26 100644 --- a/src/settings/plugins/ibft/reader.c +++ b/src/settings/plugins/ibft/reader.c @@ -171,8 +171,10 @@ read_ibft_blocks (const char *iscsiadm_path, block_lines = NULL; } } else if (block_lines) { - if (strchr (*iter, '=')) - g_ptr_array_add (block_lines, remove_most_whitespace (*iter)); + char *s = remove_most_whitespace (*iter); + + if (s) + g_ptr_array_add (block_lines, s); else { PARSE_WARNING ("malformed iscsiadm record: no = in '%s'.", *iter); g_clear_pointer (&block_lines, g_ptr_array_unref); |