Changeset 87 in openpam

Timestamp:

Mar 5, 2002, 2:20:26 PM (18 years ago)

Author:

Dag-Erling Smørgrav

Message:

Move most of the dynamic loader code into a separate file, and add
support for module versioning. OpenPAM will prefer a PAM module with
the same version number as the library itself to one with no version
number at all.

Sponsored by: DARPA, NAI Labs

Location:

trunk

Files:

• include/security/openpam.h (modified) (3 diffs)
• lib/Makefile (modified) (2 diffs)
• lib/openpam_dynamic.c (added)
• lib/openpam_impl.h (modified) (2 diffs)
• lib/openpam_load.c (modified) (6 diffs)

trunk/include/security/openpam.h

@@ -32 +32 @@
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/include/security/openpam.h#10 $
+ * $P4: //depot/projects/openpam/include/security/openpam.h#11 $
  */
 
@@ -178 +178 @@
 typedef struct pam_module pam_module_t;
 struct pam_module {
-        const char      *path;
+        char            *path;
         pam_func_t       func[PAM_NUM_PRIMITIVES];
         void            *dlh;
@@ -202 +202 @@
 #define PAM_EXTERN static
 #define PAM_MODULE_ENTRY(name)                                          \
-static struct pam_module _pam_module = { name PAM_SOEXT, {              \
+static char _pam_name[] = name PAM_SOEXT;                               \
+static struct pam_module _pam_module = { _pam_name, {                   \
     pam_sm_authenticate, pam_sm_setcred, pam_sm_acct_mgmt,              \
     pam_sm_open_session, pam_sm_close_session, pam_sm_chauthtok },      \

trunk/lib/Makefile

@@ -32 +32 @@
 # SUCH DAMAGE.
 #
-# $P4: //depot/projects/openpam/lib/Makefile#10 $
+# $P4: //depot/projects/openpam/lib/Makefile#11 $
 #
 
@@ -42 +42 @@
 NO_WERROR        = yes
 CFLAGS          += -I${.CURDIR}/../include
+CFLAGS          += -DLIB_MAJ=${SHLIB_MAJOR}
 
 SRCS             =
 SRCS            += openpam_dispatch.c
+SRCS            += openpam_dynamic.c
 SRCS            += openpam_findenv.c
 SRCS            += openpam_get_option.c

trunk/lib/openpam_impl.h

@@ -32 +32 @@
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_impl.h#9 $
+ * $P4: //depot/projects/openpam/lib/openpam_impl.h#10 $
  */
 
@@ -105 +105 @@
 pam_module_t   *openpam_static(const char *);
 #endif
+pam_module_t   *openpam_dynamic(const char *);
 
 #endif

trunk/lib/openpam_load.c

@@ -32 +32 @@
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_load.c#9 $
+ * $P4: //depot/projects/openpam/lib/openpam_load.c#10 $
  */
 
@@ -55 +55 @@
 
 /*
- * Load a dynamic module, or locate a static one.  Keep a list of
- * previously found modules to speed up the process.
+ * Locate a matching dynamic or static module.  Keep a list of previously
+ * found modules to speed up the process.
  */
 
@@ -63 +63 @@
 {
         pam_module_t *module;
-        void *dlh;
-        int i;
 
         /* check cache first */
@@ -72 +70 @@
 
         /* nope; try to load */
-        if ((dlh = dlopen(path, RTLD_NOW)) == NULL) {
-                openpam_log(PAM_LOG_ERROR, "dlopen(): %s", dlerror());
-        } else {
-                if ((module = calloc(1, sizeof *module)) == NULL)
-                        goto buf_err;
-                if ((module->path = strdup(path)) == NULL)
-                        goto buf_err;
-                module->dlh = dlh;
-                for (i = 0; i < PAM_NUM_PRIMITIVES; ++i)
-                        module->func[i] = dlsym(dlh, _pam_sm_func_name[i]);
-        }
+        module = openpam_dynamic(path);
         openpam_log(PAM_LOG_DEBUG, "%s dynamic %s",
             (module == NULL) ? "no" : "using", path);
@@ -102 +90 @@
         ++module->refcount;
         return (module);
- buf_err:
-        openpam_log(PAM_LOG_ERROR, "malloc(): %m");
-        dlclose(dlh);
-        free(module);
-        return (NULL);
 }
 
@@ -137 +120 @@
         if (module->next != NULL)
                 module->next->prev = module->prev;
+        free(module->path);
         free(module);
 }