busybox: fix a compile error on mac os x

[openwrt.git] / package / busybox / patches / 803-id_getgrouplist.patch

diff --git a/package/busybox/patches/803-id_getgrouplist.patch b/package/busybox/patches/803-id_getgrouplist.patch
index dd2dee6..66c1849 100644 (file)
--- a/package/busybox/patches/803-id_getgrouplist.patch
+++ b/package/busybox/patches/803-id_getgrouplist.patch
@@ -5,9 +5,9 @@ Signed-off-by: Nicolas Thill <nico@openwrt.org>
 
 --- a/coreutils/id.c
 +++ b/coreutils/id.c
-@@ -17,10 +17,12 @@
+@@ -63,10 +63,12 @@
  
- #include "libbb.h"
+ /* This is a NOEXEC applet. Be very careful! */
  
 +#define HAVE_GETGROUPLIST 1
 +
@@ -19,7 +19,7 @@ Signed-off-by: Nicolas Thill <nico@openwrt.org>
  #endif
  #endif
  #endif
-@@ -82,7 +84,11 @@ static int get_groups(const char *userna
+@@ -128,7 +130,11 @@ static int get_groups(const char *userna
                /* If the user is a member of more than
                 * *n groups, then -1 is returned. Otherwise >= 0.
                 * (and no defined way of detecting errors?!) */
@@ -30,8 +30,8 @@ Signed-off-by: Nicolas Thill <nico@openwrt.org>
 +#endif
                /* I guess *n < 0 might indicate error. Anyway,
                 * malloc'ing -1 bytes won't be good, so: */
-               //if (*n < 0)
-@@ -154,6 +160,7 @@ int id_main(int argc UNUSED_PARAM, char 
+               if (*n < 0)
+@@ -210,6 +216,7 @@ int id_main(int argc UNUSED_PARAM, char 
                        if (egid != rgid)
                                status |= print_group(egid, " ");
                }
@@ -39,7 +39,7 @@ Signed-off-by: Nicolas Thill <nico@openwrt.org>
                /* We are supplying largish buffer, trying
                 * to not run get_groups() twice. That might be slow
                 * ("user database in remote SQL server" case) */
-@@ -181,6 +188,7 @@ int id_main(int argc UNUSED_PARAM, char 
+@@ -236,6 +243,7 @@ int id_main(int argc UNUSED_PARAM, char 
                }
                if (ENABLE_FEATURE_CLEAN_UP)
                        free(groups);