Sync to HEAD@r274095.

[pw-darwin.git] / libutil / gr_util.c

diff --git a/libutil/gr_util.c b/libutil/gr_util.c
index 6f7450778f128b57829fd45f27434949f6ef3712..465efd982423b8f66cde4a85ca9ebabceebc5599 100644 (file)
--- a/libutil/gr_util.c
+++ b/libutil/gr_util.c
@@ -170,14 +170,21 @@ gr_copy(int ffd, int tfd, const struct group *gr, struct group *old_gr)
        size_t len;
        int eof, readlen;
 
-       sgr = gr;
+       if (old_gr == NULL && gr == NULL)
+               return(-1);
+
+       sgr = old_gr;
+       /* deleting a group */
        if (gr == NULL) {
                line = NULL;
-               if (old_gr == NULL)
+       } else {
+               if ((line = gr_make(gr)) == NULL)
                        return (-1);
-               sgr = old_gr;
-       } else if ((line = gr_make(gr)) == NULL)
-               return (-1);
+       }
+
+       /* adding a group */
+       if (sgr == NULL)
+               sgr = gr;
 
        eof = 0;
        len = 0;