aboutsummaryrefslogtreecommitdiff
path: root/loginutils
diff options
context:
space:
mode:
authorGravatar Rob Landley <rob@landley.net>2006-04-10 18:03:17 +0000
committerGravatar Rob Landley <rob@landley.net>2006-04-10 18:03:17 +0000
commit81c40b39cbae084777c93fe5303c4ba9af8137c6 (patch)
treeaa263624d56f211217fa9d62d6237b5f79f717fb /loginutils
parentca7166fe9d723aeabf886520749dcfeb2221d8cc (diff)
downloadbusybox-81c40b39cbae084777c93fe5303c4ba9af8137c6.tar.gz
busybox-81c40b39cbae084777c93fe5303c4ba9af8137c6.tar.bz2
Patch from Tito to unify deluser and delgroup, and generally shrink code.
Diffstat (limited to 'loginutils')
-rw-r--r--loginutils/Makefile.in4
-rw-r--r--loginutils/delgroup.c62
-rw-r--r--loginutils/delline.c113
-rw-r--r--loginutils/deluser.c106
4 files changed, 72 insertions, 213 deletions
diff --git a/loginutils/Makefile.in b/loginutils/Makefile.in
index c11bbfc03..0063762ab 100644
--- a/loginutils/Makefile.in
+++ b/loginutils/Makefile.in
@@ -20,7 +20,9 @@ LOGINUTILS-$(CONFIG_SU) += su.o
LOGINUTILS-$(CONFIG_SULOGIN) += sulogin.o
LOGINUTILS-$(CONFIG_VLOCK) += vlock.o
LOGINUTILS-$(CONFIG_DELUSER) += deluser.o
-LOGINUTILS-$(CONFIG_DELGROUP) += delgroup.o
+LOGINUTILS-$(CONFIG_DELGROUP) += deluser.o
+
+LOGINUTILS-y:=$(sort $(LOGINUTILS-y))
ifneq ($(strip $(LOGINUTILS-y)),)
libraries-y+=$(LOGINUTILS_DIR)$(LOGINUTILS_AR)
diff --git a/loginutils/delgroup.c b/loginutils/delgroup.c
deleted file mode 100644
index 91edf2989..000000000
--- a/loginutils/delgroup.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * deluser (remove lusers from the system ;) for TinyLogin
- *
- * Copyright (C) 1999 by Lineo, inc. and John Beppu
- * Copyright (C) 1999,2000,2001 by John Beppu <beppu@codepoet.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#include <sys/stat.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "busybox.h"
-
-
-#if ! defined CONFIG_DELUSER
-#include "delline.c"
-#else
-extern int del_line_matching(const char *login, const char *filename);
-#endif
-
-int delgroup_main(int argc, char **argv)
-{
- /* int successful; */
- int failure;
-
- if (argc != 2) {
- bb_show_usage();
- } else {
-
- failure = del_line_matching(argv[1], bb_path_group_file);
-#ifdef CONFIG_FEATURE_SHADOWPASSWDS
- if (access(bb_path_gshadow_file, W_OK) == 0) {
- /* EDR the |= works if the error is not 0, so he had it wrong */
- failure |= del_line_matching(argv[1], bb_path_gshadow_file);
- }
-#endif
- if (failure) {
- bb_error_msg_and_die("%s: Group could not be removed\n", argv[1]);
- }
-
- }
- return (EXIT_SUCCESS);
-}
-
-/* $Id: delgroup.c,v 1.2 2003/07/14 21:50:51 andersen Exp $ */
diff --git a/loginutils/delline.c b/loginutils/delline.c
deleted file mode 100644
index 8d534c861..000000000
--- a/loginutils/delline.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * deluser (remove lusers from the system ;) for TinyLogin
- *
- * Copyright (C) 1999 by Lineo, inc. and John Beppu
- * Copyright (C) 1999,2000,2001 by John Beppu <beppu@codepoet.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#include <sys/stat.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "busybox.h"
-
-
-
-/* where to start and stop deletion */
-typedef struct {
- size_t start;
- size_t stop;
-} Bounds;
-
-/* An interesting side-effect of boundary()'s
- * implementation is that the first user (typically root)
- * cannot be removed. Let's call it a feature. */
-static inline Bounds boundary(const char *buffer, const char *login)
-{
- char needle[256];
- char *start;
- char *stop;
- Bounds b;
-
- snprintf(needle, 256, "\n%s:", login);
- needle[255] = 0;
- start = strstr(buffer, needle);
- if (!start) {
- b.start = 0;
- b.stop = 0;
- return b;
- }
- start++;
-
- stop = index(start, '\n'); /* index is a BSD-ism */
- b.start = start - buffer;
- b.stop = stop - buffer;
- return b;
-}
-
-/* grep -v ^login (except it only deletes the first match) */
-/* ...in fact, I think I'm going to simplify this later */
-int del_line_matching(const char *login, const char *filename)
-{
- char *buffer;
- FILE *passwd;
- size_t len;
- Bounds b;
- struct stat statbuf;
-
- /* load into buffer */
- passwd = fopen(filename, "r");
- if (!passwd) {
- return 1;
- }
- stat(filename, &statbuf);
- len = statbuf.st_size;
- buffer = (char *) malloc(len * sizeof(char));
-
- if (!buffer) {
- fclose(passwd);
- return 1;
- }
- fread(buffer, len, sizeof(char), passwd);
-
- fclose(passwd);
-
- /* find the user to remove */
- b = boundary(buffer, login);
- if (b.stop == 0) {
- free(buffer);
- return 1;
- }
-
- /* write the file w/o the user */
- passwd = fopen(filename, "w");
- if (!passwd) {
- return 1;
- }
- fwrite(buffer, (b.start - 1), sizeof(char), passwd);
- fwrite(&buffer[b.stop], (len - b.stop), sizeof(char), passwd);
-
- fclose(passwd);
-
- return 0;
-}
-
-
-/* $Id: delline.c,v 1.2 2003/07/14 21:50:51 andersen Exp $ */
diff --git a/loginutils/deluser.c b/loginutils/deluser.c
index 1cd2b01e3..b647537d9 100644
--- a/loginutils/deluser.c
+++ b/loginutils/deluser.c
@@ -4,20 +4,9 @@
*
* Copyright (C) 1999 by Lineo, inc. and John Beppu
* Copyright (C) 1999,2000,2001 by John Beppu <beppu@codepoet.org>
+ * Unified with delgroup by Tito Ragusa <farmatito@tiscali.it>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*
*/
@@ -28,39 +17,82 @@
#include <string.h>
#include "busybox.h"
+/* where to start and stop deletion */
+typedef struct {
+ size_t start;
+ size_t stop;
+} Bounds;
-#include "delline.c"
+/* An interesting side-effect of boundary()'s
+ * implementation is that the first user (typically root)
+ * cannot be removed. Let's call it a feature. */
+static inline Bounds boundary(const char *buffer, const char *login)
+{
+ char needle[256];
+ char *start;
+ char *stop;
+ Bounds b;
-static const char deluser_format[]="%s: User could not be removed from %s";
+ snprintf(needle, 256, "\n%s:", login);
+ needle[255] = 0;
+ start = strstr(buffer, needle);
+ if (!start) {
+ b.start = 0;
+ b.stop = 0;
+ return b;
+ }
+ start++;
-int deluser_main(int argc, char **argv)
+ stop = index(start, '\n'); /* index is a BSD-ism */
+ b.start = start - buffer;
+ b.stop = stop - buffer;
+ return b;
+}
+
+/* grep -v ^login (except it only deletes the first match) */
+/* ...in fact, I think I'm going to simplify this later */
+static void del_line_matching(const char *login, const char *filename)
{
- /* int successful; */
- int failure;
+ char *buffer;
+ FILE *passwd;
+ Bounds b;
+ struct stat statbuf;
+
+ if ((passwd = bb_wfopen(filename, "r"))) {
+ xstat(filename, &statbuf);
+ buffer = (char *) xmalloc(statbuf.st_size * sizeof(char));
+ fread(buffer, statbuf.st_size, sizeof(char), passwd);
+ fclose(passwd);
+ /* find the user to remove */
+ b = boundary(buffer, login);
+ if (b.stop != 0) {
+ /* write the file w/o the user */
+ if ((passwd = bb_wfopen(filename, "w"))) {
+ fwrite(buffer, (b.start - 1), sizeof(char), passwd);
+ fwrite(&buffer[b.stop], (statbuf.st_size - b.stop), sizeof(char), passwd);
+ fclose(passwd);
+ }
+ } else {
+ bb_error_msg("Can't find '%s' in '%s'", login, filename);
+ }
+ free(buffer);
+ }
+}
+
+int deluser_main(int argc, char **argv)
+{
if (argc != 2) {
bb_show_usage();
} else {
-
- failure = del_line_matching(argv[1], bb_path_passwd_file);
- if (failure) {
- bb_error_msg_and_die(deluser_format, argv[1], bb_path_passwd_file);
+ if (ENABLE_DELUSER && bb_applet_name[3] == 'u') {
+ del_line_matching(argv[1], bb_path_passwd_file);
+ if (ENABLE_FEATURE_SHADOWPASSWDS)
+ del_line_matching(argv[1], bb_path_shadow_file);
}
-#ifdef CONFIG_FEATURE_SHADOWPASSWDS
- failure = del_line_matching(argv[1], bb_path_shadow_file);
- if (failure) {
- bb_error_msg_and_die(deluser_format, argv[1], bb_path_shadow_file);
- }
- failure = del_line_matching(argv[1], bb_path_gshadow_file);
- if (failure) {
- bb_error_msg_and_die(deluser_format, argv[1], bb_path_gshadow_file);
- }
-#endif
- failure = del_line_matching(argv[1], bb_path_group_file);
- if (failure) {
- bb_error_msg_and_die(deluser_format, argv[1], bb_path_group_file);
- }
-
+ del_line_matching(argv[1], bb_path_group_file);
+ if (ENABLE_FEATURE_SHADOWPASSWDS)
+ del_line_matching(argv[1], bb_path_gshadow_file);
}
return (EXIT_SUCCESS);
}