Changeset 2432 for trunk/server/common/oursrc/nss_nonlocal/walk_nss.h

Timestamp:

Jun 13, 2013, 6:01:30 AM (11 years ago)

Author:

andersk

Message:

Update nss_nonlocal to 2.1

- Support Automake 1.12.
- Guard one-time initialization with memory barriers.
- Make initgroups_dyn succeed when adding only magic groups.

File:

• trunk/server/common/oursrc/nss_nonlocal/walk_nss.h (modified) (3 diffs)

trunk/server/common/oursrc/nss_nonlocal/walk_nss.h

@@ +1 @@
+/*
+ * walk_nss.h
+ * NSS walking template for nss_nonlocal proxy
+ *
+ * Copyright © 2011 Anders Kaseorg <andersk@mit.edu> and Tim Abbott
+ * <tabbott@mit.edu>
+ *
+ * This file is part of nss_nonlocal.
+ *
+ * nss_nonlocal is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * nss_nonlocal is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with nss_nonlocal; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301  USA
+ */
+
 {
-    static service_user *startp = NULL;
-    static void *fct_start = NULL;
+    static bool initialized = false;
+    static service_user *startp;
+    static void *fct_start;
 
     service_user *nip;
@@ -10 +36 @@
     int old_errno = errno;
 
-    if (fct_start == NULL &&
-        w.lookup(&startp, w.fct_name, &fct_start) != 0) {
-        *w.status = NSS_STATUS_UNAVAIL;
-        goto walk_nss_out;
+    if (!initialized) {
+        if (w.lookup(&startp, w.fct_name, &fct_start) != 0) {
+            *w.status = NSS_STATUS_UNAVAIL;
+            goto walk_nss_out;
+        }
+        __sync_synchronize();
+        initialized = true;
     }
 
@@ -51 +80 @@
             goto walk_nss_morebuf;
         }
-    } while (__nss_next(&nip, w.fct_name, &fct.ptr, *w.status, 0) == 0);
+    } while (__nss_next(&nip, w.fct_name, &fct.ptr, *w.status, w.all_values) ==
+             0);
 
     if (w.buf != NULL && *w.status != NSS_STATUS_SUCCESS) {