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_getgrgid_r.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'src/libnsss/nsss_switch_getgrgid_r.c') diff --git a/src/libnsss/nsss_switch_getgrgid_r.c b/src/libnsss/nsss_switch_getgrgid_r.c index 2eb4855..4113703 100644 --- a/src/libnsss/nsss_switch_getgrgid_r.c +++ b/src/libnsss/nsss_switch_getgrgid_r.c @@ -1,29 +1,38 @@ /* ISC license. */ #include +#include + #include #include + #include #include #include #include "nsss-internal.h" +#include "nsss-switch-internal.h" int nsss_switch_getgrgid_r (gid_t gid, struct group *gr, char *buf, size_t buflen, struct group **grp) { struct group gr2 ; stralloc sa = STRALLOC_ZERO ; genalloc ga = GENALLOC_ZERO ; - nsss_switch_t a = NSSS_SWITCH_ZERO ; - int e = errno ; - if (!nsss_switch_start(&a, NSSS_SWITCH_GRP, 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_GRP, 30000, 0, 0)) + { + pthread_mutex_unlock(&nsss_switch_query_mutex) ; + return errno ; + } errno = 0 ; - if (!nsss_switch_grp_getbygid(&a, &gr2, &sa, &ga, gid, 0, 0)) + if (!nsss_switch_grp_getbygid(&nsss_switch_query, &gr2, &sa, &ga, gid, 0, 0)) { - nsss_switch_end(&a, NSSS_SWITCH_GRP) ; + pthread_mutex_unlock(&nsss_switch_query_mutex) ; *grp = 0 ; return errno ? errno : (errno = e, 0) ; } - nsss_switch_end(&a, NSSS_SWITCH_GRP) ; + pthread_mutex_unlock(&nsss_switch_query_mutex) ; if (!nsss_grp_copy(gr, buf, buflen, &gr2, sa.s, sa.len, genalloc_s(char *, &ga), genalloc_len(char *, &ga))) { genalloc_free(char *, &ga) ; -- cgit v1.3.1