From b23dd5166c6d248f5c71adee79d48dc5a7d780ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=8D=C3=B1igo=20Huguet?= Date: Wed, 28 Aug 2024 09:59:47 +0200 Subject: [PATCH] Revert "daemon-helper: use _nm_strerror_r() to avoid non-thread-safe strerror()" The function is not backported to this branch, and it's not 100% necessary. This reverts commit 93359f2b322789d63fe049ea975a07301f99eef7. (cherry picked from commit 29de766b9e3a2d6bdaa0285e7fa20fb3631bcd9b) --- src/nm-daemon-helper/nm-daemon-helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nm-daemon-helper/nm-daemon-helper.c b/src/nm-daemon-helper/nm-daemon-helper.c index 32be93a4ef..5faacf43f3 100644 --- a/src/nm-daemon-helper/nm-daemon-helper.c +++ b/src/nm-daemon-helper/nm-daemon-helper.c @@ -120,8 +120,8 @@ cmd_resolve_address(void) service, ret, gai_strerror(ret), - errsv, - _nm_strerror_r(errsv, buf, sizeof(buf))); + errno, + strerror(errno)); } else { fprintf(stderr, "getnameinfo() via service '%s' failed: %d (%s)\n",