NO_GETPWENT is no more supported. Remove associated chunks of code.

diff --git a/ChangeLog b/ChangeLog
index 1fea325093d77f69e18bb697519a405e9126d3d2..7d6196dafd04fc3aa46e44fbfb7d6b6b6ef3fc8c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-26  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * src/useradd.c, src/groupadd.c: NO_GETPWENT is no more supported. Remove
+       associated chunks of code.
+
 2007-12-26  Nicolas François  <nicolas.francois@centraliens.net>
 
        * man/groupadd.8.xml: Document the long options (--force, --gid, --key,

diff --git a/src/groupadd.c b/src/groupadd.c
index 341681c0efdacb469447be495ec478d85d3ec8c9..4dae0d04f4b6f25bc13f94f4ac990cb5847e0647 100644 (file)
--- a/src/groupadd.c
+++ b/src/groupadd.c
@@ -214,13 +214,8 @@ static void find_new_gid (void)
         * user specified one with -g) or looking for the largest unused
         * value.
         */
-#ifdef NO_GETGRENT
-       gr_rewind ();
-       while ((grp = gr_next ())) {
-#else
        setgrent ();
        while ((grp = getgrent ())) {
-#endif
                if (strcmp (group_name, grp->gr_name) == 0) {
                        if (fflg) {
                                fail_exit (E_SUCCESS);
@@ -233,11 +228,7 @@ static void find_new_gid (void)
                        if (fflg) {
                                /* turn off -g and search again */
                                gflg = 0;
-#ifdef NO_GETGRENT
-                               gr_rewind ();
-#else
                                setgrent ();
-#endif
                                continue;
                        }
                        fprintf (stderr, _("%s: GID %u is not unique\n"),
@@ -252,17 +243,9 @@ static void find_new_gid (void)
        }
        if (!gflg && group_id == gid_max + 1) {
                for (group_id = gid_min; group_id < gid_max; group_id++) {
-#ifdef NO_GETGRENT
-                       gr_rewind ();
-                       while ((grp = gr_next ())
-                              && grp->gr_gid != group_id);
-                       if (!grp)
-                               break;
-#else
                        /* local, no need for xgetgrgid */
                        if (!getgrgid (group_id))
                                break;
-#endif
                }
                if (group_id == gid_max) {
                        fprintf (stderr, _("%s: can't get unique GID\n"), Prog);

diff --git a/src/useradd.c b/src/useradd.c
index 4009daa45381cef81795e20694bebdd9e434c6a0..d2088bee334ac2705d548ecd8e17f9f67fd16f20 100644 (file)
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -836,13 +836,8 @@ static void find_new_uid (void)
         * UID (if the user specified one with -u) or looking for the
         * largest unused value.
         */
-#ifdef NO_GETPWENT
-       pw_rewind ();
-       while ((pwd = pw_next ())) {
-#else          /* using getpwent() we can check against NIS users etc. */
        setpwent ();
        while ((pwd = getpwent ())) {
-#endif
                if (strcmp (user_name, pwd->pw_name) == 0) {
                        fprintf (stderr, _("%s: name %s is not unique\n"),
                                 Prog, user_name);
@@ -876,17 +871,9 @@ static void find_new_uid (void)
         */
        if (!uflg && user_id == uid_max + 1) {
                for (user_id = uid_min; user_id < uid_max; user_id++) {
-#ifdef NO_GETPWENT
-                       pw_rewind ();
-                       while ((pwd = pw_next ())
-                              && pwd->pw_uid != user_id);
-                       if (!pwd)
-                               break;
-#else
                        /* local, no need for xgetpwuid */
                        if (!getpwuid (user_id))
                                break;
-#endif
                }
                if (user_id == uid_max) {
                        fprintf (stderr, _("%s: can't get unique UID\n"), Prog);
@@ -922,14 +909,8 @@ static void find_new_gid ()
         * GID (if the user specified one with -g) or looking for the
         * largest unused value.
         */
-#ifdef NO_GETGRENT
-       gr_rewind ();
-       while ((grp = gr_next ()))
-#else
        setgrent ();
-       while ((grp = getgrent ()))
-#endif
-       {
+       while ((grp = getgrent ())) {
                if (strcmp (user_name, grp->gr_name) == 0) {
                        user_gid = grp->gr_gid;
                        return;
@@ -940,26 +921,11 @@ static void find_new_gid ()
                        user_gid = grp->gr_gid + 1;
                }
        }
-#ifndef NO_GETGRENT            /* glibc does have this, so ... */
-       /* A quick test gets here: if the UID is available
-        * as a GID, go ahead and use it */
-       if (!getgrgid (user_id)) { /* local, no need for xgetgrgid */
-               user_gid = user_id;
-               return;
-       }
-#endif
        if (user_gid == gid_max + 1) {
                for (user_gid = gid_min; user_gid < gid_max; user_gid++) {
-#ifdef NO_GETGRENT
-                       gr_rewind ();
-                       while ((grp = gr_next ()) && grp->gr_gid != user_gid);
-                       if (!grp)
-                               break;
-#else
                        /* local, no need for xgetgrgid */
                        if (!getgrgid (user_gid))
                                break;
-#endif
                }
                if (user_gid == gid_max) {
                        fprintf (stderr,