nss: gr/pw: re-used variable

[nsscash/nsscash.git] / nss / gr.c

diff --git a/nss/gr.c b/nss/gr.c
index c49ef4799be15db6e4996b4c01042eb5965d8a75..d8d6d6a1520109b9a94384e5098e816e1618c936 100644 (file)
--- a/nss/gr.c
+++ b/nss/gr.c
@@ -25,7 +25,6 @@
 
 #include <pthread.h>
 
-#include "cash.h"
 #include "cash_nss.h"
 #include "file.h"
 #include "search.h"
@@ -53,7 +52,7 @@ struct group_entry {
      * All offsets are relative to the beginning of data.
      */
     uint16_t data_size;
-    char data[];
+    const char data[];
 } __attribute__((packed));
 
 static bool entry_to_group(const struct group_entry *e, struct group *g, char *tmp, size_t space) {
@@ -155,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);
@@ -166,7 +165,7 @@ static enum nss_status internal_getgr(struct search_key *key, struct group *resu
         return NSS_STATUS_NOTFOUND;
     }
 
-    const char *e = h->data + h->off_data + *off;
+    const char *e = key->data + *off;
     if (!entry_to_group((struct group_entry *)e, result, buffer, buflen)) {
         unmap_file(&f);
         errno = ERANGE;