From 3608f5c3e9a39f390e7ebba0b7e601d20c018e91 Mon Sep 17 00:00:00 2001
From: lukem <lukem@NetBSD.org>
Date: Tue, 28 Sep 2004 10:46:19 +0000
Subject: [PATCH] 'gid_t *groups' may be NULL if we're just sizing the list by
 calling getgrouplist(3) with *grpcnt==0, so don't _DIAGASSERT(groups !=
 NULL).

Tweak API used between getgrouplist(3) and the back-end nsswitch methods;
move the public return value to the start of the va_list and reserve the
'void *retval' for "internal use" (e.g, errno passing or some other need).
---
 lib/libc/gen/getgrouplist.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/libc/gen/getgrouplist.c b/lib/libc/gen/getgrouplist.c
index 8488a8b411fc..f6f92b5c1184 100644
--- a/lib/libc/gen/getgrouplist.c
+++ b/lib/libc/gen/getgrouplist.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: getgrouplist.c,v 1.19 2004/09/25 12:27:35 lukem Exp $	*/
+/*	$NetBSD: getgrouplist.c,v 1.20 2004/09/28 10:46:19 lukem Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
 #if 0
 static char sccsid[] = "@(#)getgrouplist.c	8.2 (Berkeley) 12/8/94";
 #else
-__RCSID("$NetBSD: getgrouplist.c,v 1.19 2004/09/25 12:27:35 lukem Exp $");
+__RCSID("$NetBSD: getgrouplist.c,v 1.20 2004/09/28 10:46:19 lukem Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -104,6 +104,7 @@ __weak_alias(getgrouplist,_getgrouplist)
 static int
 _nss_dns_getgrouplist(void *retval, void *cb_data, va_list ap)
 {
+	int		*result	= va_arg(ap, int *);
 	const char 	*uname	= va_arg(ap, const char *);
 	gid_t		 agroup	= va_arg(ap, gid_t);
 	gid_t		*groups	= va_arg(ap, gid_t *);
@@ -160,7 +161,7 @@ _nss_dns_getgrouplist(void *retval, void *cb_data, va_list ap)
 		ngroups++;
 	}
 
-	*(int *)retval = ret;
+	*result = ret;
 	*grpcnt = ngroups;
 	rv = NS_SUCCESS;
 
@@ -177,7 +178,7 @@ int
 getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt)
 {
 	struct group *grp;
-	int i, ngroups, maxgroups, ret, glretval;
+	int i, ngroups, maxgroups, ret;
 
 	static const ns_dtab dtab[] = {
 		NS_DNS_CB(_nss_dns_getgrouplist, NULL)
@@ -185,15 +186,15 @@ getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt)
 	};
 
 	_DIAGASSERT(uname != NULL);
-	_DIAGASSERT(groups != NULL);
+	/* groups may be NULL if just sizing when invoked with *grpcnt = 0 */
 	_DIAGASSERT(grpcnt != NULL);
 
 			/* first, try source-specific optimized getgrouplist */
-	ret = nsdispatch(&glretval, dtab, NSDB_GROUP, "getgrouplist",
+	i = nsdispatch(NULL, dtab, NSDB_GROUP, "getgrouplist",
 	    __nsdefaultsrc,
-	    uname, agroup, groups, grpcnt);
-	if (ret == NS_SUCCESS)
-		return glretval;
+	    &ret, uname, agroup, groups, grpcnt);
+	if (i == NS_SUCCESS)
+		return ret;
 
 			/* fallback to scan the group(5) database */
 	ret = 0;