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, 15 insertions, 6 deletions

diff --git a/src/libnsss/nsss_switch_getspnam_r.c b/src/libnsss/nsss_switch_getspnam_r.c
index 9c6b86f..7652004 100644
--- a/src/libnsss/nsss_switch_getspnam_r.c
+++ b/src/libnsss/nsss_switch_getspnam_r.c
@@ -1,27 +1,36 @@
 /* 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>
 #include "nsss-internal.h"
+#include "nsss-switch-internal.h"
 
 int nsss_switch_getspnam_r (char const *name, struct spwd *sp, char *buf, size_t buflen, struct spwd **spp)
 {
   struct spwd sp2 ;
   stralloc sa = STRALLOC_ZERO ;
-  nsss_switch_t a = NSSS_SWITCH_ZERO ;
-  int e = errno ;
-  if (!nsss_switch_start(&a, NSSS_SWITCH_SHADOW, NSSS_NSSSD_PATH, 0, 0)) return errno ;
+  int e = pthread_mutex_lock(&nsss_switch_query_mutex) ;
+  if (e) return e ;
+  e = errno ;
+  if (!nsss_switch_query_start(NSSS_NSSSD_PATH, NSSS_SWITCH_SHADOW, 30000, 0, 0))
+  {
+    pthread_mutex_unlock(&nsss_switch_query_mutex) ;
+    return errno ;
+  }
   errno = 0 ;
-  if (!nsss_switch_shadow_getbyname(&a, &sp2, &sa, name, 0, 0))
+  if (!nsss_switch_shadow_getbyname(&nsss_switch_query, &sp2, &sa, name, 0, 0))
   {
-    nsss_switch_end(&a, NSSS_SWITCH_SHADOW) ;
+    pthread_mutex_unlock(&nsss_switch_query_mutex) ;
     *spp = 0 ;
     return errno ? errno : (errno = e, 0) ;
   }
-  nsss_switch_end(&a, NSSS_SWITCH_SHADOW) ;
+  pthread_mutex_unlock(&nsss_switch_query_mutex) ;
   if (!nsss_shadow_copy(sp, buf, buflen, &sp2, sa.s, sa.len))
   {
     stralloc_free(&sa) ;