[prev in list] [next in list] [prev in thread] [next in thread] 

List:       busybox
Subject:    [BusyBox] aduser/deluser problem
From:       Axel Barnitzke <barney () xkontor ! com>
Date:       2002-02-21 8:10:03
[Download RAW message or body]

Hi Eric,

I sent this patch already a week ago but I didn't hear/read any response.

In the latest CVS version busybox adduser adds the group 'addgroup'
to /etc/group /etc/gshadow

Can you please give your comment on this ?

    -- Barney

--------------------------------------
++ axel (barney) barnitzke
++ it consultant
++ xkontor IT solutions


email :: mailto:barney@xkontor.com


["add-del-user.patch" (text/plain)]

--- pwd_grp/adduser.c.orig	Sat Feb  9 23:21:18 2002
+++ pwd_grp/adduser.c	Sat Feb  9 23:58:52 2002
@@ -119,16 +119,16 @@
 
 static void addgroup_wrapper(const char *login, gid_t gid)
 {
-	int argc = 4;
-	char *argv[] = { "addgroup", "-g", NULL, NULL };
+	int argc = 3;
+	char *argv[] = { NULL, "-g", NULL };
 	const char *argv0_save;
 	char group_id[8];
 	char group_name[32];
 
 	argv0_save = applet_name;
-	applet_name = argv[0];
+	applet_name = "addgroup";
 	safe_strncpy(group_name, login, 32);
-	argv[3] = group_name;
+	argv[0] = group_name;
 	sprintf(group_id, "%d", gid);
 	argv[2] = group_id;
 	addgroup_main(argc, argv);
--- pwd_grp/deluser.c.orig	Fri Jan 18 10:52:52 2002
+++ pwd_grp/deluser.c	Sun Feb 10 00:08:53 2002
@@ -169,6 +169,14 @@
 			error_msg_and_die("%s: User could not be removed from %s\n",
 							  argv[1], GROUP_FILE);
 		}
+#ifdef CONFIG_FEATURE_SHADOWPASSWDS
+		failure = del_line_matching(argv[1], GSHADOW_FILE);
+		/* if (!successful) { */
+		if (failure) {
+			error_msg_and_die("%s: User could not be removed from %s\n",
+							  argv[1], GSHADOW_FILE);
+		}
+#endif							/* CONFIG_FEATURE_SHADOWPASSWDS */
 
 	}
 	return (EXIT_SUCCESS);


[prev in list] [next in list] [prev in thread] [next in thread]