You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

46 lines
1.7 KiB

commit 5a9af6376d43b58c6545feb86002812a57956654
Author: Florian Weimer <fweimer@redhat.com>
Date: Fri Sep 25 20:20:33 2015 +0200
Fix inconsistent passwd compensation in nss/bug17079.c
It used to be common practice to have a statically linked shell for an
alternative root account, as in:
root:x:0:0:root:/root:/bin/bash
toor:x:0:0:root recovery account:/root:/sbin/sash
This causes problems with passwd NSS tests because a UID-based lookup
will only retrieve one of those entries. The original version of
nss/bug17079.c detected this, but failed to use this information later
on.
diff --git a/nss/bug17079.c b/nss/bug17079.c
index 9846737..0249922 100644
--- a/nss/bug17079.c
+++ b/nss/bug17079.c
@@ -72,7 +72,11 @@ init_test_items (void)
struct passwd *pwd2 = getpwuid (test_items[i].pw_uid);
if (pwd1 == NULL || !equal (pwd1, test_items + i)
|| pwd2 == NULL || !equal (pwd2, test_items + i))
- test_items[i].pw_name = NULL;
+ {
+ printf ("info: skipping user \"%s\", UID %ld due to inconsistency\n",
+ test_items[i].pw_name, (long) test_items[i].pw_uid);
+ test_items[i].pw_name = NULL;
+ }
else
found = true;
}
@@ -195,6 +199,10 @@ test_buffer_size (size_t buffer_size)
for (int i = 0; i < test_count; ++i)
for (size_t padding_size = 0; padding_size < 3; ++padding_size)
{
+ /* Skip entries with inconsistent name/UID lookups. */
+ if (test_items[i].pw_name == NULL)
+ continue;
+
test_one (test_items + i, buffer_size, '\0', padding_size);
if (padding_size > 0)
{