Attachment 2012 Details for Bug 2645 – Patch to fix the problem

[patch] Patch to fix the problem

dbus-getpwname.patch (text/plain), 1.75 KB, created by Tom Parker on 2005-03-03 03:50:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Parker

Created: 2005-03-03 03:50:48 UTC

Size: 1.75 KB

patch

obsolete

>diff -ur dbus-0.23.2/dbus/dbus-sysdeps.c dbus-0.23.2.old/dbus/dbus-sysdeps.c
>--- dbus-0.23.2/dbus/dbus-sysdeps.c	Wed Jan 12 00:07:52 2005
>+++ dbus-0.23.2.old/dbus/dbus-sysdeps.c	Tue Mar  1 03:25:02 2005
>@@ -1422,7 +1422,7 @@
>    * checks
>    */
>   
>-#if defined (HAVE_POSIX_GETPWNAME_R) || defined (HAVE_NONPOSIX_GETPWNAME_R)
>+#if defined (HAVE_POSIX_GETPWNAM_R) || defined (HAVE_NONPOSIX_GETPWNAM_R)
>   {
>     struct passwd *p;
>     int result;
>@@ -1430,8 +1430,8 @@
>     struct passwd p_str;
> 
>     p = NULL;
>-#ifdef HAVE_POSIX_GETPWNAME_R
>-    if (uid >= 0)
>+#ifdef HAVE_POSIX_GETPWNAM_R
>+    if (uid != DBUS_UID_UNSET)
>       result = getpwuid_r (uid, &p_str, buf, sizeof (buf),
>                            &p);
>     else
>@@ -1443,7 +1443,7 @@
>     else
>       p = getpwnam_r (username_c, &p_str, buf, sizeof (buf));
>     result = 0;
>-#endif /* !HAVE_POSIX_GETPWNAME_R */
>+#endif /* !HAVE_POSIX_GETPWNAM_R */
>     if (result == 0 && p == &p_str)
>       {
>         if (!fill_user_info_from_passwd (p, info, error))
>@@ -1658,7 +1658,7 @@
>    * to add more configure checks.
>    */
>   
>-#if defined (HAVE_POSIX_GETPWNAME_R) || defined (HAVE_NONPOSIX_GETPWNAME_R)
>+#if defined (HAVE_POSIX_GETPWNAM_R) || defined (HAVE_NONPOSIX_GETPWNAM_R)
>   {
>     struct group *g;
>     int result;
>@@ -1666,7 +1666,7 @@
>     struct group g_str;
> 
>     g = NULL;
>-#ifdef HAVE_POSIX_GETPWNAME_R
>+#ifdef HAVE_POSIX_GETPWNAM_R
> 
>     if (group_c_str)
>       result = getgrnam_r (group_c_str, &g_str, buf, sizeof (buf),
>@@ -1677,7 +1677,7 @@
> #else
>     p = getgrnam_r (group_c_str, &g_str, buf, sizeof (buf));
>     result = 0;
>-#endif /* !HAVE_POSIX_GETPWNAME_R */
>+#endif /* !HAVE_POSIX_GETPWNAM_R */
>     if (result == 0 && g == &g_str)
>       {
>         return fill_user_info_from_group (g, info, error);
>

Actions: View | Splinter Review

Attachments on bug 2645: 2012

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.