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 ccc05a387ba075951e67150cf3cb4698b8097aea..b2d035e7179a927a30c090226a594cb2679e0b5c 100644 (file)
--- 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 38cc5b54dee17b8656e687137195be38e87ebdb1..52cd9b6aa86b20e8655456776149320fdc94d30e 100644 (file)
--- 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 951aeccac56c22b1befb5a51e8fba5e7fa58f989..260aa38eee7697890fc731fcbf542cfdbbb069a7 100644 (file)
--- 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;