[Pkg-shadow-commits] r1489 - in upstream/trunk: . src
nekral-guest at alioth.debian.org
nekral-guest at alioth.debian.org
Wed Dec 26 09:28:02 UTC 2007
Author: nekral-guest
Date: 2007-12-26 09:28:02 +0000 (Wed, 26 Dec 2007)
New Revision: 1489
Modified:
upstream/trunk/ChangeLog
upstream/trunk/src/groupadd.c
upstream/trunk/src/useradd.c
Log:
NO_GETPWENT is no more supported. Remove associated chunks of code.
Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog 2007-12-26 09:22:49 UTC (rev 1488)
+++ upstream/trunk/ChangeLog 2007-12-26 09:28:02 UTC (rev 1489)
@@ -1,5 +1,10 @@
2007-12-26 Nicolas François <nicolas.francois at 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 at centraliens.net>
+
* man/groupadd.8.xml: Document the long options (--force, --gid, --key,
--non-unique).
Modified: upstream/trunk/src/groupadd.c
===================================================================
--- upstream/trunk/src/groupadd.c 2007-12-26 09:22:49 UTC (rev 1488)
+++ upstream/trunk/src/groupadd.c 2007-12-26 09:28:02 UTC (rev 1489)
@@ -214,13 +214,8 @@
* 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 @@
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 @@
}
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);
Modified: upstream/trunk/src/useradd.c
===================================================================
--- upstream/trunk/src/useradd.c 2007-12-26 09:22:49 UTC (rev 1488)
+++ upstream/trunk/src/useradd.c 2007-12-26 09:28:02 UTC (rev 1489)
@@ -836,13 +836,8 @@
* 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 @@
*/
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 @@
* 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 @@
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,
More information about the Pkg-shadow-commits
mailing list