[Pkg-shadow-commits] r2214 - in upstream/trunk: . src
nekral-guest at alioth.debian.org
nekral-guest at alioth.debian.org
Sun Jul 27 00:21:43 UTC 2008
Author: nekral-guest
Date: 2008-07-27 00:21:42 +0000 (Sun, 27 Jul 2008)
New Revision: 2214
Modified:
upstream/trunk/ChangeLog
upstream/trunk/src/groupmems.c
Log:
* src/groupmems.c: Reuse the functions from libmisc/list.c to deal
with user lists. addtogroup() was broken when realloc() move the
memory area.
* src/groupmems.c: Report failures with the name of the program.
Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog 2008-07-27 00:11:25 UTC (rev 2213)
+++ upstream/trunk/ChangeLog 2008-07-27 00:21:42 UTC (rev 2214)
@@ -1,5 +1,12 @@
2008-07-27 Nicolas François <nicolas.francois at centraliens.net>
+ * src/groupmems.c: Reuse the functions from libmisc/list.c to deal
+ with user lists. addtogroup() was broken when realloc() move the
+ memory area.
+ * src/groupmems.c: Report failures with the name of the program.
+
+2008-07-27 Nicolas François <nicolas.francois at centraliens.net>
+
* src/groupmems.c: EXIT_READ_GROUP changed to EXIT_INVALID_GROUP.
* src/groupmems.c: EXIT_INVALID_USERNAME changed to EXIT_INVALID_USER.
Modified: upstream/trunk/src/groupmems.c
===================================================================
--- upstream/trunk/src/groupmems.c 2008-07-27 00:11:25 UTC (rev 2213)
+++ upstream/trunk/src/groupmems.c 2008-07-27 00:21:42 UTC (rev 2214)
@@ -42,6 +42,7 @@
#endif /* USE_PAM */
#include <pwd.h>
#include "defines.h"
+#include "prototypes.h"
#include "groupio.h"
/* Exit Status Values */
@@ -92,56 +93,6 @@
}
}
-static void addtogroup (char *user, char **members)
-{
- int i;
-
- for (i = 0; NULL != members[i]; i++) {
- if (0 == strcmp (user, members[i])) {
- fputs (_("Member already exists\n"), stderr);
- exit (EXIT_MEMBER_EXISTS);
- }
- }
-
- members = (char **) realloc (members, sizeof (char *) * (i+2));
- members[i] = user;
- members[i + 1] = NULL;
-}
-
-static void rmfromgroup (char *user, char **members)
-{
- int i;
- bool found = false;
-
- i = 0;
- while (!found && NULL != members[i]) {
- if (0 == strcmp (user, members[i])) {
- found = true;
- } else {
- i++;
- }
- }
-
- while (found && NULL != members[i]) {
- members[i] = members[i+1];
- i++;
- }
-
- if (!found) {
- fputs (_("Member to remove could not be found\n"), stderr);
- exit (EXIT_NOT_MEMBER);
- }
-}
-
-static void nomembers (char **members)
-{
- int i;
-
- for (i = 0; NULL != members[i]; i++) {
- members[i] = NULL;
- }
-}
-
static void members (char **members)
{
int i;
@@ -300,13 +251,25 @@
}
if (NULL != adduser) {
- addtogroup (adduser, grp->gr_mem);
+ if (is_on_list (grp->gr_mem, adduser)) {
+ fprintf (stderr,
+ _("%s: user `%s' is already a member of `%s'\n"),
+ Prog, adduser, grp->gr_name);
+ exit (EXIT_MEMBER_EXISTS);
+ }
+ grp->gr_mem = add_list (grp->gr_mem, adduser);
gr_update (grp);
} else if (NULL != deluser) {
- rmfromgroup (deluser, grp->gr_mem);
+ if (!is_on_list (grp->gr_mem, adduser)) {
+ fprintf (stderr,
+ _("%s: user `%s' is not a member of `%s'\n"),
+ Prog, deluser, grp->gr_name);
+ exit (EXIT_NOT_MEMBER);
+ }
+ grp->gr_mem = del_list (grp->gr_mem, deluser);
gr_update (grp);
} else if (purge) {
- nomembers (grp->gr_mem);
+ grp->gr_mem[0] = NULL;
gr_update (grp);
} else if (list) {
members (grp->gr_mem);
More information about the Pkg-shadow-commits
mailing list