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, 13 insertions, 4 deletions

diff --git a/src/libnsss/nsss_switch_getspent_r.c b/src/libnsss/nsss_switch_getspent_r.c
index 118e095..25cebae 100644
--- a/src/libnsss/nsss_switch_getspent_r.c
+++ b/src/libnsss/nsss_switch_getspent_r.c
@@ -1,7 +1,10 @@
 /* ISC license. */
 
 #include <errno.h>
+#include <pthread.h>
+
 #include <skalibs/stralloc.h>
+
 #include <nsss/config.h>
 #include <nsss/shadow-switch.h>
 #include <nsss/nsss-switch.h>
@@ -12,16 +15,18 @@ int nsss_switch_getspent_r (struct spwd *sp, char *buf, size_t buflen, struct sp
 {
   struct spwd sp2 ;
   stralloc sa = STRALLOC_ZERO ;
-  int e ;
-  if (!nsss_switch_start(&nsss_switch_here, NSSS_SWITCH_SHADOW, NSSS_NSSSD_PATH, 0, 0)) return errno ;
+  int e = pthread_mutex_lock(&nsss_switch_enumerator_mutex) ;
+  if (e) return e ;
+  if (!nsss_switch_start(&nsss_switch_enumerator, NSSS_SWITCH_SHADOW, NSSS_NSSSD_PATH, 0, 0)) goto err ;
   e = errno ;
   errno = 0 ;
-  if (!nsss_switch_shadow_get(&nsss_switch_here, &sp2, &sa, 0, 0))
+  if (!nsss_switch_shadow_get(&nsss_switch_enumerator, &sp2, &sa, 0, 0))
   {
     *spp = 0 ;
     if (!errno) errno = ENOENT ;
-    return errno ;
+    goto err ;
   }
+  pthread_mutex_unlock(&nsss_switch_enumerator_mutex) ;
   if (!nsss_shadow_copy(sp, buf, buflen, &sp2, sa.s, sa.len))
   {
     stralloc_free(&sa) ;
@@ -31,4 +36,8 @@ int nsss_switch_getspent_r (struct spwd *sp, char *buf, size_t buflen, struct sp
   stralloc_free(&sa) ;
   *spp = sp ;
   return (errno = e, 0) ;
+
+ err:
+  pthread_mutex_unlock(&nsss_switch_enumerator_mutex) ;
+  return errno ;
 }