Guard one-time initialization with memory barriers

[nss_nonlocal.git] / nonlocal-group.c

diff --git a/nonlocal-group.c b/nonlocal-group.c
index b4a72d10f3c49aedc1bfdcbe9c78e156eb60ff7b..9bbe156183ccb6db5bc2e325eb2641e866a0d1d6 100644 (file)
--- a/nonlocal-group.c
+++ b/nonlocal-group.c
@@ -171,6 +171,7 @@ get_local_group(const char *name, struct group *grp, char **buffer, int *errnop)
     return status;
 }
 
     return status;
 }
 

+static bool grent_initialized = false;

 static service_user *grent_startp, *grent_nip;
 static void *grent_fct_start;
 static union {
 static service_user *grent_startp, *grent_nip;
 static void *grent_fct_start;
 static union {


@@ -195,9 +196,12 @@ _nss_nonlocal_setgrent(int stayopen)
     if (status != NSS_STATUS_SUCCESS)
        return status;
 
     if (status != NSS_STATUS_SUCCESS)
        return status;
 

-    if (grent_fct_start == NULL)
+    if (!grent_initialized) {

        __nss_group_nonlocal_lookup(&grent_startp, grent_fct_name,
                                    &grent_fct_start);
        __nss_group_nonlocal_lookup(&grent_startp, grent_fct_name,
                                    &grent_fct_start);

+       __sync_synchronize();
+       grent_initialized = true;
+    }

     grent_nip = grent_startp;
     grent_fct.ptr = grent_fct_start;
     return NSS_STATUS_SUCCESS;
     grent_nip = grent_startp;
     grent_fct.ptr = grent_fct_start;
     return NSS_STATUS_SUCCESS;