diff options
| author | Simon McVittie <smcv@collabora.com> | 2020-03-11 14:15:29 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2020-03-11 14:15:29 +0000 |
| commit | 3197cbe3694b324cd1b3431df34cc2b5d471ff68 (patch) | |
| tree | f46c86e3d9e9cadd6279464fa7181bd10f491949 /dbus/dbus-sysdeps-util-unix.c | |
| parent | e70f19d48fda463566ef315ab29e7e606b843e9f (diff) | |
| parent | a7bf808cca79a95631e3c82223a0bc8982c94d94 (diff) | |
| download | dbus-3197cbe3694b324cd1b3431df34cc2b5d471ff68.tar.gz | |
Merge branch 'non-posix-getwpnam-r' into 'master'
Remove support for non-POSIX getpwnam_r()
See merge request dbus/dbus!11
Diffstat (limited to 'dbus/dbus-sysdeps-util-unix.c')
| -rw-r--r-- | dbus/dbus-sysdeps-util-unix.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c index ccf3d9f5..d29cbd1f 100644 --- a/dbus/dbus-sysdeps-util-unix.c +++ b/dbus/dbus-sysdeps-util-unix.c @@ -824,7 +824,7 @@ fill_group_info (DBusGroupInfo *info, * to add more configure checks. */ -#if defined (HAVE_POSIX_GETPWNAM_R) || defined (HAVE_NONPOSIX_GETPWNAM_R) +#ifdef HAVE_GETPWNAM_R { struct group *g; int result; @@ -854,17 +854,12 @@ fill_group_info (DBusGroupInfo *info, } g = NULL; -#ifdef HAVE_POSIX_GETPWNAM_R if (group_c_str) result = getgrnam_r (group_c_str, &g_str, buf, buflen, &g); else result = getgrgid_r (gid, &g_str, buf, buflen, &g); -#else - g = getgrnam_r (group_c_str, &g_str, buf, buflen); - result = 0; -#endif /* !HAVE_POSIX_GETPWNAM_R */ /* Try a bigger buffer if ERANGE was returned: https://bugs.freedesktop.org/show_bug.cgi?id=16727 */ @@ -899,6 +894,8 @@ fill_group_info (DBusGroupInfo *info, /* I guess we're screwed on thread safety here */ struct group *g; +#warning getpwnam_r() not available, please report this to the dbus maintainers with details of your OS + g = getgrnam (group_c_str); if (g != NULL) |