Changeset 433

Timestamp:

03/10/10 11:34:36 (5 months ago)

Author:

des

Message:

Add support for dynamic modules that contain a struct pam_module.

Files:

• trunk/lib/openpam_dynamic.c (modified) (5 diffs)

trunk/lib/openpam_dynamic.c

@@ -62 +62 @@
 openpam_dynamic(const char *path)
 {
+        const pam_module_t *dlmodule;
         pam_module_t *module;
         const char *prefix;
@@ -69 +70 @@
 
         dlh = NULL;
-        if ((module = calloc(1, sizeof *module)) == NULL)
-                goto buf_err;
 
         /* Prepend the standard prefix if not an absolute pathname. */
@@ -80 +79 @@
         /* try versioned module first, then unversioned module */
         if (asprintf(&vpath, "%s%s.%d", prefix, path, LIB_MAJ) < 0)
-                goto buf_err;
+                goto err;
         if ((dlh = dlopen(vpath, RTLD_NOW)) == NULL) {
                 openpam_log(PAM_LOG_DEBUG, "%s: %s", vpath, dlerror());
@@ -87 +86 @@
                         openpam_log(PAM_LOG_DEBUG, "%s: %s", vpath, dlerror());
                         FREE(vpath);
-                        FREE(module);
                         return (NULL);
                 }
         }
         FREE(vpath);
+        if ((module = calloc(1, sizeof *module)) == NULL)
+                goto buf_err;
         if ((module->path = strdup(path)) == NULL)
                 goto buf_err;
         module->dlh = dlh;
+        dlmodule = dlsym(dlh, "_pam_module");
         for (i = 0; i < PAM_NUM_PRIMITIVES; ++i) {
-                module->func[i] = (pam_func_t)dlsym(dlh, _pam_sm_func_name[i]);
+                module->func[i] = dlmodule ? dlmodule->func[i] :
+                    (pam_func_t)dlsym(dlh, _pam_sm_func_name[i]);
                 if (module->func[i] == NULL)
                         openpam_log(PAM_LOG_DEBUG, "%s: %s(): %s",
@@ -103 +105 @@
         return (module);
 buf_err:
-        openpam_log(PAM_LOG_ERROR, "%m");
         if (dlh != NULL)
                 dlclose(dlh);
         FREE(module);
+err:
+        openpam_log(PAM_LOG_ERROR, "%m");
         return (NULL);
 }