diff options
| author | Michael Biebl <biebl@debian.org> | 2025-12-13 13:49:03 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2025-12-13 13:49:03 +0100 |
| commit | b5001976dbff19f014171eed4a482e28ae7ec0f5 (patch) | |
| tree | 64fbd4ff0dd3c92b6e78fa4172c9f57a2b20e1fa /src/core/devices/nm-device-utils.c | |
| parent | def61b130ab011561ed66a1638a41d59c23b4710 (diff) | |
| parent | 6de29285e533f4fec22a219013f3687edb6b7399 (diff) | |
Update upstream source from tag 'upstream/1.54.3'
Update to upstream version '1.54.3' with Debian dir 29de9f9896550eb82236dfd0adfd428a49c51043
Diffstat (limited to 'src/core/devices/nm-device-utils.c')
| -rw-r--r-- | src/core/devices/nm-device-utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/devices/nm-device-utils.c b/src/core/devices/nm-device-utils.c index a78499fb..3e86e2e8 100644 --- a/src/core/devices/nm-device-utils.c +++ b/src/core/devices/nm-device-utils.c @@ -237,7 +237,7 @@ resolve_addr_helper_cb(GObject *source, GAsyncResult *result, gpointer user_data gs_free_error GError *error = NULL; gs_free char *output = NULL; - output = nm_utils_spawn_helper_finish(result, &error); + output = nm_utils_spawn_helper_finish_string(result, &error); if (nm_utils_error_is_cancelled(error)) return; @@ -276,6 +276,7 @@ resolve_addr_spawn_helper(ResolveAddrInfo *info, ResolveAddrService services) nm_inet_ntop(info->addr_family, &info->address, addr_str); _LOG2D(info, "start lookup via nm-daemon-helper using services: %s", str); nm_utils_spawn_helper(NM_MAKE_STRV("resolve-address", addr_str, str), + FALSE, g_task_get_cancellable(info->task), resolve_addr_helper_cb, info); |