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

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

@@ -24 +24 @@
 
 #define _GNU_SOURCE
+
 #include <sys/types.h>
-#include <unistd.h>
+#include <dlfcn.h>
+#include <errno.h>
+#include <nss.h>
+#include <shadow.h>
+#include <stdbool.h>
+#include <stddef.h>
 #include <stdlib.h>
-#include <stdint.h>
 #include <string.h>
-#include <dlfcn.h>
-#include <stdio.h>
 #include <syslog.h>
-#include <errno.h>
-#include <shadow.h>
-#include <nss.h>
 
 #include "nsswitch-internal.h"
@@ -59 +59 @@
 
 
+static bool spent_initialized = false;
 static service_user *spent_startp, *spent_nip;
 static void *spent_fct_start;
@@ -83 +84 @@
         return status;
 
-    if (spent_fct_start == NULL)
+    if (!spent_initialized) {
         __nss_shadow_nonlocal_lookup(&spent_startp, spent_fct_name,
                                      &spent_fct_start);
+        __sync_synchronize();
+        spent_initialized = true;
+    }
     spent_nip = spent_startp;
     spent_fct.ptr = spent_fct_start;
@@ -114 +118 @@
 {
     enum nss_status status;
+
+    char *nonlocal_ignore = getenv(NONLOCAL_IGNORE_ENV);
+    if (nonlocal_ignore != NULL && nonlocal_ignore[0] != '\0')
+        return NSS_STATUS_UNAVAIL;
+
     if (spent_nip == NULL) {
         status = _nss_nonlocal_setspent(0);