This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.19-591-ga729111
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 16 Jun 2014 16:02:50 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.19-591-ga729111
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via a7291117328b413295ae7d1c841e944bc60062d3 (commit)
from 3d7c00e3a944e07a74fc1c18e342ed7f38b2d88e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a7291117328b413295ae7d1c841e944bc60062d3
commit a7291117328b413295ae7d1c841e944bc60062d3
Author: Florian Weimer <fweimer@redhat.com>
Date: Mon Jun 16 18:00:09 2014 +0200
Fix tautological comparison in non-executed part of tst-setuid2 (BZ #17058)
This part never runs with the current implementation
because the setresuid call currently aborts (as intended).
diff --git a/ChangeLog b/ChangeLog
index ccc05a3..b2d035e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-16 Florian Weimer <fweimer@redhat.com>
+
+ [BZ #17058]
+ * nptl/tst-setuid2.c (do_test): Fix tautological comparison in
+ non-executed part of the test.
+
2014-06-16 Andreas Schwab <schwab@suse.de>
* string/bits/string2.h (strdup, strndup): Update feature guard.
diff --git a/NEWS b/NEWS
index 38cc5b5..52cd9b6 100644
--- a/NEWS
+++ b/NEWS
@@ -19,7 +19,7 @@ Version 2.20
16791, 16796, 16799, 16800, 16815, 16823, 16824, 16831, 16838, 16849,
16854, 16876, 16877, 16878, 16882, 16885, 16888, 16890, 16912, 16915,
16916, 16917, 16922, 16927, 16928, 16932, 16943, 16958, 16965, 16966,
- 16967, 16977, 16978, 16984, 16990, 16996, 17009, 17042, 17048.
+ 16967, 16977, 16978, 16984, 16990, 16996, 17009, 17042, 17048, 17058.
* The minimum Linux kernel version that this version of the GNU C Library
can be used with is 2.6.32.
diff --git a/nptl/tst-setuid2.c b/nptl/tst-setuid2.c
index 951aecc..260aa38 100644
--- a/nptl/tst-setuid2.c
+++ b/nptl/tst-setuid2.c
@@ -135,7 +135,7 @@ do_test (void)
/* If we get here, check that the kernel did the right thing. */
run_on_thread (get_thread_ids);
- if (ruid != 1001 || euid != 1002 || euid != 1003)
+ if (ruid != 1001 || euid != 1002 || suid != 1003)
FAIL ("unexpected UIDs after setuid: %ld, %ld, %ld",
(long) ruid, (long) euid, (long) suid);
return 0;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
NEWS | 2 +-
nptl/tst-setuid2.c | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources