Changeset b94c5ec in rtems-libbsd

Timestamp:

11/03/14 14:21:06 (8 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, 5-freebsd-12, 6-freebsd-12, freebsd-9.3, master

Children:

7ba9b7f

Parents:

f90fdf3

git-author:

Sebastian Huber <sebastian.huber@…> (11/03/14 14:21:06)

git-committer:

Sebastian Huber <sebastian.huber@…> (11/04/14 12:02:55)

Message:

NSDISPATCH(3): Add rtems_nss_register_module()

Location:

freebsd

Files:

• include/nsswitch.h (modified) (2 diffs)
• lib/libc/net/nsdispatch.c (modified) (9 diffs)

freebsd/include/nsswitch.h

@@ -216 +216 @@
         ns_mtab         *mtab;          /* method table */
         unsigned int     mtabsize;      /* count of entries in method table */
+#ifndef __rtems__
         nss_module_unregister_fn unregister; /* called to unload module */
+#endif /* __rtems__ */
 } ns_mod;
 
@@ -239 +241 @@
 #endif
 #endif /* _NS_PRIVATE */
+#ifdef __rtems__
+/**
+ * @brief Registers a name service module.
+ *
+ * @param[in] source The source identifier.
+ * @param[in] mtab The module table.  This table will be claimed by the name
+ *   service dispatcher.
+ * @param[in] mtabsize The module table entry count.
+ *
+ * @retval 0 Successful operation.
+ * @retval -1 An error occurred.  The errno is set to indicate the error.
+ */
+int
+rtems_nss_register_module(const char *source, ns_mtab *mtab,
+    unsigned int mtabsize);
+#endif /* __rtems__ */
 
 __END_DECLS

freebsd/lib/libc/net/nsdispatch.c

@@ -133 +133 @@
 static  ns_mod                  *_nsmod;
 
+#ifndef __rtems__
 /* Placeholder for builtin modules' dlopen `handle'. */
 static  int                      __nss_builtin_handle;
 static  void                    *nss_builtin_handle = &__nss_builtin_handle;
+#endif /* __rtems__ */
 
 #ifdef NS_CACHING
@@ -190 +192 @@
 static  int      nss_configure(void);
 static  void     ns_dbt_free(ns_dbt *);
+#ifndef __rtems__
 static  void     ns_mod_free(ns_mod *);
+#endif /* __rtems__ */
 static  void     ns_src_free(ns_src **, int);
+#ifndef __rtems__
 static  void     nss_load_builtin_modules(void);
 static  void     nss_load_module(const char *, nss_module_register_fn);
 static  void     nss_atexit(void);
+#endif /* __rtems__ */
 /* nsparser */
 extern  FILE    *_nsyyin;
@@ -300 +306 @@
         modp = vector_search(&src->name, _nsmod, _nsmodsize, sizeof(*_nsmod),
             string_compare);
+#ifndef __rtems__
         if (modp == NULL)
                 nss_load_module(src->name, NULL);
+#else /* __rtems__ */
+        (void)modp;
+#endif /* __rtems__ */
 }
 
@@ -380 +390 @@
         VECTOR_FREE(_nsmap, &_nsmapsize, sizeof(*_nsmap),
             (vector_free_elem)ns_dbt_free);
+#ifndef __rtems__
         VECTOR_FREE(_nsmod, &_nsmodsize, sizeof(*_nsmod),
             (vector_free_elem)ns_mod_free);
         nss_load_builtin_modules();
+#endif /* __rtems__ */
         _nsyyparse();
         (void)fclose(_nsyyin);
         vector_sort(_nsmap, _nsmapsize, sizeof(*_nsmap), string_compare);
+#ifndef __rtems__
         if (confmod == 0)
                 (void)atexit(nss_atexit);
+#endif /* __rtems__ */
         confmod = statbuf.st_mtime;
 
@@ -457 +471 @@
 
 
+#ifndef __rtems__
 /*
  * NSS module management.
@@ -500 +515 @@
         } else if (!is_dynamic())
                 goto fin;
-#ifndef __rtems__
         else {
                 if (snprintf(buf, sizeof(buf), "nss_%s.so.%d", mod.name,
@@ -524 +538 @@
                 }
         }
-#endif /* __rtems__ */
         mod.mtab = fn(mod.name, &mod.mtabsize, &mod.unregister);
         if (mod.mtab == NULL || mod.mtabsize == 0) {
-#ifndef __rtems__
                 if (mod.handle != nss_builtin_handle)
                         (void)dlclose(mod.handle);
-#endif /* __rtems__ */
                 mod.handle = NULL;
                 nss_log(LOG_ERR, "%s, registration failed", mod.name);
@@ -554 +565 @@
         if (mod->unregister != NULL)
                 mod->unregister(mod->mtab, mod->mtabsize);
-#ifndef __rtems__
         if (mod->handle != nss_builtin_handle)
                 (void)dlclose(mod->handle);
-#endif /* __rtems__ */
 }
 
@@ -580 +589 @@
                 (void)_pthread_rwlock_unlock(&nss_lock);
 }
+#else /* __rtems__ */
+int
+rtems_nss_register_module(const char *source, ns_mtab *mtab,
+    unsigned int mtabsize)
+{
+        ns_mod mod;
+        int result;
+
+        if (mtab == NULL || mtabsize == 0) {
+                errno = EINVAL;
+                return -1;
+        }
+
+        memset(&mod, 0, sizeof(mod));
+        mod.name = strdup(source);
+        if (mod.name == NULL) {
+                return -1;
+        }
+        mod.handle = (void *)1;
+        mod.mtab = mtab;
+        mod.mtabsize = mtabsize;
+        qsort(mod.mtab, mod.mtabsize, sizeof(mod.mtab[0]), mtab_compare);
+
+        result = _pthread_rwlock_wrlock(&nss_lock);
+        if (result != 0) {
+                errno = result;
+                return -1;
+        }
+
+        _nsmod = vector_append(&mod, _nsmod, &_nsmodsize, sizeof(*_nsmod));
+        vector_sort(_nsmod, _nsmodsize, sizeof(*_nsmod), string_compare);
+
+        (void)_pthread_rwlock_unlock(&nss_lock);
+
+        return 0;
+}
+#endif /* __rtems__ */