[v2] nss: fix nss_database_lookup2's alternate handling [BZ #27416]
Commit Message
__nss_database_lookup2's extra arguments were left unused in the
nsswitch reloading patch set; this broke compat (default config
ignored) and shadow files (secondary name ignored).
This patch adds in the previous behavior. The test case
verifies that compat targets work (passwd) and that
the default configuration works (group). Tested on x86-64.
---
nss/Makefile | 1 +
nss/databases.def | 3 +
nss/nss_database.c | 2 +-
nss/nsswitch.c | 38 +++++------
nss/tst-nss-compat1.c | 64 +++++++++++++++++++
nss/tst-nss-compat1.root/etc/group | 1 +
nss/tst-nss-compat1.root/etc/nsswitch.conf | 3 +
nss/tst-nss-compat1.root/etc/passwd | 3 +
.../tst-nss-compat1.script | 1 +
9 files changed, 97 insertions(+), 19 deletions(-)
create mode 100644 nss/tst-nss-compat1.c
create mode 100644 nss/tst-nss-compat1.root/etc/group
create mode 100644 nss/tst-nss-compat1.root/etc/nsswitch.conf
create mode 100644 nss/tst-nss-compat1.root/etc/passwd
create mode 100644 nss/tst-nss-compat1.root/tst-nss-compat1.script
Comments
On Feb 15 2021, DJ Delorie via Libc-alpha wrote:
> + /* Primary name not found, try alternate. */
> + if (alternate_name)
> + for (database_id = 0; database_names[database_id]; database_id++)
> + if (strcmp (database_names[database_id], alternate_name) == 0)
> + if (__nss_database_get (database_id, ni) && *ni != NULL)
> + return 0;
Please add a test case where this block is reached.
> + /* Neither found, use default config. */
> + *ni = __nss_action_parse (defconfig);
> + if (*ni != NULL)
> + return 0;
Please add a test case where this block is reached.
Andreas.
@@ -63,6 +63,7 @@ tests = test-netdb test-digits-dots tst-nss-getpwent bug17079 \
xtests = bug-erange
tests-container = \
+ tst-nss-compat1 \
tst-nss-test3 \
tst-nss-files-hosts-long \
tst-nss-db-endpwent \
@@ -23,17 +23,20 @@
DEFINE_DATABASE (aliases)
DEFINE_DATABASE (ethers)
DEFINE_DATABASE (group)
+DEFINE_DATABASE (group_compat)
DEFINE_DATABASE (gshadow)
DEFINE_DATABASE (hosts)
DEFINE_DATABASE (initgroups)
DEFINE_DATABASE (netgroup)
DEFINE_DATABASE (networks)
DEFINE_DATABASE (passwd)
+DEFINE_DATABASE (passwd_compat)
DEFINE_DATABASE (protocols)
DEFINE_DATABASE (publickey)
DEFINE_DATABASE (rpc)
DEFINE_DATABASE (services)
DEFINE_DATABASE (shadow)
+DEFINE_DATABASE (shadow_compat)
/*
Local Variables:
@@ -172,7 +172,7 @@ nss_database_select_default (struct nss_database_default_cache *cache,
/* database_name must be large enough for each individual name plus a
null terminator. */
-typedef char database_name[11];
+typedef char database_name[14];
#define DEFINE_DATABASE(name) \
_Static_assert (sizeof (#name) <= sizeof (database_name), #name);
#include "databases.def"
@@ -76,24 +76,26 @@ __nss_database_lookup2 (const char *database, const char *alternate_name,
for (database_id = 0; database_names[database_id]; database_id++)
if (strcmp (database_names[database_id], database) == 0)
- break;
-
- if (database_names[database_id] == NULL)
- return -1;
-
- /* If *NI is NULL, the database was not mentioned in nsswitch.conf.
- If *NI is not NULL, but *NI->module is NULL, the database was in
- nsswitch.conf but listed no actions. We test for the former. */
- if (__nss_database_get (database_id, ni) && *ni != NULL)
- {
- /* Success. */
- return 0;
- }
- else
- {
- /* Failure. */
- return -1;
- }
+ /* If *NI is NULL, the database was not mentioned in nsswitch.conf.
+ If *NI is not NULL, but *NI->module is NULL, the database was in
+ nsswitch.conf but listed no actions. We test for the former. */
+ if (__nss_database_get (database_id, ni) && *ni != NULL)
+ return 0;
+
+ /* Primary name not found, try alternate. */
+ if (alternate_name)
+ for (database_id = 0; database_names[database_id]; database_id++)
+ if (strcmp (database_names[database_id], alternate_name) == 0)
+ if (__nss_database_get (database_id, ni) && *ni != NULL)
+ return 0;
+
+ /* Neither found, use default config. */
+ *ni = __nss_action_parse (defconfig);
+ if (*ni != NULL)
+ return 0;
+
+ /* Failure. */
+ return -1;
}
libc_hidden_def (__nss_database_lookup2)
new file mode 100644
@@ -0,0 +1,64 @@
+/* Test error checking for group entries.
+ Copyright (C) 2021 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <nss.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <support/support.h>
+#include <support/check.h>
+
+#include "nss_test.h"
+
+static struct passwd pwd_table[] = {
+ PWD (100),
+ PWD (30),
+ PWD_LAST ()
+ };
+
+void
+_nss_test1_init_hook(test_tables *t)
+{
+ t->pwd_table = pwd_table;
+}
+
+static int
+do_test (void)
+{
+ struct passwd *p = NULL;
+ struct group *g = NULL;
+
+ /* Test that compat-to-test works. */
+ p = getpwuid (100);
+ if (p == NULL)
+ FAIL_EXIT1("getpwuid-compat-test1 p");
+ else if (strcmp (p->pw_name, "name100") != 0)
+ FAIL_EXIT1("getpwuid-compat-test1 name100");
+
+ /* Test that internal defconfig works. */
+ g = getgrgid (100);
+ if (g == NULL)
+ FAIL_EXIT1("getgrgid-compat-null");
+ if (strcmp (g->gr_name, "wilma") != 0)
+ FAIL_EXIT1("getgrgid-compat-name");
+
+ return 0;
+}
+
+#include <support/test-driver.c>
new file mode 100644
@@ -0,0 +1 @@
+wilma:x:100:
new file mode 100644
@@ -0,0 +1,3 @@
+passwd : compat
+passwd_compat : test1
+
new file mode 100644
@@ -0,0 +1,3 @@
+name5:x:5:555:name5 for testing:/home/name5:/bin/nologin
++name100
++name30
new file mode 100644
@@ -0,0 +1 @@
+cp $B/nss/libnss_test1.so $L/libnss_test1.so.2