diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/dhcp-nettools-fix-parsing-of-search-domains-option.patch | 32 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/debian/patches/dhcp-nettools-fix-parsing-of-search-domains-option.patch b/debian/patches/dhcp-nettools-fix-parsing-of-search-domains-option.patch new file mode 100644 index 00000000..a361aa31 --- /dev/null +++ b/debian/patches/dhcp-nettools-fix-parsing-of-search-domains-option.patch @@ -0,0 +1,32 @@ +From: Beniamino Galvani <bgalvani@redhat.com> +Date: Tue, 17 Dec 2019 14:23:33 +0100 +Subject: dhcp: nettools: fix parsing of search domains option + +'first' was never modified and so the dot was never added. + +Fixes: 6adade6f21d5 ('dhcp: add nettools dhcp4 client') + +https://bugzilla.redhat.com/show_bug.cgi?id=1783981 +(cherry picked from commit 9aa00a8a14cb64f851234d025498ff2f9ec18e94) +(cherry picked from commit ea22135384edaf57a41293bd517ff1445b8c88a8) +--- + src/dhcp/nm-dhcp-nettools.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/dhcp/nm-dhcp-nettools.c +index e557c00..a537ee8 100644 +--- a/src/dhcp/nm-dhcp-nettools.c ++++ b/src/dhcp/nm-dhcp-nettools.c +@@ -246,10 +246,10 @@ lease_option_print_domain_name (GString *str, uint8_t *cache, size_t *n_cachep, + return TRUE; + } + +- if (!first) { ++ if (!first) + g_string_append_c(str, '.'); ++ else + first = FALSE; +- } + + if (!lease_option_print_label (str, n_label, domainp, n_domainp)) + return FALSE; diff --git a/debian/patches/series b/debian/patches/series index 9a20acf2..f14d66cb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ Force-online-state-with-unmanaged-devices.patch Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch +dhcp-nettools-fix-parsing-of-search-domains-option.patch |