Update.

1999-03-31  Mark Kettenis  <kettenis@gnu.org>

	* login/programs/pt_chown.c (main): Save effective user ID before
	dropping priviliges and use this to check if the program is
	properly installed.

diff --git a/ChangeLog b/ChangeLog
index 1dd54e8..ee77487 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-03-31  Mark Kettenis  <kettenis@gnu.org>
+
+       * login/programs/pt_chown.c (main): Save effective user ID before
+       dropping priviliges and use this to check if the program is
+       properly installed.
+
 1999-03-31  Ulrich Drepper  <drepper@cygnus.com>
 
        * iconvdata/testdata/CP1254: Update for charmap changes.

diff --git a/login/programs/pt_chown.c b/login/programs/pt_chown.c
index 4b78e34..faec86b 100644 (file)
--- a/login/programs/pt_chown.c
+++ b/login/programs/pt_chown.c
@@ -133,17 +133,18 @@ do_pt_chown (void)
 int
 main (int argc, char *argv[])
 {
+  uid_t euid = geteuid ();
   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)
+  if (argc == 1 && euid == 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, "");
 
@@ -163,7 +164,7 @@ main (int argc, char *argv[])
     }
 
   /* Check if we are properly installed.  */
-  if (geteuid () != 0)
+  if (euid != 0)
     error (FAIL_EXEC, 0, gettext ("needs to be installed setuid `root'"));
 
   return EXIT_SUCCESS;