summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2014-05-19 18:21:57 +0100
committerPádraig Brady <P@draigBrady.com>2014-05-21 11:18:27 +0100
commit7a63d6395ac117b753a18468a9b3f5ed95d176d4 (patch)
treec01b1115f71bd4a4b98b1dc6f9383d4228507e5f /src
parent0c4729516baa2fbefb0af66c38f434b1f7519078 (diff)
downloadcoreutils-7a63d6395ac117b753a18468a9b3f5ed95d176d4.tar.xz
tests: use chroot --user rather than internal setuidgid tool
* init.cfg (require_root_): Adjust to use chroot, and make `require_built_ chroot` implicit when chroot used in the test. * po/POTFILES.in: Remove reference to setuidgid tool. * src/.gitignore: Likewise. * src/local.mk: Likewise. * src/setuidgid.c: Remove. * tests/cp/preserve-gid.sh: s/setuidgid/chroot --user/. * tests/cp/special-bits.sh: Likewise. * tests/id/setgid.sh: Likewise. * tests/misc/truncate-owned-by-other.sh * tests/mv/sticky-to-xpart.sh: Likewise. * tests/rm/fail-2eperm.sh: Likewise. * tests/rm/no-give-up.sh: Likewise. * tests/touch/now-owned-by-other.sh: Likewise. * tests/misc/chroot-fail.sh: Skip if chroot not built.
Diffstat (limited to 'src')
-rw-r--r--src/.gitignore1
-rw-r--r--src/local.mk4
-rw-r--r--src/setuidgid.c215
3 files changed, 1 insertions, 219 deletions
diff --git a/src/.gitignore b/src/.gitignore
index 25573dfa2..e273bb867 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -75,7 +75,6 @@ rm
rmdir
runcon
seq
-setuidgid
sha1sum
sha224sum
sha256sum
diff --git a/src/local.mk b/src/local.mk
index 40798d6e8..1d7abf600 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -37,8 +37,7 @@ pkglibexec_PROGRAMS = @pkglibexec_PROGRAMS@
# Needed by the testsuite.
noinst_PROGRAMS = \
src/getlimits \
- src/make-prime-list \
- src/setuidgid
+ src/make-prime-list
noinst_HEADERS = \
src/chown-core.h \
@@ -166,7 +165,6 @@ src_rm_LDADD = $(LDADD)
src_rmdir_LDADD = $(LDADD)
src_runcon_LDADD = $(LDADD)
src_seq_LDADD = $(LDADD)
-src_setuidgid_LDADD = $(LDADD)
src_sha1sum_LDADD = $(LDADD)
src_sha224sum_LDADD = $(LDADD)
src_sha256sum_LDADD = $(LDADD)
diff --git a/src/setuidgid.c b/src/setuidgid.c
deleted file mode 100644
index 9aadb7fac..000000000
--- a/src/setuidgid.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/* setuidgid - run a command with the UID and GID of a specified user
- Copyright (C) 2003-2014 Free Software Foundation, Inc.
-
- 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 3 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, see <http://www.gnu.org/licenses/>. */
-
-/* Written by Jim Meyering */
-
-#include <config.h>
-#include <getopt.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <pwd.h>
-#include <grp.h>
-
-#include "system.h"
-
-#include "error.h"
-#include "long-options.h"
-#include "mgetgroups.h"
-#include "quote.h"
-#include "xstrtol.h"
-
-#define PROGRAM_NAME "setuidgid"
-
-/* I wrote this program from scratch, based on the description of
- D.J. Bernstein's program: http://cr.yp.to/daemontools/setuidgid.html. */
-#define AUTHORS proper_name ("Jim Meyering")
-
-#define SETUIDGID_FAILURE 111
-
-void
-usage (int status)
-{
- if (status != EXIT_SUCCESS)
- emit_try_help ();
- else
- {
- printf (_("\
-Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n\
- or: %s LONG-OPTION\n\
-"),
- program_name, program_name);
-
- fputs (_("\
-Drop any supplemental groups, assume the user-ID and group-ID of the specified\
-\n\
-USER (numeric ID or user name), and run COMMAND with any specified ARGUMENTs.\n\
-Exit with status 111 if unable to assume the required user and group ID.\n\
-Otherwise, exit with the exit status of COMMAND.\n\
-This program is useful only when run by root (user ID zero).\n\
-\n\
-"), stdout);
- fputs (_("\
- -g GID[,GID1...] also set the primary group-ID to the numeric GID, and\n\
- (if specified) supplemental group IDs to GID1, ...\n\
-"), stdout);
- fputs (HELP_OPTION_DESCRIPTION, stdout);
- fputs (VERSION_OPTION_DESCRIPTION, stdout);
- emit_ancillary_info ();
- }
- exit (status);
-}
-
-int
-main (int argc, char **argv)
-{
- uid_t uid;
- GETGROUPS_T *gids = NULL;
- size_t n_gids = 0;
- size_t n_gids_allocated = 0;
- gid_t primary_gid;
-
- initialize_main (&argc, &argv);
- set_program_name (argv[0]);
- setlocale (LC_ALL, "");
- bindtextdomain (PACKAGE, LOCALEDIR);
- textdomain (PACKAGE);
-
- initialize_exit_failure (SETUIDGID_FAILURE);
- atexit (close_stdout);
-
- parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version,
- usage, AUTHORS, (char const *) NULL);
- {
- int c;
- while ((c = getopt_long (argc, argv, "+g:", NULL, NULL)) != -1)
- {
- switch (c)
- {
- case 'g':
- {
- unsigned long int tmp_ul;
- char *gr = optarg;
- char *ptr;
- while (true)
- {
- if (! (xstrtoul (gr, &ptr, 10, &tmp_ul, NULL) == LONGINT_OK
- && tmp_ul <= GID_T_MAX))
- error (SETUIDGID_FAILURE, 0, _("invalid group %s"),
- quote (gr));
- if (n_gids == n_gids_allocated)
- gids = X2NREALLOC (gids, &n_gids_allocated);
- gids[n_gids++] = tmp_ul;
-
- if (*ptr == '\0')
- break;
- if (*ptr != ',')
- {
- error (0, 0, _("invalid group %s"), quote (gr));
- usage (SETUIDGID_FAILURE);
- }
- gr = ptr + 1;
- }
- break;
- }
-
- default:
- usage (SETUIDGID_FAILURE);
- }
- }
- }
-
- if (argc <= optind + 1)
- {
- if (argc < optind + 1)
- error (0, 0, _("missing operand"));
- else
- error (0, 0, _("missing operand after %s"), quote (argv[optind]));
- usage (SETUIDGID_FAILURE);
- }
-
- {
- const struct passwd *pwd;
- unsigned long int tmp_ul;
- char *user = argv[optind];
- char *ptr;
- bool have_uid = false;
-
- if (xstrtoul (user, &ptr, 10, &tmp_ul, "") == LONGINT_OK
- && tmp_ul <= UID_T_MAX)
- {
- uid = tmp_ul;
- have_uid = true;
- }
-
- if (!have_uid)
- {
- pwd = getpwnam (user);
- if (pwd == NULL)
- {
- error (0, errno, _("unknown user-ID: %s"), quote (user));
- usage (SETUIDGID_FAILURE);
- }
- uid = pwd->pw_uid;
- }
- else if (n_gids == 0)
- {
- pwd = getpwuid (uid);
- if (pwd == NULL)
- {
- error (0, errno,
- _("to use user-ID %s you need to use -g too"), quote (user));
- usage (SETUIDGID_FAILURE);
- }
- }
-
-#if HAVE_SETGROUPS
- if (n_gids == 0)
- {
- int n = xgetgroups (pwd->pw_name, pwd->pw_gid, &gids);
- if (n <= 0)
- error (SETUIDGID_FAILURE, errno,
- _("failed to get groups for user %s"), quote (pwd->pw_name));
- n_gids = n;
- }
-
- if (setgroups (n_gids, gids))
- error (SETUIDGID_FAILURE, errno,
- _("failed to set supplemental group(s)"));
-
- primary_gid = gids[0];
-#else
- primary_gid = pwd->pw_gid;
-#endif
- }
-
- if (setgid (primary_gid))
- error (SETUIDGID_FAILURE, errno,
- _("cannot set group-ID to %lu"), (unsigned long int) primary_gid);
-
- if (setuid (uid))
- error (SETUIDGID_FAILURE, errno,
- _("cannot set user-ID to %lu"), (unsigned long int) uid);
-
- {
- char **cmd = argv + optind + 1;
- int exit_status;
- execvp (*cmd, cmd);
- exit_status = (errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE);
-
- error (0, errno, _("failed to run command %s"), quote (*cmd));
- exit (exit_status);
- }
-}