Changeset 2434 for branches/fc19-dev/server/common/oursrc/nss_nonlocal/nonlocal-group.c

Timestamp:

Jun 14, 2013, 12:50:47 PM (11 years ago)

Author:

achernya

Message:

Merge r2402-r2433 from trunk to branches/fc19-dev

Location:

branches/fc19-dev

Files:

• . (modified) (1 prop)
• server/common/oursrc/nss_nonlocal/nonlocal-group.c (modified) (6 diffs)

branches/fc19-dev/server/common/oursrc/nss_nonlocal/nonlocal-group.c

@@ -25 +25 @@
 
 #define _GNU_SOURCE
+
 #include <sys/types.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
 #include <dlfcn.h>
-#include <stdio.h>
-#include <syslog.h>
 #include <errno.h>
-#include <pwd.h>
 #include <grp.h>
 #include <nss.h>
+#include <pwd.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+#include <unistd.h>
+
 #include "nsswitch-internal.h"
 #include "nonlocal.h"
@@ -170 +172 @@
 }
 
+static bool grent_initialized = false;
 static service_user *grent_startp, *grent_nip;
 static void *grent_fct_start;
@@ -194 +197 @@
         return status;
 
-    if (grent_fct_start == NULL)
+    if (!grent_initialized) {
         __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;
@@ -208 +214 @@
     const struct walk_nss w = {
         .lookup = &__nss_group_nonlocal_lookup, .fct_name = "endgrent",
-        .status = &status
+        .status = &status, .all_values = 1,
     };
     const __typeof__(&_nss_nonlocal_endgrent) self = NULL;
@@ -356 +362 @@
     const struct walk_nss w = {
         .lookup = &__nss_group_nonlocal_lookup, .fct_name = "initgroups_dyn",
-        .status = &status, .errnop = errnop
+        .status = &status, .all_values = 1, .errnop = errnop
     };
     const __typeof__(&_nss_nonlocal_initgroups_dyn) self = NULL;
@@ -445 +451 @@
 #include "walk_nss.h"
 #undef args
-    if (status != NSS_STATUS_SUCCESS)
+    if (status == NSS_STATUS_NOTFOUND || status == NSS_STATUS_UNAVAIL)
+        return NSS_STATUS_SUCCESS;
+    else if (status != NSS_STATUS_SUCCESS)
         return status;