summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAna Cabral <acabral@redhat.com>2022-02-09 17:55:59 +0100
committerAna Cabral <acabral@redhat.com>2022-02-11 16:15:15 +0100
commitb385010d6990d2325d5e71883acaf47b81a4fead (patch)
tree98f3aac2a069ba77a124b1688fd56791e5f7f762
parent2da04c3877bb283451deff7a2d69b87215f53765 (diff)
downloadNetworkManager-b385010d6990d2325d5e71883acaf47b81a4fead.tar.gz
keyfile: do not write empty string list properties
https://bugzilla.redhat.com/show_bug.cgi?id=2022623 (cherry picked from commit 27c33d15efdf974a085590aa4077ab76862c1854)
-rw-r--r--src/libnm-core-impl/nm-keyfile.c115
-rw-r--r--src/libnm-core-impl/tests/test-setting.c18
2 files changed, 63 insertions, 70 deletions
diff --git a/src/libnm-core-impl/nm-keyfile.c b/src/libnm-core-impl/nm-keyfile.c
index 55d853a063..dce53ae27e 100644
--- a/src/libnm-core-impl/nm-keyfile.c
+++ b/src/libnm-core-impl/nm-keyfile.c
@@ -2768,6 +2768,11 @@ struct _ParseInfoProperty {
* default value. By setting this flag to TRUE, also
* default values are written. */
bool writer_persist_default : 1;
+
+ /* This flag indicates that the property should always
+ * be written to keyfile, even if it's the default.
+ * This is currently only implemented for STRV properties. */
+ bool always_write : 1;
};
#define PARSE_INFO_PROPERTY(_property_name, ...) \
@@ -2869,53 +2874,57 @@ static const ParseInfoSetting *const parse_infos[_NM_META_SETTING_TYPE_NUM] = {
NM_META_SETTING_TYPE_INFINIBAND,
PARSE_INFO_PROPERTIES(PARSE_INFO_PROPERTY(NM_SETTING_INFINIBAND_MAC_ADDRESS,
.parser = mac_address_parser_INFINIBAND, ), ), ),
- PARSE_INFO_SETTING(NM_META_SETTING_TYPE_IP4_CONFIG,
- PARSE_INFO_PROPERTIES(
- PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_ADDRESSES,
- .parser_no_check_key = TRUE,
- .parser = ip_address_or_route_parser,
- .writer = addr_writer, ),
- PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_DNS,
- .parser_no_check_key = TRUE,
- .parser = ip_dns_parser,
- .writer = dns_writer, ),
- PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_GATEWAY, .writer_skip = TRUE, ),
- PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_ROUTES,
- .parser_no_check_key = TRUE,
- .parser = ip_address_or_route_parser,
- .writer = route_writer, ),
- PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_ROUTING_RULES,
- .parser_no_check_key = TRUE,
- .parser_full = ip_routing_rule_parser_full,
- .writer_full = ip_routing_rule_writer_full,
- .has_parser_full = TRUE,
- .has_writer_full = TRUE, ), ), ),
- PARSE_INFO_SETTING(NM_META_SETTING_TYPE_IP6_CONFIG,
- PARSE_INFO_PROPERTIES(
- PARSE_INFO_PROPERTY(NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE,
- .parser_no_check_key = TRUE,
- .parser = ip6_addr_gen_mode_parser,
- .writer = ip6_addr_gen_mode_writer,
- .writer_persist_default = TRUE, ),
- PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_ADDRESSES,
- .parser_no_check_key = TRUE,
- .parser = ip_address_or_route_parser,
- .writer = addr_writer, ),
- PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_DNS,
- .parser_no_check_key = TRUE,
- .parser = ip_dns_parser,
- .writer = dns_writer, ),
- PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_GATEWAY, .writer_skip = TRUE, ),
- PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_ROUTES,
- .parser_no_check_key = TRUE,
- .parser = ip_address_or_route_parser,
- .writer = route_writer, ),
- PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_ROUTING_RULES,
- .parser_no_check_key = TRUE,
- .parser_full = ip_routing_rule_parser_full,
- .writer_full = ip_routing_rule_writer_full,
- .has_parser_full = TRUE,
- .has_writer_full = TRUE, ), ), ),
+ PARSE_INFO_SETTING(
+ NM_META_SETTING_TYPE_IP4_CONFIG,
+ PARSE_INFO_PROPERTIES(
+ PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_ADDRESSES,
+ .parser_no_check_key = TRUE,
+ .parser = ip_address_or_route_parser,
+ .writer = addr_writer, ),
+ PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_DNS,
+ .parser_no_check_key = TRUE,
+ .parser = ip_dns_parser,
+ .writer = dns_writer, ),
+ PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_DNS_OPTIONS, .always_write = TRUE, ),
+ PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_GATEWAY, .writer_skip = TRUE, ),
+ PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_ROUTES,
+ .parser_no_check_key = TRUE,
+ .parser = ip_address_or_route_parser,
+ .writer = route_writer, ),
+ PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_ROUTING_RULES,
+ .parser_no_check_key = TRUE,
+ .parser_full = ip_routing_rule_parser_full,
+ .writer_full = ip_routing_rule_writer_full,
+ .has_parser_full = TRUE,
+ .has_writer_full = TRUE, ), ), ),
+ PARSE_INFO_SETTING(
+ NM_META_SETTING_TYPE_IP6_CONFIG,
+ PARSE_INFO_PROPERTIES(
+ PARSE_INFO_PROPERTY(NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE,
+ .parser_no_check_key = TRUE,
+ .parser = ip6_addr_gen_mode_parser,
+ .writer = ip6_addr_gen_mode_writer,
+ .writer_persist_default = TRUE, ),
+ PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_ADDRESSES,
+ .parser_no_check_key = TRUE,
+ .parser = ip_address_or_route_parser,
+ .writer = addr_writer, ),
+ PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_DNS,
+ .parser_no_check_key = TRUE,
+ .parser = ip_dns_parser,
+ .writer = dns_writer, ),
+ PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_DNS_OPTIONS, .always_write = TRUE, ),
+ PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_GATEWAY, .writer_skip = TRUE, ),
+ PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_ROUTES,
+ .parser_no_check_key = TRUE,
+ .parser = ip_address_or_route_parser,
+ .writer = route_writer, ),
+ PARSE_INFO_PROPERTY(NM_SETTING_IP_CONFIG_ROUTING_RULES,
+ .parser_no_check_key = TRUE,
+ .parser_full = ip_routing_rule_parser_full,
+ .writer_full = ip_routing_rule_writer_full,
+ .has_parser_full = TRUE,
+ .has_writer_full = TRUE, ), ), ),
PARSE_INFO_SETTING(
NM_META_SETTING_TYPE_OVS_EXTERNAL_IDS,
PARSE_INFO_PROPERTIES(PARSE_INFO_PROPERTY(NM_SETTING_OVS_EXTERNAL_IDS_DATA,
@@ -3949,11 +3958,13 @@ write_setting_value(KeyfileWriterInfo *info,
char **array;
array = (char **) g_value_get_boxed(&value);
- nm_keyfile_plugin_kf_set_string_list(info->keyfile,
- setting_info->setting_name,
- key,
- (const char **const) array,
- g_strv_length(array));
+ if ((g_strv_length(array) != 0) || (pip && pip->always_write)) {
+ nm_keyfile_plugin_kf_set_string_list(info->keyfile,
+ setting_info->setting_name,
+ key,
+ (const char **const) array,
+ g_strv_length(array));
+ }
} else if (type == G_TYPE_HASH_TABLE) {
write_hash_of_string(info->keyfile, setting, key, &value);
} else if (type == G_TYPE_ARRAY) {
diff --git a/src/libnm-core-impl/tests/test-setting.c b/src/libnm-core-impl/tests/test-setting.c
index d6ac37b495..b260ac3767 100644
--- a/src/libnm-core-impl/tests/test-setting.c
+++ b/src/libnm-core-impl/tests/test-setting.c
@@ -3587,20 +3587,16 @@ test_roundtrip_conversion(gconstpointer test_data)
"uuid=%s\n"
"type=ethernet\n"
"interface-name=%s\n"
- "permissions=\n"
"\n"
"[ethernet]\n"
- "mac-address-blacklist=\n"
"%s" /* mtu */
"\n"
"%s" /* [ethernet-s390-options] */
"[ipv4]\n"
- "dns-search=\n"
"method=auto\n"
"\n"
"[ipv6]\n"
"addr-gen-mode=stable-privacy\n"
- "dns-search=\n"
"method=auto\n"
"\n"
"[proxy]\n"
@@ -3618,20 +3614,16 @@ test_roundtrip_conversion(gconstpointer test_data)
"uuid=%s\n"
"type=ethernet\n"
"interface-name=%s\n"
- "permissions=\n"
"\n"
"[ethernet]\n"
- "mac-address-blacklist=\n"
"%s" /* mtu */
"\n"
"%s" /* [ethernet-s390-options] */
"[ipv4]\n"
- "dns-search=\n"
"method=auto\n"
"\n"
"[ipv6]\n"
"addr-gen-mode=stable-privacy\n"
- "dns-search=\n"
"method=auto\n"
"",
ID,
@@ -3661,17 +3653,14 @@ test_roundtrip_conversion(gconstpointer test_data)
"uuid=%s\n"
"type=wireguard\n"
"interface-name=%s\n"
- "permissions=\n"
"\n"
"[wireguard]\n"
"\n"
"[ipv4]\n"
- "dns-search=\n"
"method=disabled\n"
"\n"
"[ipv6]\n"
"addr-gen-mode=stable-privacy\n"
- "dns-search=\n"
"method=disabled\n"
"\n"
"[proxy]\n"
@@ -3713,7 +3702,6 @@ test_roundtrip_conversion(gconstpointer test_data)
"uuid=%s\n"
"type=wireguard\n"
"interface-name=%s\n"
- "permissions=\n"
"\n"
"[wireguard]\n"
"%s" /* fwmark */
@@ -3723,12 +3711,10 @@ test_roundtrip_conversion(gconstpointer test_data)
"%s" /* [wireguard-peers*] */
"\n"
"[ipv4]\n"
- "dns-search=\n"
"method=disabled\n"
"\n"
"[ipv6]\n"
"addr-gen-mode=stable-privacy\n"
- "dns-search=\n"
"method=disabled\n"
"\n"
"[proxy]\n"
@@ -3798,14 +3784,11 @@ test_roundtrip_conversion(gconstpointer test_data)
"uuid=%s\n"
"type=ethernet\n"
"interface-name=%s\n"
- "permissions=\n"
"\n"
"[ethernet]\n"
- "mac-address-blacklist=\n"
"%s" /* mtu */
"\n"
"[ipv4]\n"
- "dns-search=\n"
"method=auto\n"
"routing-rule1=priority 1 from 0.0.0.0/0 table 1000\n"
"routing-rule2=priority 2 from 192.168.1.0/25 table 1001\n"
@@ -3813,7 +3796,6 @@ test_roundtrip_conversion(gconstpointer test_data)
"\n"
"[ipv6]\n"
"addr-gen-mode=stable-privacy\n"
- "dns-search=\n"
"method=auto\n"
"routing-rule1=priority 1 from ::/0 table 1000\n"
"routing-rule2=priority 2 from 1:2:3:b::/65 table 1001\n"