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 6ab34dcb31a4b915960fd3cdde2914fda684aef8..da7843f23195eaaee893c2c3f7dd1acb26cf4bc8 100644 (file)
--- 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 22d07fe69beb63b5eae0185dda922709c8bd310a..4f9c9ea5fd1285909aa08c3fd419788c337f605c 100644 (file)
--- 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 */
+                       }
                }
        }