X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=nss%2Fgr.c;h=e0e8873df9e6cbdf24bab735e261d0d2fa46b322;hb=1002c514a8530bb6608c556b4446e853be390917;hp=79ac54000a885ab6fece8a82986e7fbda781ea1b;hpb=59e4e76bd0703e1143a92658dc0bfe54ed3901cd;p=nsscash%2Fnsscash.git

diff --git a/nss/gr.c b/nss/gr.c
index 79ac540..e0e8873 100644
--- a/nss/gr.c
+++ b/nss/gr.c
@@ -1,7 +1,7 @@
 /*
  * Handle group entries via struct group
  *
- * Copyright (C) 2019  Simon Ruderich
+ * Copyright (C) 2019-2020  Simon Ruderich
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -91,24 +91,23 @@ static struct file static_file = {
 };
 static pthread_mutex_t static_file_lock = PTHREAD_MUTEX_INITIALIZER;
 
-enum nss_status _nss_cash_setgrent(int x) {
-    (void)x;
-
+static void internal_unmap_static_file(void) {
     pthread_mutex_lock(&static_file_lock);
-    // Unmap is necessary to detect changes when the file was replaced on
-    // disk
     unmap_file(&static_file);
-    // getgrent_r will open the file if necessary when called
     pthread_mutex_unlock(&static_file_lock);
+}
 
+enum nss_status _nss_cash_setgrent(int x) {
+    (void)x;
+
+    // Unmap is necessary to detect changes when the file was replaced on
+    // disk; getgrent_r will open the file if necessary when called
+    internal_unmap_static_file();
     return NSS_STATUS_SUCCESS;
 }
 
 enum nss_status _nss_cash_endgrent(void) {
-    pthread_mutex_lock(&static_file_lock);
-    unmap_file(&static_file);
-    pthread_mutex_unlock(&static_file_lock);
-
+    internal_unmap_static_file();
     return NSS_STATUS_SUCCESS;
 }
 
@@ -181,9 +180,8 @@ static enum nss_status internal_getgr(struct search_key *key, struct group *resu
 }
 
 enum nss_status _nss_cash_getgrgid_r(gid_t gid, struct group *result, char *buffer, size_t buflen, int *errnop) {
-    uint64_t id = (uint64_t)gid;
     struct search_key key = {
-        .id = &id,
+        .id = (uint64_t)gid,
         .offset = offsetof(struct group_entry, gid),
     };
     return internal_getgr(&key, result, buffer, buflen, errnop);