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.20-550-g0897c55
- From: carlos at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 21 Jan 2015 15:12:25 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.20-550-g0897c55
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 0897c551c0a098020f145885de06a5c10e5cc96b (commit)
from 86bba162b5732a33387ac6706bb2f25f8c966325 (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=0897c551c0a098020f145885de06a5c10e5cc96b
commit 0897c551c0a098020f145885de06a5c10e5cc96b
Author: Carlos O'Donell <carlos@systemhalted.org>
Date: Wed Jan 21 10:08:18 2015 -0500
tst-getpw: Rewrite.
The test is rewritten to look for the testable conditions and
exit once they are all detected. This prevents the test from
iterating over 2000 UIDs and looking up each one. It speeds up
the test and prevents it from failing if the system under test
has an NSS-based passwd that is slower than the test timeout.
See:
https://sourceware.org/ml/libc-alpha/2015-01/msg00394.html
diff --git a/ChangeLog b/ChangeLog
index d83be7a..4462627 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2015-01-21 Carlos O'Donell <carlos@redhat.com>
+ * pwd/tst-getpw.c: Rewrite.
+
[BZ #17702]
* dlfcn/Makefile (tests): Add tst-rec-dlopen.
(modules-names): Add moddummy1 and moddummy2.
diff --git a/pwd/tst-getpw.c b/pwd/tst-getpw.c
index 059c9e0..e3e101b 100644
--- a/pwd/tst-getpw.c
+++ b/pwd/tst-getpw.c
@@ -15,28 +15,99 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+#include <stdio.h>
#include <pwd.h>
+#include <errno.h>
+#include <stdbool.h>
+
+/* We want to test getpw by calling it with a uid that does
+ exist and one that doesn't exist. We track if we've met those
+ conditions and exit. We also track if we've failed due to lack
+ of memory. That constitutes all of the standard failure cases. */
+bool seen_hit;
+bool seen_miss;
+bool seen_oom;
+
+/* How many errors we've had while running the test. */
+int errors;
static void
check (uid_t uid)
{
+ int ret;
char buf[1024];
- (void) getpw (uid, buf);
+ ret = getpw (uid, buf);
+
+ /* Successfully read a password line. */
+ if (ret == 0 && !seen_hit)
+ {
+ printf ("PASS: Read a password line given a uid.\n");
+ seen_hit = true;
+ }
+
+ /* Failed to read a password line. Why? */
+ if (ret == -1)
+ {
+ /* No entry? Technically the errno could be any number
+ of values including ESRCH, EBADP or EPERM depending
+ on the quality of the nss module that implements the
+ underlying lookup. It should be 0 for getpw.*/
+ if (errno == 0 && !seen_miss)
+ {
+ printf ("PASS: Found an invalid uid.\n");
+ seen_miss = true;
+ return;
+ }
+
+ /* Out of memory? */
+ if (errno == ENOMEM && !seen_oom)
+ {
+ printf ("FAIL: Failed with ENOMEM.\n");
+ seen_oom = true;
+ errors++;
+ }
+
+ /* We don't expect any other values for errno. */
+ if (errno != ENOMEM && errno != 0)
+ errors++;
+ }
}
static int
do_test (void)
{
+ int ret;
uid_t uid;
- /* Just call it a different number of times the range should be
- large enough to find some existing and some non existing uids. */
+ /* Should return -1 and set errnot to EINVAL. */
+ ret = getpw (0, NULL);
+ if (ret == -1 && errno == EINVAL)
+ {
+ printf ("PASS: NULL buffer returns -1 and sets errno to EINVAL.\n");
+ }
+ else
+ {
+ printf ("FAIL: NULL buffer did not return -1 or set errno to EINVAL.\n");
+ errors++;
+ }
+
+ /* Look for one matching uid, one non-found uid and then stop.
+ Set an upper limit at the 16-bit UID mark; no need to go farther. */
+ for (uid = 0; uid < ((uid_t) 65535); ++uid)
+ {
+ check (uid);
+ if (seen_miss && seen_hit)
+ break;
+ }
+
+ if (!seen_hit)
+ printf ("FAIL: Did not read even one password line given a uid.\n");
- for (uid = 0; uid < 2000; ++uid)
- check (uid);
+ if (!seen_miss)
+ printf ("FAIL: Did not find even one invalid uid.\n");
- return 0;
+ return errors;
}
#define TEST_FUNCTION do_test ()
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 2 +
pwd/tst-getpw.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++----
2 files changed, 79 insertions(+), 6 deletions(-)
hooks/post-receive
--
GNU C Library master sources