diff options
| author | Michael Biebl <biebl@debian.org> | 2022-05-04 15:38:03 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2022-05-04 15:38:03 +0200 |
| commit | fc1f1b6881ed5199b4cc81face915769a3dc9897 (patch) | |
| tree | d2b3f6b775541cece8de7ef9e687c72665f5d820 /src/core/dnsmasq | |
| parent | 16cc38ed3d1761b178512c9a6c291ad366c6fad8 (diff) | |
| parent | 9959fdb2e8ddd06f2161798ca0a39c77d67c652d (diff) | |
Update upstream source from tag 'upstream/1.37.92'
Update to upstream version '1.37.92' with Debian dir 0128b715b1fc3e516169a4599c33567587d59088
Diffstat (limited to 'src/core/dnsmasq')
| -rw-r--r-- | src/core/dnsmasq/nm-dnsmasq-manager.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/dnsmasq/nm-dnsmasq-manager.c b/src/core/dnsmasq/nm-dnsmasq-manager.c index 4ab91e7e..be463da3 100644 --- a/src/core/dnsmasq/nm-dnsmasq-manager.c +++ b/src/core/dnsmasq/nm-dnsmasq-manager.c @@ -67,9 +67,12 @@ dm_watch_cb(GPid pid, int status, gpointer user_data) guint err; if (WIFEXITED(status)) { + char sbuf[NM_UTILS_TO_STRING_BUFFER_SIZE]; + err = WEXITSTATUS(status); if (err != 0) { - _LOGW("dnsmasq exited with error: %s", nm_utils_dnsmasq_status_to_string(err, NULL, 0)); + _LOGW("dnsmasq exited with error: %s", + nm_utils_dnsmasq_status_to_string(err, sbuf, sizeof(sbuf))); } } else if (WIFSTOPPED(status)) { _LOGW("dnsmasq stopped unexpectedly with signal %d", WSTOPSIG(status)); @@ -188,8 +191,6 @@ create_dm_cmd_line(const char *iface, nm_strv_ptrarray_add_string_dup(cmd, "--dhcp-option-force=43,ANDROID_METERED"); } - nm_strv_ptrarray_add_string_dup(cmd, "--dhcp-lease-max=50"); - nm_strv_ptrarray_add_string_printf(cmd, "--dhcp-leasefile=%s/dnsmasq-%s.leases", NMSTATEDIR, |