diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2018-12-10 18:50:07 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2018-12-10 21:58:19 +0100 |
| commit | e335b8ae803a5a0f28a692edc0349ababa490445 (patch) | |
| tree | 753f3d62d0aaa2ab6a831f8dcfa525d714868d0c /src/dnsmasq | |
| parent | 69385b013384918a005052098d5beae003b4c8d3 (diff) | |
| parent | 227c401a10a930af6fd5f123aef345fcd130d6aa (diff) | |
Import Debian changes 1.12.6-0ubuntu1
network-manager (1.12.6-0ubuntu1) disco; urgency=medium
* New upstream version
- Fix a vulnerability in the internal DHCPv6 client (CVE-2018-15688).
* debian/patches/git_mac_change.patch:
- backported a regression fix from upstream git
[ Alfonso Sanchez-Beato ]
* Import some WoWLAN patches from the newer stable serie (LP: #1781597)
Diffstat (limited to 'src/dnsmasq')
| -rw-r--r-- | src/dnsmasq/nm-dnsmasq-manager.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/dnsmasq/nm-dnsmasq-manager.c b/src/dnsmasq/nm-dnsmasq-manager.c index 041e75ea..0907d034 100644 --- a/src/dnsmasq/nm-dnsmasq-manager.c +++ b/src/dnsmasq/nm-dnsmasq-manager.c @@ -235,6 +235,7 @@ create_dm_cmd_line (const char *iface, g_string_append_c (s, ','); g_string_append (s, nm_utils_inet4_ntop (nm_ip4_config_get_nameserver (ip4_config, i), tmpaddr)); } + nm_cmd_line_add_string (cmd, s->str); g_string_truncate (s, 0); } @@ -244,6 +245,7 @@ create_dm_cmd_line (const char *iface, g_string_append_c (s, ','); g_string_append (s, nm_ip4_config_get_search (ip4_config, i)); } + nm_cmd_line_add_string (cmd, s->str); g_string_truncate (s, 0); } |