Unverified Commit 372961a7 authored by Randy Eckenrode's avatar Randy Eckenrode
Browse files

dbus: fix vendored `getgrouplist` conditional

Without this patch, the vendored implementation of `getgrouplist` is
always used regardless of what is detected and set in `config.h`. The
function signature provided conflicts with the one in the SDK on Darwin.
Moving the condition to make it actually conditional fixes Darwin.
parent d964cb64
Loading
Loading
Loading
Loading
+8 −7
Original line number Diff line number Diff line
@@ -95,14 +95,15 @@ Without it, only the user's primary group is used in authentication!
+}
--- dbus-1.6.8/dbus/dbus-sysdeps-unix.c.orig	2013-02-28 13:08:52.171215237 +0000
+++ dbus-1.6.8/dbus/dbus-sysdeps-unix.c	2013-02-28 13:13:52.224615146 +0000
@@ -21,6 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
@@ -26,6 +26,11 @@
 
 #include <config.h>
 
+#ifndef HAVE_GETGROUPLIST
+#include "getgrouplist.c"
+#define HAVE_GETGROUPLIST
+#endif
 
 #include <config.h>
 
+
 #include "dbus-internals.h"
 #include "dbus-sysdeps.h"
 #include "dbus-sysdeps-unix.h"