[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/12] glib-compat: add g_unix_get_passwd_entry_qemu()
From: |
Michael Roth |
Subject: |
[PULL 08/12] glib-compat: add g_unix_get_passwd_entry_qemu() |
Date: |
Tue, 27 Oct 2020 00:53:13 -0500 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
The glib function was introduced in 2.64. It's a safer version of
getpwnam, and also simpler to use than getpwnam_r.
Currently, it's only use by the next patch in qemu-ga, which doesn't
(well well...) need the thread safety guarantees. Since the fallback
version is still unsafe, I would rather keep the _qemu postfix, to make
sure it's not being misused by mistake. When/if necessary, we can
implement a safer fallback and drop the _qemu suffix.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Michael Roth <michael.roth@amd.com>
---
include/glib-compat.h | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/include/glib-compat.h b/include/glib-compat.h
index 0b0ec76299..64e68aa730 100644
--- a/include/glib-compat.h
+++ b/include/glib-compat.h
@@ -30,6 +30,11 @@
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include <glib.h>
+#if defined(G_OS_UNIX)
+#include <glib-unix.h>
+#include <sys/types.h>
+#include <pwd.h>
+#endif
/*
* Note that because of the GLIB_VERSION_MAX_ALLOWED constant above, allowing
@@ -72,6 +77,27 @@
gint g_poll_fixed(GPollFD *fds, guint nfds, gint timeout);
#endif
+#if defined(G_OS_UNIX)
+/* Note: The fallback implementation is not MT-safe, and it returns a copy of
+ * the libc passwd (must be g_free() after use) but not the content. Because of
+ * these important differences the caller must be aware of, it's not #define
for
+ * GLib API substitution. */
+static inline struct passwd *
+g_unix_get_passwd_entry_qemu(const gchar *user_name, GError **error)
+{
+#if GLIB_CHECK_VERSION(2, 64, 0)
+ return g_unix_get_passwd_entry(user_name, error);
+#else
+ struct passwd *p = getpwnam(user_name);
+ if (!p) {
+ g_set_error_literal(error, G_UNIX_ERROR, 0, g_strerror(errno));
+ return NULL;
+ }
+ return (struct passwd *)g_memdup(p, sizeof(*p));
+#endif
+}
+#endif /* G_OS_UNIX */
+
#pragma GCC diagnostic pop
#endif
--
2.25.1
- [PULL 10/12] qga: add *reset argument to ssh-add-authorized-keys, (continued)
- [PULL 10/12] qga: add *reset argument to ssh-add-authorized-keys, Michael Roth, 2020/10/27
- [PULL 11/12] meson: minor simplification, Michael Roth, 2020/10/27
- [PULL 12/12] qga: add ssh-get-authorized-keys, Michael Roth, 2020/10/27
- [PULL 01/12] qga: Rename guest-get-devices return member 'address' to 'id', Michael Roth, 2020/10/27
- [PULL 02/12] qga: Use common time encoding for guest-get-devices 'driver-date', Michael Roth, 2020/10/27
- [PULL 03/12] qga-win: Fix guest-get-devices error API violations, Michael Roth, 2020/10/27
- [PULL 05/12] qga: add command guest-get-disks, Michael Roth, 2020/10/27
- [PULL 04/12] qga: Flatten simple union GuestDeviceId, Michael Roth, 2020/10/27
- [PULL 06/12] qga: add implementation of guest-get-disks for Linux, Michael Roth, 2020/10/27
- [PULL 07/12] qga: add implementation of guest-get-disks for Windows, Michael Roth, 2020/10/27
- [PULL 08/12] glib-compat: add g_unix_get_passwd_entry_qemu(),
Michael Roth <=
- [PULL 09/12] qga: add ssh-{add,remove}-authorized-keys, Michael Roth, 2020/10/27
- Re: [PULL 00/12] qemu-ga patch queue for soft-freeze, no-reply, 2020/10/27
- Re: [PULL 00/12] qemu-ga patch queue for soft-freeze, Peter Maydell, 2020/10/28