Add support for dynamic modules that contain a struct pam_module.
git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/trunk@433 185d5e19-27fe-0310-9dcf-9bff6b9f3609
This commit is contained in:
parent
d62a8932a7
commit
385eb53d63
|
@ -61,6 +61,7 @@
|
||||||
pam_module_t *
|
pam_module_t *
|
||||||
openpam_dynamic(const char *path)
|
openpam_dynamic(const char *path)
|
||||||
{
|
{
|
||||||
|
const pam_module_t *dlmodule;
|
||||||
pam_module_t *module;
|
pam_module_t *module;
|
||||||
const char *prefix;
|
const char *prefix;
|
||||||
char *vpath;
|
char *vpath;
|
||||||
|
@ -68,8 +69,6 @@ openpam_dynamic(const char *path)
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
dlh = NULL;
|
dlh = NULL;
|
||||||
if ((module = calloc(1, sizeof *module)) == NULL)
|
|
||||||
goto buf_err;
|
|
||||||
|
|
||||||
/* Prepend the standard prefix if not an absolute pathname. */
|
/* Prepend the standard prefix if not an absolute pathname. */
|
||||||
if (path[0] != '/')
|
if (path[0] != '/')
|
||||||
|
@ -79,33 +78,37 @@ openpam_dynamic(const char *path)
|
||||||
|
|
||||||
/* try versioned module first, then unversioned module */
|
/* try versioned module first, then unversioned module */
|
||||||
if (asprintf(&vpath, "%s%s.%d", prefix, path, LIB_MAJ) < 0)
|
if (asprintf(&vpath, "%s%s.%d", prefix, path, LIB_MAJ) < 0)
|
||||||
goto buf_err;
|
goto err;
|
||||||
if ((dlh = dlopen(vpath, RTLD_NOW)) == NULL) {
|
if ((dlh = dlopen(vpath, RTLD_NOW)) == NULL) {
|
||||||
openpam_log(PAM_LOG_DEBUG, "%s: %s", vpath, dlerror());
|
openpam_log(PAM_LOG_DEBUG, "%s: %s", vpath, dlerror());
|
||||||
*strrchr(vpath, '.') = '\0';
|
*strrchr(vpath, '.') = '\0';
|
||||||
if ((dlh = dlopen(vpath, RTLD_NOW)) == NULL) {
|
if ((dlh = dlopen(vpath, RTLD_NOW)) == NULL) {
|
||||||
openpam_log(PAM_LOG_DEBUG, "%s: %s", vpath, dlerror());
|
openpam_log(PAM_LOG_DEBUG, "%s: %s", vpath, dlerror());
|
||||||
FREE(vpath);
|
FREE(vpath);
|
||||||
FREE(module);
|
|
||||||
return (NULL);
|
return (NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FREE(vpath);
|
FREE(vpath);
|
||||||
|
if ((module = calloc(1, sizeof *module)) == NULL)
|
||||||
|
goto buf_err;
|
||||||
if ((module->path = strdup(path)) == NULL)
|
if ((module->path = strdup(path)) == NULL)
|
||||||
goto buf_err;
|
goto buf_err;
|
||||||
module->dlh = dlh;
|
module->dlh = dlh;
|
||||||
|
dlmodule = dlsym(dlh, "_pam_module");
|
||||||
for (i = 0; i < PAM_NUM_PRIMITIVES; ++i) {
|
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)
|
if (module->func[i] == NULL)
|
||||||
openpam_log(PAM_LOG_DEBUG, "%s: %s(): %s",
|
openpam_log(PAM_LOG_DEBUG, "%s: %s(): %s",
|
||||||
path, _pam_sm_func_name[i], dlerror());
|
path, _pam_sm_func_name[i], dlerror());
|
||||||
}
|
}
|
||||||
return (module);
|
return (module);
|
||||||
buf_err:
|
buf_err:
|
||||||
openpam_log(PAM_LOG_ERROR, "%m");
|
|
||||||
if (dlh != NULL)
|
if (dlh != NULL)
|
||||||
dlclose(dlh);
|
dlclose(dlh);
|
||||||
FREE(module);
|
FREE(module);
|
||||||
|
err:
|
||||||
|
openpam_log(PAM_LOG_ERROR, "%m");
|
||||||
return (NULL);
|
return (NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue