From 599cc1ed1d0306905fa7581eded85c45defe582a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=8D=C3=B1igo=20Huguet?= <ihuguet@riseup.net>
Date: Fri, 12 Dec 2025 14:26:31 +0100
Subject: [PATCH] std-aux: use _nm_strerror_r

The function strerror_r returns an int per POSIX spec, but GNU version
returns char *. Using it fails the compilation in Alpine, so use
_nm_strerror_r instead that handles both cases.

Fixes: 41e28b900f59 ('daemon-helper: add read-file-as-user')
---
 src/libnm-std-aux/nm-std-utils.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/libnm-std-aux/nm-std-utils.c b/src/libnm-std-aux/nm-std-utils.c
index 6c909dfab3..ef0e445d76 100644
--- a/src/libnm-std-aux/nm-std-utils.c
+++ b/src/libnm-std-aux/nm-std-utils.c
@@ -117,7 +117,7 @@ nm_utils_set_effective_user(const char *user, char *errbuf, size_t errbuf_len)
                      errbuf_len,
                      "error getting user entry: %d (%s)\n",
                      errsv,
-                     strerror_r(errsv, error, sizeof(error)));
+                     _nm_strerror_r(errsv, error, sizeof(error)));
         }
         return false;
     }
@@ -129,7 +129,7 @@ nm_utils_set_effective_user(const char *user, char *errbuf, size_t errbuf_len)
                  "failed to change group to %u: %d (%s)\n",
                  pwentry->pw_gid,
                  errsv,
-                 strerror_r(errsv, error, sizeof(error)));
+                 _nm_strerror_r(errsv, error, sizeof(error)));
         return false;
     }
 
@@ -140,7 +140,7 @@ nm_utils_set_effective_user(const char *user, char *errbuf, size_t errbuf_len)
                  "failed to reset supplementary group list to %u: %d (%s)\n",
                  pwentry->pw_gid,
                  errsv,
-                 strerror_r(errsv, error, sizeof(error)));
+                 _nm_strerror_r(errsv, error, sizeof(error)));
         return false;
     }
 
@@ -151,7 +151,7 @@ nm_utils_set_effective_user(const char *user, char *errbuf, size_t errbuf_len)
                  "failed to change user to %u: %d (%s)\n",
                  pwentry->pw_uid,
                  errsv,
-                 strerror_r(errsv, error, sizeof(error)));
+                 _nm_strerror_r(errsv, error, sizeof(error)));
         return false;
     }
 
@@ -176,7 +176,7 @@ nm_utils_read_file_to_stdout(const char *filename, char *errbuf, size_t errbuf_l
                  errbuf_len,
                  "error opening the file: %d (%s)",
                  errsv,
-                 strerror_r(errsv, error, sizeof(error)));
+                 _nm_strerror_r(errsv, error, sizeof(error)));
         return false;
     }
 
@@ -187,7 +187,7 @@ nm_utils_read_file_to_stdout(const char *filename, char *errbuf, size_t errbuf_l
                      errbuf_len,
                      "error writing to stdout: %d (%s)",
                      errsv,
-                     strerror_r(errsv, error, sizeof(error)));
+                     _nm_strerror_r(errsv, error, sizeof(error)));
             return false;
         }
     }
@@ -198,7 +198,7 @@ nm_utils_read_file_to_stdout(const char *filename, char *errbuf, size_t errbuf_l
                  errbuf_len,
                  "error reading the file: %d (%s)",
                  errsv,
-                 strerror_r(errsv, error, sizeof(error)));
+                 _nm_strerror_r(errsv, error, sizeof(error)));
         return false;
     }