Changeset 2434 for branches/fc19-dev/server/common/oursrc/nss_nonlocal/nonlocal-passwd.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-passwd.c (modified) (4 diffs)

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

@@ -26 +26 @@
 
 #define _GNU_SOURCE
+
 #include <sys/types.h>
+#include <dlfcn.h>
+#include <errno.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 <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 "nsswitch-internal.h"
 #include "nonlocal.h"
@@ -162 +163 @@
 
 
+static bool pwent_initialized = false;
 static service_user *pwent_startp, *pwent_nip;
 static void *pwent_fct_start;
@@ -186 +188 @@
         return status;
 
-    if (pwent_fct_start == NULL)
+    if (!pwent_initialized) {
         __nss_passwd_nonlocal_lookup(&pwent_startp, pwent_fct_name,
                                      &pwent_fct_start);
+        __sync_synchronize();
+        pwent_initialized = true;
+    }
     pwent_nip = pwent_startp;
     pwent_fct.ptr = pwent_fct_start;
@@ -200 +205 @@
     const struct walk_nss w = {
         .lookup = &__nss_passwd_nonlocal_lookup, .fct_name = "endpwent",
-        .status = &status
+        .status = &status, .all_values = 1,
     };
     const __typeof__(&_nss_nonlocal_endpwent) self = NULL;