svn commit: samba r2540 - in branches/SAMBA_3_0/source/nsswitch: .

[jra at samba.org]

Author: jra
Date: 2004-09-22 23:27:20 +0000 (Wed, 22 Sep 2004)
New Revision: 2540

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_3_0/source/nsswitch&rev=2540&nolog=1

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

Modified:
   branches/SAMBA_3_0/source/nsswitch/winbind_nss_linux.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbind_nss_linux.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbind_nss_linux.c	2004-09-22 23:27:07 UTC (rev 2539)
+++ branches/SAMBA_3_0/source/nsswitch/winbind_nss_linux.c	2004-09-22 23:27:20 UTC (rev 2540)
@@ -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 @@
 					if (*size == limit) {
 						goto done;
 					}
-					newsize = MIN(newsize, limit);
+					if (newsize > limit) {
+						newsize = limit;
+					}
 				}
 
 				newgroups = realloc((*groups), newsize * sizeof(**groups));