diff options
Diffstat (limited to 'libutil')
| -rw-r--r-- | libutil/gr_util.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/libutil/gr_util.c b/libutil/gr_util.c index b0b0b36..465efd9 100644 --- a/libutil/gr_util.c +++ b/libutil/gr_util.c @@ -351,6 +351,8 @@ gr_fini(void) int gr_equal(const struct group *gr1, const struct group *gr2) { + int gr1_ndx; + int gr2_ndx; /* Check that the non-member information is the same. */ if (gr1->gr_name == NULL || gr2->gr_name == NULL) { @@ -366,8 +368,7 @@ gr_equal(const struct group *gr1, const struct group *gr2) if (gr1->gr_gid != gr2->gr_gid) return (false); - /* - * Check all members in both groups. + /* Check all members in both groups. * getgrnam can return gr_mem with a pointer to NULL. * gr_dup and gr_add strip out this superfluous NULL, setting * gr_mem to NULL for no members. @@ -375,18 +376,22 @@ gr_equal(const struct group *gr1, const struct group *gr2) if (gr1->gr_mem != NULL && gr2->gr_mem != NULL) { int i; - for (i = 0; - gr1->gr_mem[i] != NULL && gr2->gr_mem[i] != NULL; i++) { + for (i = 0; gr1->gr_mem[i] != NULL; i++) { if (strcmp(gr1->gr_mem[i], gr2->gr_mem[i]) != 0) return (false); } - if (gr1->gr_mem[i] != NULL || gr2->gr_mem[i] != NULL) - return (false); - } else if (gr1->gr_mem != NULL && gr1->gr_mem[0] != NULL) { - return (false); - } else if (gr2->gr_mem != NULL && gr2->gr_mem[0] != NULL) { - return (false); } + /* Count number of members in both structs */ + gr2_ndx = 0; + if (gr2->gr_mem != NULL) + for(; gr2->gr_mem[gr2_ndx] != NULL; gr2_ndx++) + /* empty */; + gr1_ndx = 0; + if (gr1->gr_mem != NULL) + for(; gr1->gr_mem[gr1_ndx] != NULL; gr1_ndx++) + /* empty */; + if (gr1_ndx != gr2_ndx) + return (false); return (true); } |