From 959bf6db509da88477dc64d40cf04c4def91a7b3 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Mon, 10 Jun 2019 22:57:40 +0200 Subject: [PATCH] nss: gr/pw: use key->name for NULL check This is consistent with search.c's bsearch_callback() which also checks key->name first. --- nss/gr.c | 6 +++--- nss/pw.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nss/gr.c b/nss/gr.c index 8b336f9..cc7f9b0 100644 --- a/nss/gr.c +++ b/nss/gr.c @@ -154,9 +154,9 @@ static enum nss_status internal_getgr(struct search_key *key, struct group *resu const struct header *h = f.header; key->data = h->data + h->off_data; - uint64_t off_index = (key->id != NULL) - ? h->off_id_index - : h->off_name_index; + uint64_t off_index = (key->name != NULL) + ? h->off_name_index + : h->off_id_index; uint64_t *off = search(key, h->data + off_index, h->count); if (off == NULL) { unmap_file(&f); diff --git a/nss/pw.c b/nss/pw.c index 4313ee3..c7e0566 100644 --- a/nss/pw.c +++ b/nss/pw.c @@ -140,9 +140,9 @@ static enum nss_status internal_getpw(struct search_key *key, struct passwd *res const struct header *h = f.header; key->data = h->data + h->off_data; - uint64_t off_index = (key->id != NULL) - ? h->off_id_index - : h->off_name_index; + uint64_t off_index = (key->name != NULL) + ? h->off_name_index + : h->off_id_index; uint64_t *off = search(key, h->data + off_index, h->count); if (off == NULL) { unmap_file(&f); -- 2.45.2