aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-03-30 18:46:29 +0000
committerUlrich Drepper <drepper@redhat.com>1999-03-30 18:46:29 +0000
commit71e5d196356bf899149ebb310c15bc0350d7c449 (patch)
tree6b0edf55ba57e5849c8d0694207f3da25dcb6b02
parentd3345073260908c1140377190c2950b8b3f81a42 (diff)
downloadglibc-71e5d196356bf899149ebb310c15bc0350d7c449.zip
glibc-71e5d196356bf899149ebb310c15bc0350d7c449.tar.gz
glibc-71e5d196356bf899149ebb310c15bc0350d7c449.tar.bz2
Update.
1999-03-30 20:59 -0500 Zack Weinberg <zack@rabi.phys.columbia.edu> * login/programs/pt_chown.c: Drop privileges if invoked with arguments. Don't close the master pty.
-rw-r--r--ChangeLog5
-rw-r--r--login/programs/pt_chown.c70
2 files changed, 48 insertions, 27 deletions
diff --git a/ChangeLog b/ChangeLog
index c17a9dd..df4d16d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-03-30 20:59 -0500 Zack Weinberg <zack@rabi.phys.columbia.edu>
+
+ * login/programs/pt_chown.c: Drop privileges if invoked with
+ arguments. Don't close the master pty.
+
1999-03-30 Ulrich Drepper <drepper@cygnus.com>
* time/tzfile.c (__tzfile_read): Process transitions from the rear.
diff --git a/login/programs/pt_chown.c b/login/programs/pt_chown.c
index ee17606..4b78e34 100644
--- a/login/programs/pt_chown.c
+++ b/login/programs/pt_chown.c
@@ -55,7 +55,7 @@ static struct argp argp =
static void
print_version (FILE *stream, struct argp_state *state)
{
- fprintf (stream, "pt_chmod (GNU %s) %s\n", PACKAGE, VERSION);
+ fprintf (stream, "pt_chown (GNU %s) %s\n", PACKAGE, VERSION);
fprintf (stream, gettext ("\
Copyright (C) %s Free Software Foundation, Inc.\n\
This is free software; see the source for copying conditions. There is NO\n\
@@ -95,41 +95,17 @@ Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n"));
}
int
-main (int argc, char *argv[])
+do_pt_chown (void)
{
char *pty;
- int remaining;
struct stat st;
struct group *p;
gid_t gid;
- /* Set locale via LC_ALL. */
- setlocale (LC_ALL, "");
-
- /* Set the text message domain. */
- textdomain (PACKAGE);
-
- /* parse and process arguments. */
- argp_parse (&argp, argc, argv, 0, &remaining, NULL);
-
- if (remaining < argc)
- {
- /* We should not be called with any non-option parameters. */
- error (0, 0, gettext ("too many arguments"));
- argp_help (&argp, stdout, ARGP_HELP_SEE | ARGP_HELP_EXIT_ERR,
- program_invocation_short_name);
- exit (EXIT_FAILURE);
- }
-
- /* Check if we are properly installed. */
- if (geteuid () != 0)
- error (FAIL_EXEC, 0, gettext ("needs to be installed setuid `root'"));
-
/* Check that PTY_FILENO is a valid master pseudo terminal. */
pty = ptsname (PTY_FILENO);
if (pty == NULL)
return errno == EBADF ? FAIL_EBADF : FAIL_EINVAL;
- close (PTY_FILENO);
/* Check that the returned slave pseudo terminal is a
character device. */
@@ -150,5 +126,45 @@ main (int argc, char *argv[])
if (chmod (pty, S_IRUSR|S_IWUSR|S_IWGRP) < 0)
return FAIL_EACCES;
- exit (EXIT_SUCCESS);
+ return 0;
+}
+
+
+int
+main (int argc, char *argv[])
+{
+ int remaining;
+
+ /* Normal invocation of this program is with no arguments and
+ with privileges.
+ FIXME: Should use capable (CAP_CHOWN|CAP_FOWNER). */
+ if (argc == 1 && geteuid () == 0)
+ return do_pt_chown ();
+
+ /* We aren't going to be using privileges, so drop them right now. */
+ setuid (getuid ());
+
+ /* Set locale via LC_ALL. */
+ setlocale (LC_ALL, "");
+
+ /* Set the text message domain. */
+ textdomain (PACKAGE);
+
+ /* parse and process arguments. */
+ argp_parse (&argp, argc, argv, 0, &remaining, NULL);
+
+ if (remaining < argc)
+ {
+ /* We should not be called with any non-option parameters. */
+ error (0, 0, gettext ("too many arguments"));
+ argp_help (&argp, stdout, ARGP_HELP_SEE | ARGP_HELP_EXIT_ERR,
+ program_invocation_short_name);
+ return EXIT_FAILURE;
+ }
+
+ /* Check if we are properly installed. */
+ if (geteuid () != 0)
+ error (FAIL_EXEC, 0, gettext ("needs to be installed setuid `root'"));
+
+ return EXIT_SUCCESS;
}