From 6fdb4834cdb5557d9bd7562f61984da8bd0d9c80 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Thu, 9 Sep 2021 19:58:12 +0000 Subject: 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 --- src/libnsss/nsss_switch_getspnam.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/libnsss/nsss_switch_getspnam.c') diff --git a/src/libnsss/nsss_switch_getspnam.c b/src/libnsss/nsss_switch_getspnam.c index 01184ec..af2f8da 100644 --- a/src/libnsss/nsss_switch_getspnam.c +++ b/src/libnsss/nsss_switch_getspnam.c @@ -4,17 +4,11 @@ #include #include #include "nsss-internal.h" +#include "nsss-switch-internal.h" struct spwd *nsss_switch_getspnam (char const *name) { - nsss_switch_t a = NSSS_SWITCH_ZERO ; - if (!nsss_switch_start(&a, NSSS_SWITCH_SHADOW, NSSS_NSSSD_PATH, 0, 0)) return 0 ; + if (!nsss_switch_query_start(NSSS_NSSSD_PATH, NSSS_SWITCH_SHADOW, 30000, 0, 0)) return 0 ; nsss_shadow_sa_here.len = 0 ; - if (!nsss_switch_shadow_getbyname(&a, &nsss_shadow_here, &nsss_shadow_sa_here, name, 0, 0)) - { - nsss_switch_end(&a, NSSS_SWITCH_SHADOW) ; - return 0 ; - } - nsss_switch_end(&a, NSSS_SWITCH_SHADOW) ; - return &nsss_shadow_here ; + return nsss_switch_shadow_getbyname(&nsss_switch_query, &nsss_shadow_here, &nsss_shadow_sa_here, name, 0, 0) ? &nsss_shadow_here : 0 ; } -- cgit v1.3.1