fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-20 08:10:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: branch 'ih/strerror_r'

Browse source 
Fix two compilation issues

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2330
This commit is contained in:
Íñigo Huguet 2025-12-12 14:36:58 +00:00
commit df8288de7f
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
contrib/scripts/nm-ci-run.sh
View file

@ -169,6 +169,7 @@ meson setup build \
-D ld_gc=false \ -D ld_gc=false \
-D session_tracking=no \ -D session_tracking=no \
-D systemdsystemunitdir=no \ -D systemdsystemunitdir=no \
-D systemdsystemgeneratordir=no \
-D systemd_journal=false \ -D systemd_journal=false \
-D selinux=false \ -D selinux=false \
-D libaudit=no \ -D libaudit=no \

14
src/libnm-std-aux/nm-std-utils.c
View file

@ -117,7 +117,7 @@ nm_utils_set_effective_user(const char *user, char *errbuf, size_t errbuf_len)
errbuf_len, errbuf_len,
"error getting user entry: %d (%s)\n", "error getting user entry: %d (%s)\n",
errsv, errsv,
strerror_r(errsv, error, sizeof(error))); _nm_strerror_r(errsv, error, sizeof(error)));
} }
return false; 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", "failed to change group to %u: %d (%s)\n",
pwentry->pw_gid, pwentry->pw_gid,
errsv, errsv,
strerror_r(errsv, error, sizeof(error))); _nm_strerror_r(errsv, error, sizeof(error)));
return false; 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", "failed to reset supplementary group list to %u: %d (%s)\n",
pwentry->pw_gid, pwentry->pw_gid,
errsv, errsv,
strerror_r(errsv, error, sizeof(error))); _nm_strerror_r(errsv, error, sizeof(error)));
return false; 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", "failed to change user to %u: %d (%s)\n",
pwentry->pw_uid, pwentry->pw_uid,
errsv, errsv,
strerror_r(errsv, error, sizeof(error))); _nm_strerror_r(errsv, error, sizeof(error)));
return false; return false;
} }
@ -176,7 +176,7 @@ nm_utils_read_file_to_stdout(const char *filename, char *errbuf, size_t errbuf_l
errbuf_len, errbuf_len,
"error opening the file: %d (%s)", "error opening the file: %d (%s)",
errsv, errsv,
strerror_r(errsv, error, sizeof(error))); _nm_strerror_r(errsv, error, sizeof(error)));
return false; return false;
} }
@ -187,7 +187,7 @@ nm_utils_read_file_to_stdout(const char *filename, char *errbuf, size_t errbuf_l
errbuf_len, errbuf_len,
"error writing to stdout: %d (%s)", "error writing to stdout: %d (%s)",
errsv, errsv,
strerror_r(errsv, error, sizeof(error))); _nm_strerror_r(errsv, error, sizeof(error)));
return false; return false;
} }
} }
@ -198,7 +198,7 @@ nm_utils_read_file_to_stdout(const char *filename, char *errbuf, size_t errbuf_l
errbuf_len, errbuf_len,
"error reading the file: %d (%s)", "error reading the file: %d (%s)",
errsv, errsv,
strerror_r(errsv, error, sizeof(error))); _nm_strerror_r(errsv, error, sizeof(error)));
return false; return false;
} }