remove unused and misleading 'owner' argument from find_new_sub*

Signed-off-by: Serge Hallyn <shallyn@cisco.com>

diff --git a/lib/prototypes.h b/lib/prototypes.h
index 22603b9862193e0af70729e58a5170ea19070eb2..90651fb915ea5f702521cf3c4c4b02d68e5adf22 100644 (file)
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -161,12 +161,10 @@ extern int find_new_uid (bool sys_user,
 
 #ifdef ENABLE_SUBIDS
 /* find_new_sub_gids.c */
-extern int find_new_sub_gids (const char *owner,
-                             gid_t *range_start, unsigned long *range_count);
+extern int find_new_sub_gids (gid_t *range_start, unsigned long *range_count);
 
 /* find_new_sub_uids.c */
-extern int find_new_sub_uids (const char *owner,
-                             uid_t *range_start, unsigned long *range_count);
+extern int find_new_sub_uids (uid_t *range_start, unsigned long *range_count);
 #endif                         /* ENABLE_SUBIDS */
 
 

diff --git a/libmisc/find_new_sub_gids.c b/libmisc/find_new_sub_gids.c
index ae8a937c1ed438d21604b256a42c5c58fdbbc974..4d25abad7b76e1d060b4d6a031f83fb5cbe8eaee 100644 (file)
--- a/libmisc/find_new_sub_gids.c
+++ b/libmisc/find_new_sub_gids.c
@@ -46,8 +46,7 @@
  * 
  * Return 0 on success, -1 if no unused GIDs are available.
  */
-int find_new_sub_gids (const char *owner,
-                      gid_t *range_start, unsigned long *range_count)
+int find_new_sub_gids (gid_t *range_start, unsigned long *range_count)
 {
        unsigned long min, max;
        unsigned long count;

diff --git a/libmisc/find_new_sub_uids.c b/libmisc/find_new_sub_uids.c
index 12cb2d2e4a021aa89f3a7423e7e3fa31b3940c2f..7113887ed7f173f986e62b9de20c63cdb83acb73 100644 (file)
--- a/libmisc/find_new_sub_uids.c
+++ b/libmisc/find_new_sub_uids.c
@@ -46,8 +46,7 @@
  * 
  * Return 0 on success, -1 if no unused UIDs are available.
  */
-int find_new_sub_uids (const char *owner,
-                      uid_t *range_start, unsigned long *range_count)
+int find_new_sub_uids (uid_t *range_start, unsigned long *range_count)
 {
        unsigned long min, max;
        unsigned long count;

diff --git a/src/newusers.c b/src/newusers.c
index e9fe0e27cbe8f89e38988e0ad949b30c6a4bf144..3104d6fd3805f24b3551b0e425e83240592424a4 100644 (file)
--- a/src/newusers.c
+++ b/src/newusers.c
@@ -1251,7 +1251,7 @@ int main (int argc, char **argv)
                if (is_sub_uid && !sub_uid_assigned(fields[0])) {
                        uid_t sub_uid_start = 0;
                        unsigned long sub_uid_count = 0;
-                       if (find_new_sub_uids(fields[0], &sub_uid_start, &sub_uid_count) == 0) {
+                       if (find_new_sub_uids(&sub_uid_start, &sub_uid_count) == 0) {
                                if (sub_uid_add(fields[0], sub_uid_start, sub_uid_count) == 0) {
                                        fprintf (stderr,
                                                _("%s: failed to prepare new %s entry\n"),
@@ -1271,7 +1271,7 @@ int main (int argc, char **argv)
                if (is_sub_gid && !sub_gid_assigned(fields[0])) {
                        gid_t sub_gid_start = 0;
                        unsigned long sub_gid_count = 0;
-                       if (find_new_sub_gids(fields[0], &sub_gid_start, &sub_gid_count) == 0) {
+                       if (find_new_sub_gids(&sub_gid_start, &sub_gid_count) == 0) {
                                if (sub_gid_add(fields[0], sub_gid_start, sub_gid_count) == 0) {
                                        fprintf (stderr,
                                                _("%s: failed to prepare new %s entry\n"),

diff --git a/src/useradd.c b/src/useradd.c
index 645d4a40f204a9142396bfaafb875a367a9e1e88..8d8b4cf573d44788284dc32b1184fb1a1bfde3ef 100644 (file)
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -2465,7 +2465,7 @@ int main (int argc, char **argv)
 
 #ifdef ENABLE_SUBIDS
        if (is_sub_uid) {
-               if (find_new_sub_uids(user_name, &sub_uid_start, &sub_uid_count) < 0) {
+               if (find_new_sub_uids(&sub_uid_start, &sub_uid_count) < 0) {
                        fprintf (stderr,
                                 _("%s: can't create subordinate user IDs\n"),
                                 Prog);
@@ -2473,7 +2473,7 @@ int main (int argc, char **argv)
                }
        }
        if (is_sub_gid) {
-               if (find_new_sub_gids(user_name, &sub_gid_start, &sub_gid_count) < 0) {
+               if (find_new_sub_gids(&sub_gid_start, &sub_gid_count) < 0) {
                        fprintf (stderr,
                                 _("%s: can't create subordinate group IDs\n"),
                                 Prog);