r2540: Fix it the way Henrik Nordstrom (the patch author) wants :-).

Jeremy.
(This used to be commit 45707b5700f8a7c422fca2d7c95f9fab50740f35)

diff --git a/source3/nsswitch/winbind_nss_linux.c b/source3/nsswitch/winbind_nss_linux.c
index 267631cf2c1fba6b94386f6e06a553c4e83f45ca..0ea5db74da6e91d4d8bca08a7cc4b84437958ffd 100644 (file)
--- a/source3/nsswitch/winbind_nss_linux.c
+++ b/source3/nsswitch/winbind_nss_linux.c
@@ -23,10 +23,6 @@
 
 #include "winbind_client.h"
 
-#ifndef MIN
-#define MIN(a,b) ((a)<(b)?(a):(b))
-#endif
-
 /* Maximum number of users to pass back over the unix domain socket
    per call. This is not a static limit on the total number of users 
    or groups returned in total. */
@@ -852,7 +848,9 @@ _nss_winbind_initgroups_dyn(char *user, gid_t group, long int *start,
                                        if (*size == limit) {
                                                goto done;
                                        }
-                                       newsize = MIN(newsize, limit);
+                                       if (newsize > limit) {
+                                               newsize = limit;
+                                       }
                                }
 
                                newgroups = realloc((*groups), newsize * sizeof(**groups));