From: Alejandro Colomar <alx@kernel.org>
Date: Mon, 22 Dec 2025 19:05:36 +0000 (+0100)
Subject: lib/, src/: Add blocks
X-Git-Tag: 4.19.0~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=977d76760b25bec1159198dc6b365abf13bdc744;p=thirdparty%2Fshadow.git

lib/, src/: Add blocks

This is in preparation for the following patch.

Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/lib/addgrps.c b/lib/addgrps.c
index 6ab34dcb3..da7843f23 100644
--- a/lib/addgrps.c
+++ b/lib/addgrps.c
@@ -52,16 +52,18 @@ add_groups(const char *list)
 	if (dup == NULL)
 		goto free_gids;
 
-	while (NULL != (g = strsep(&p, ",:"))) {
-		struct group  *grp;
+	{
+		while (NULL != (g = strsep(&p, ",:"))) {
+			struct group  *grp;
 
-		grp = getgrnam(g); /* local, no need for xgetgrnam */
-		if (NULL == grp) {
-			fprintf(shadow_logfd, _("Warning: unknown group %s\n"), g);
-			continue;
-		}
+			grp = getgrnam(g); /* local, no need for xgetgrnam */
+			if (NULL == grp) {
+				fprintf(shadow_logfd, _("Warning: unknown group %s\n"), g);
+				continue;
+			}
 
-		LSEARCH(gid_t, &grp->gr_gid, gids, &n);
+			LSEARCH(gid_t, &grp->gr_gid, gids, &n);
+		}
 	}
 	free(dup);
 
diff --git a/src/groupmod.c b/src/groupmod.c
index 22d07fe69..4f9c9ea5f 100644
--- a/src/groupmod.c
+++ b/src/groupmod.c
@@ -282,18 +282,20 @@ grp_update(void)
 		}
 #endif				/* SHADOWGRP */
 
-		ul = user_list;
-		while (NULL != (u = strsep(&ul, ","))) {
-			if (prefix_getpwnam(u) == NULL) {
-				fprintf(stderr, _("Invalid member username %s\n"), u);
-				exit (E_GRP_UPDATE);
-			}
+		{
+			ul = user_list;
+			while (NULL != (u = strsep(&ul, ","))) {
+				if (prefix_getpwnam(u) == NULL) {
+					fprintf(stderr, _("Invalid member username %s\n"), u);
+					exit(E_GRP_UPDATE);
+				}
 
-			grp.gr_mem = add_list(grp.gr_mem, u);
+				grp.gr_mem = add_list(grp.gr_mem, u);
 #ifdef	SHADOWGRP
-			if (NULL != osgrp)
-				sgrp.sg_mem = add_list(sgrp.sg_mem, u);
+				if (NULL != osgrp)
+					sgrp.sg_mem = add_list(sgrp.sg_mem, u);
 #endif				/* SHADOWGRP */
+			}
 		}
 	}