X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=loginutils%2Fdeluser.c;h=293e324b06147340007959e9616f0a475b067ff1;hb=2d3253d1f93fbffb62c7521d41eed0102747d949;hp=481a716e75ae8d43e9e30b058399b4fd905c41c4;hpb=1fca558799350fb6caff97f55aa6d1237b08fccb;p=oweals%2Fbusybox.git diff --git a/loginutils/deluser.c b/loginutils/deluser.c index 481a716e7..293e324b0 100644 --- a/loginutils/deluser.c +++ b/loginutils/deluser.c @@ -1,183 +1,56 @@ /* vi: set sw=4 ts=4: */ /* - * deluser (remove lusers from the system ;) for TinyLogin + * deluser/delgroup implementation for busybox * * Copyright (C) 1999 by Lineo, inc. and John Beppu * Copyright (C) 1999,2000,2001 by John Beppu + * Copyright (C) 2007 by Tito Ragusa * - * 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 GPL version 2, see file LICENSE in this tarball for details. * */ +#include "libbb.h" -#include -#include -#include -#include -#include -#include "busybox.h" - -#define PASSWD_FILE "/etc/passwd" -#define GROUP_FILE "/etc/group" -#define SHADOW_FILE "/etc/shadow" -#define GSHADOW_FILE "/etc/gshadow" - - -/* 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) +static int del_line_matching(char **args, const char *filename) { - 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; + if (ENABLE_FEATURE_DEL_USER_FROM_GROUP && args[2]) { + return update_passwd(filename, args[2], NULL, args[1]); } - start++; - - stop = index(start, '\n'); /* index is a BSD-ism */ - b.start = start - buffer; - b.stop = stop - buffer; - return b; + return update_passwd(filename, args[1], NULL, NULL); } -/* grep -v ^login (except it only deletes the first match) */ -/* ...in fact, I think I'm going to simplify this later */ -static int del_line_matching(const char *login, const char *filename) +int deluser_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int deluser_main(int argc, char **argv) { - 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; + if (argc != 2 + && (!ENABLE_FEATURE_DEL_USER_FROM_GROUP + || (applet_name[3] != 'g' || argc != 3)) + ) { + bb_show_usage(); } - fwrite(buffer, (b.start - 1), sizeof(char), passwd); - fwrite(&buffer[b.stop], (len - b.stop), sizeof(char), passwd); - - fclose(passwd); - - return 0; -} - -/* ________________________________________________________________________ */ -int delgroup_main(int argc, char **argv) -{ - /* int successful; */ - int failure; - - if (argc != 2) { - show_usage(); - } else { - - failure = del_line_matching(argv[1], GROUP_FILE); -#ifdef CONFIG_FEATURE_SHADOWPASSWDS - if (access(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], GSHADOW_FILE); - } -#endif /* CONFIG_FEATURE_SHADOWPASSWDS */ - /* if (!successful) { */ - if (failure) { - error_msg_and_die("%s: Group could not be removed\n", argv[1]); - } + if (geteuid()) + bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); + + if ((ENABLE_FEATURE_DEL_USER_FROM_GROUP && argc != 3) + || ENABLE_DELUSER + || (ENABLE_DELGROUP && ENABLE_DESKTOP) + ) { + if (ENABLE_DELUSER + && (!ENABLE_DELGROUP || applet_name[3] == 'u') + ) { + if (del_line_matching(argv, bb_path_passwd_file) < 0) + return EXIT_FAILURE; + if (ENABLE_FEATURE_SHADOWPASSWDS) { + del_line_matching(argv, bb_path_shadow_file); + } + } else if (ENABLE_DESKTOP && ENABLE_DELGROUP && getpwnam(argv[1])) + bb_error_msg_and_die("can't remove primary group of user %s", argv[1]); } - return (EXIT_SUCCESS); -} - -/* ________________________________________________________________________ */ -int deluser_main(int argc, char **argv) -{ - /* int successful; */ - int failure; - - if (argc != 2) { - show_usage(); - } else { - - failure = del_line_matching(argv[1], PASSWD_FILE); - /* if (!successful) { */ - if (failure) { - error_msg_and_die("%s: User could not be removed from %s\n", - argv[1], PASSWD_FILE); - } -#ifdef CONFIG_FEATURE_SHADOWPASSWDS - failure = del_line_matching(argv[1], SHADOW_FILE); - /* if (!successful) { */ - if (failure) { - error_msg_and_die("%s: User could not be removed from %s\n", - argv[1], SHADOW_FILE); - } - 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 */ - failure = del_line_matching(argv[1], GROUP_FILE); - /* if (!successful) { */ - if (failure) { - error_msg_and_die("%s: User could not be removed from %s\n", - argv[1], GROUP_FILE); - } - + if (del_line_matching(argv, bb_path_group_file) < 0) + return EXIT_FAILURE; + if (ENABLE_FEATURE_SHADOWPASSWDS) { + del_line_matching(argv, bb_path_gshadow_file); } - return (EXIT_SUCCESS); + return EXIT_SUCCESS; } - -/* $Id: deluser.c,v 1.1 2002/06/04 20:45:05 sandman Exp $ */