summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-05-16 01:43:56 -0400
committerUlrich Drepper <drepper@gmail.com>2011-05-16 01:43:56 -0400
commitf3799213a3ee8265ba47fad33d9cff71d97ab0d4 (patch)
tree695f4326a64115c12a877699984be3cea6a64a19
parentd79a9c949c84e7f0ba33e87447c47af833e9f11a (diff)
downloadglibc-f3799213a3ee8265ba47fad33d9cff71d97ab0d4.tar.gz
glibc-f3799213a3ee8265ba47fad33d9cff71d97ab0d4.tar.xz
glibc-f3799213a3ee8265ba47fad33d9cff71d97ab0d4.zip
Remove shortcut for call of chown
The UID might differ, too.  Just call chown unconditionally.
-rw-r--r--ChangeLog3
-rw-r--r--NEWS13
-rw-r--r--login/programs/pt_chown.c4
3 files changed, 12 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index f7f26187d7..a80468a9e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-05-16  Ulrich Drepper  <drepper@gmail.com>
 
+	[BZ #11697]
+	* login/programs/pt_chown.c (do_pt_chown): Always call chown.
+
 	[BZ #11820]
 	* sysdeps/unix/sysv/linux/x86_64/sys/user.h
 	(struct user_fpregs_struct): Avoid __uint*_t types.
diff --git a/NEWS b/NEWS
index ad92348552..3fe6c9d5d3 100644
--- a/NEWS
+++ b/NEWS
@@ -10,12 +10,13 @@ Version 2.14
 * The following bugs are resolved with this release:
 
   386, 6420, 7101, 9730, 9732, 9809, 10138, 10149, 10157, 11257, 11258,
-  11487, 11532, 11578, 11653, 11668, 11724, 11820, 11901, 11945, 11947,
-  11952, 11987, 12052, 12083, 12158, 12178, 12200, 12346, 12393, 12420,
-  12432, 12445, 12449, 12453, 12454, 12460, 12469, 12489, 12509, 12510,
-  12511, 12518, 12527, 12541, 12545, 12551, 12582, 12583, 12587, 12597,
-  12601, 12611, 12625, 12626, 12631, 12650, 12653, 12655, 12660, 12681,
-  12685, 12711, 12713, 12714, 12717, 12723, 12724, 12734, 12738, 12746
+  11487, 11532, 11578, 11653, 11668, 11697, 11724, 11820, 11901, 11945,
+  11947, 11952, 11987, 12052, 12083, 12158, 12178, 12200, 12346, 12393,
+  12420, 12432, 12445, 12449, 12453, 12454, 12460, 12469, 12489, 12509,
+  12510, 12511, 12518, 12527, 12541, 12545, 12551, 12582, 12583, 12587,
+  12597, 12601, 12611, 12625, 12626, 12631, 12650, 12653, 12655, 12660,
+  12681, 12685, 12711, 12713, 12714, 12717, 12723, 12724, 12734, 12738,
+  12746
 
 * The RPC implementation in libc is obsoleted.  Old programs keep working
   but new programs cannot be linked with the routines in libc anymore.
diff --git a/login/programs/pt_chown.c b/login/programs/pt_chown.c
index 4c36f2ceac..9aa34e7cef 100644
--- a/login/programs/pt_chown.c
+++ b/login/programs/pt_chown.c
@@ -64,7 +64,7 @@ print_version (FILE *stream, struct argp_state *state)
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "1999");
+"), "2011");
 }
 
 static char *
@@ -123,7 +123,7 @@ do_pt_chown (void)
 
   /* Set the owner to the real user ID, and the group to that special
      group ID.  */
-  if (st.st_gid != gid && chown (pty, getuid (), gid) < 0)
+  if (chown (pty, getuid (), gid) < 0)
     return FAIL_EACCES;
 
   /* Set the permission mode to readable and writable by the owner,