userdbctl: fix counting

Fixes: #35294
(cherry picked from commit 7f8a4f1)
(cherry picked from commit 3d85366)
(cherry picked from commit 9d0e453)
(cherry picked from commit 20bf8b0)
(cherry picked from commit bd4b4d6)

Author: poettering

src/userdb/userdbctl.c

@@ -177,7 +177,7 @@ static const struct {
 };
 
 static int table_add_uid_boundaries(Table *table, const UidRange *p) {
-        int r;
+        int r, n_added = 0;
 
         assert(table);
 
@@ -247,9 +247,11 @@ static int table_add_uid_boundaries(Table *table, const UidRange *p) {
                                 TABLE_INT, 1); /* sort after any other entry with the same UID */
                 if (r < 0)
                         return table_log_add_error(r);
+
+                n_added += 2;
         }
 
-        return ELEMENTSOF(uid_range_table) * 2;
+        return n_added;
 }
 
 static int add_unavailable_uid(Table *table, uid_t start, uid_t end) {
@@ -540,7 +542,7 @@ static int show_group(GroupRecord *gr, Table *table) {
 }
 
 static int table_add_gid_boundaries(Table *table, const UidRange *p) {
-        int r;
+        int r, n_added = 0;
 
         assert(table);
 
@@ -605,9 +607,11 @@ static int table_add_gid_boundaries(Table *table, const UidRange *p) {
                                 TABLE_INT, 1); /* sort after any other entry with the same GID */
                 if (r < 0)
                         return table_log_add_error(r);
+
+                n_added += 2;
         }
 
-        return ELEMENTSOF(uid_range_table) * 2;
+        return n_added;
 }
 
 static int add_unavailable_gid(Table *table, uid_t start, uid_t end) {