Skip to content

Commit 08c1aff

Browse files
yuwatakeszybz
authored andcommitted
resolve: ignore nameserver= and domain= kernel command line options without value
Otherwise, manager_parse_dns_server_string_and_warn() or manager_parse_search_domains_and_warn() will trigger assertion. (cherry picked from commit 91acee9)
1 parent b4b4caf commit 08c1aff

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

src/resolve/resolved-conf.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,10 @@ static int proc_cmdline_callback(const char *key, const char *value, void *data)
518518
* interpret, for example dracut and SUSE Linux. */
519519

520520
if (proc_cmdline_key_streq(key, "nameserver")) {
521+
522+
if (proc_cmdline_value_missing(key, value))
523+
return 0;
524+
521525
if (!info->dns_server_unlinked) {
522526
/* The kernel command line overrides any prior configuration */
523527
dns_server_unlink_all(manager_get_first_dns_server(info->manager, DNS_SERVER_SYSTEM));
@@ -532,6 +536,9 @@ static int proc_cmdline_callback(const char *key, const char *value, void *data)
532536

533537
} else if (proc_cmdline_key_streq(key, "domain")) {
534538

539+
if (proc_cmdline_value_missing(key, value))
540+
return 0;
541+
535542
if (!info->search_domain_unlinked) {
536543
dns_search_domain_unlink_all(info->manager->search_domains);
537544
info->search_domain_unlinked = true;

0 commit comments

Comments
 (0)