newuidmap,newgidmap: Correct the range size sanity check in get_map_ranges

The number of ranges should be the ceiling of the number of arguments divided
by three.

Without this fix newuidmap and newgidmap always report and error and fail,
which is very much not what we want.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/libmisc/idmapping.c b/libmisc/idmapping.c
index 81e85d5faaf67296e6fb30ecc765240280390a82..714c29ebd9fd84d7d93d6831d399c60cebc5f420 100644 (file)
--- a/libmisc/idmapping.c
+++ b/libmisc/idmapping.c
@@ -47,7 +47,7 @@ struct map_range *get_map_ranges(int ranges, int argc, char **argv)
                return NULL;
        }
 
-       if (ranges != ((argc - 2) + 2) / 3) {
+       if (ranges != ((argc + 2) / 3)) {
                fprintf(stderr, "%s: ranges: %u is wrong for argc: %d\n", Prog, ranges, argc);
                return NULL;
        }