From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Wed, 26 Dec 2007 09:28:02 +0000 (+0000)
Subject: NO_GETPWENT is no more supported. Remove associated chunks of code.
X-Git-Tag: 4.1.1~289
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20dfe6ba9840c9d5b263555a2041c5268769a2b7;p=thirdparty%2Fshadow.git

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

diff --git a/ChangeLog b/ChangeLog
index 1fea32509..7d6196daf 100644
--- 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 341681c0e..4dae0d04f 100644
--- 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 4009daa45..d2088bee3 100644
--- 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,