Changeset 21 in openpam

Timestamp:

Feb 2, 2002, 6:37:08 PM (17 years ago)

Author:

Dag-Erling Smørgrav

Message:

Move linker-related code out into a separate file so it'll be easier
to restructure it later on.

Sponsored by: DARPA, NAI Labs

Location:

trunk/lib

Files:

• Makefile (modified) (1 diff)
• openpam_impl.h (modified) (1 diff)
• pam_end.c (modified) (3 diffs)
• pam_start.c (modified) (3 diffs)

trunk/lib/Makefile

@@ -46 +46 @@
 SRCS            += openpam_dispatch.c
 SRCS            += openpam_findenv.c
+SRCS            += openpam_load.c
 SRCS            += openpam_log.c
 SRCS            += openpam_ttyconv.c

trunk/lib/openpam_impl.h

@@ -111 +111 @@
 int             openpam_dispatch(pam_handle_t *, int, int);
 int             openpam_findenv(pam_handle_t *, const char *, size_t);
+int             openpam_add_module(pam_handle_t *, int, int,
+                                   const char *, const char *);
+void            openpam_clear_chains(pam_handle_t *);
 
 #endif

trunk/lib/pam_end.c

@@ -35 +35 @@
  */
 
-#include <dlfcn.h>
 #include <stdlib.h>
 
@@ -53 +52 @@
         int status)
 {
-        pam_chain_t *module;
         pam_data_t *dp;
         int i;
@@ -75 +73 @@
 
         /* clear chains */
-        for (i = 0; i < PAM_NUM_CHAINS; ++i) {
-                while (pamh->chains[i] != NULL) {
-                        module = pamh->chains[i];
-                        pamh->chains[i] = module->next;
-                        /* XXX free options */
-                        dlclose(module->dlh);
-                        free(module->modpath);
-                        free(module);
-                }
-        }
+        openpam_clear_chains(pamh);
 
         /* clear items */

trunk/lib/pam_start.c

@@ -35 +35 @@
  */
 
-#include <sys/param.h>
-
 #include <ctype.h>
-#include <dlfcn.h>
 #include <errno.h>
 #include <stdio.h>
@@ -88 +85 @@
         pam_end(ph, r);
         return (r);
-}
-
-/* XXX move to a different file */
-const char *_pam_sm_func_name[PAM_NUM_PRIMITIVES] = {
-        "pam_sm_acct_mgmt",
-        "pam_sm_authenticate",
-        "pam_sm_chauthtok",
-        "pam_sm_close_session",
-        "pam_sm_open_session",
-        "pam_sm_setcred"
-};
-
-static int
-_pam_add_module(pam_handle_t *pamh,
-        int chain,
-        int flag,
-        const char *modpath,
-        const char *options /* XXX */ __unused)
-{
-        pam_chain_t *module, *iterator;
-        int i;
-
-        /* fill in configuration data */
-        if ((module = malloc(sizeof(*module))) == NULL) {
-                openpam_log(PAM_LOG_ERROR, "malloc(): %m");
-                return (PAM_BUF_ERR);
-        }
-        if ((module->modpath = strdup(modpath)) == NULL) {
-                openpam_log(PAM_LOG_ERROR, "strdup(): %m");
-                free(module);
-                return (PAM_BUF_ERR);
-        }
-        module->flag = flag;
-        module->next = NULL;
-
-        /* load module and resolve symbols */
-        /*
-         * Each module is dlopen()'d once for evey time it occurs in
-         * any chain.  While the linker is smart enough to not load
-         * the same module more than once, it does waste space in the
-         * form of linker handles and pam_func structs.
-         *
-         * TODO: implement a central module cache and replace the
-         * array of pam_func structs in struct pam_chain with pointers
-         * to the appropriate entry in the module cache.
-         *
-         * TODO: move this code out into a separate file to hide the
-         * details of the module cache and linker API from this file.
-         */
-        if ((module->dlh = dlopen(modpath, RTLD_NOW)) == NULL) {
-                openpam_log(PAM_LOG_ERROR, "dlopen(): %s", dlerror());
-                free(module->modpath);
-                free(module);
-                return (PAM_OPEN_ERR);
-        }
-        for (i = 0; i < PAM_NUM_PRIMITIVES; ++i)
-                module->primitive[i] =
-                    dlsym(module->dlh, _pam_sm_func_name[i]);
-
-        if ((iterator = pamh->chains[chain]) != NULL) {
-                while (iterator->next != NULL)
-                        iterator = iterator->next;
-                iterator->next = module;
-        } else {
-                pamh->chains[chain] = module;
-        }
-        return (PAM_SUCCESS);
 }
 
@@ -287 +217 @@
                  * appropriate chain and bump the counter.
                  */
-                if ((r = _pam_add_module(pamh, chain, flag, p, q)) !=
+                if ((r = openpam_add_module(pamh, chain, flag, p, q)) !=
                     PAM_SUCCESS)
                         return (-r);