Prepare for 0.2.0.0, lots of changes.

- Make _r functions completely thread-safe.
- Save a lot of forking by having a persistent nsss_switch_query
- Introduce a timeout to make the server expire
- Start writing nsss-switch, not working yet.

Signed-off-by: Laurent Bercot <ska@appnovation.com>

1 files changed, 10 insertions, 6 deletions

diff --git a/src/libnsss/nsss_switch_getgrouplist.c b/src/libnsss/nsss_switch_getgrouplist.c
index 73d3fe0..868b463 100644
--- a/src/libnsss/nsss_switch_getgrouplist.c
+++ b/src/libnsss/nsss_switch_getgrouplist.c
@@ -2,6 +2,7 @@
 
 #include <stddef.h>
 #include <errno.h>
+#include <pthread.h>
 
 #include <skalibs/stralloc.h>
 
@@ -9,22 +10,25 @@
 #include <nsss/nsss-switch.h>
 #include <nsss/grp-switch.h>
 #include "nsss-internal.h"
+#include "nsss-switch-internal.h"
 
 int nsss_switch_getgrouplist (char const *user, gid_t gid, gid_t *gids, int *ngids)
 {
   stralloc sa = STRALLOC_ZERO ;
-  int e = errno ;
   size_t r = 0 ;
   size_t n ;
-  nsss_switch_t a = NSSS_SWITCH_ZERO ;
+  int e ;
   if (*ngids < 0) return (errno = EINVAL, -1) ;
   n = *ngids ;
-  if (!nsss_switch_start(&a, NSSS_SWITCH_GRP, NSSS_NSSSD_PATH, 0, 0)) return -1 ;
-  if (!nsss_switch_grp_getlist(&a, user, gids, n, &r, &sa, 0, 0))
+  e = pthread_mutex_lock(&nsss_switch_query_mutex) ;
+  if (e) return (errno = e, -1) ; 
+  e = errno ;
+  if (!nsss_switch_query_start(NSSS_NSSSD_PATH, NSSS_SWITCH_GRP, 30000, 0, 0)
+   || !nsss_switch_grp_getlist(&nsss_switch_query, user, gids, n, &r, &sa, 0, 0))
   {
-    nsss_switch_end(&a, NSSS_SWITCH_GRP) ;
+    pthread_mutex_unlock(&nsss_switch_query_mutex) ;
     return -1 ;
   }
-  nsss_switch_end(&a, NSSS_SWITCH_GRP) ;
+  pthread_mutex_unlock(&nsss_switch_query_mutex) ;
   return nsss_grouplist_adjust(n, r, gid, gids, ngids, e) ;
 }