From 695c43708f8778c09915b297c95e48d66c814d0d Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 5 Oct 2004 15:36:41 +0000 Subject: Update. 2004-10-05 Ulrich Drepper * grp/initgroups.c: Remove duplicate group IDs. * grp/compat-initgroups.c: Likewise. * nscd/initgrcache.c: Likewise. --- nscd/initgrcache.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'nscd') diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c index 124b4bae62..b46433716b 100644 --- a/nscd/initgrcache.c +++ b/nscd/initgrcache.c @@ -117,6 +117,7 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req, /* Nothing added yet. */ while (! no_more) { + long int prev_start = start; enum nss_status status; initgroups_dyn_function fct; fct = __nss_lookup_function (nip, "initgroups_dyn"); @@ -133,6 +134,21 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req, status = DL_CALL_FCT (fct, (key, -1, &start, &size, &groups, limit, &errno)); + /* Remove duplicates. */ + long int cnt = prev_start; + while (cnt < start) + { + long int inner; + for (inner = 0; inner < prev_start; ++inner) + if (groups[inner] == groups[cnt]) + break; + + if (inner < prev_start) + groups[cnt] = groups[--start]; + else + ++cnt; + } + if (status != NSS_STATUS_TRYAGAIN) all_tryagain = false; -- cgit v1.2.3