summaryrefslogtreecommitdiff
path: root/libpam
diff options
context:
space:
mode:
authorThorsten Kukuk <kukuk@thkukuk.de>2007-11-06 14:46:57 +0000
committerThorsten Kukuk <kukuk@thkukuk.de>2007-11-06 14:46:57 +0000
commita38a8eae25ee1d7adb5a5eafcf1c41e94974ed90 (patch)
treef4e4ba1dd2aa06bfdba08f88cdd0fd05cac8b5b3 /libpam
parent675a1e8f0b0227cae757fdfa197fff944730b516 (diff)
Relevant BUGIDs: 1822779
Purpose of commit: bugfix Commit summary: --------------- 2007-11-06 Thorsten Kukuk <kukuk@thkukuk.de> * libpam/pam_static_modules.h: Fix name of pam_namespace variable. 2007-10-30 Peter Breitenlohner <peb@mppmu.mpg.de> * tests/tst-dlopen.c: Return 77 in case of static modules, such that all modules/pam_*/tst-pam_* tests yield SKIP instead of FAIL. * libpam/Makefile.am (libpam_la_LIBADD): Use "$(shell ls ...)" instead of "`ls ...`", to allow for static modules. * libpam/pam_static_modules.h: Make pam_keyinit module depend on HAVE_KEY_MANAGEMENT; correct name of pam_faildelay pam_module struct. * modules/pam_faildelay/pam_faildelay.c: Correct name of pam_module struct.
Diffstat (limited to 'libpam')
-rw-r--r--libpam/Makefile.am2
-rw-r--r--libpam/pam_static_modules.h10
2 files changed, 8 insertions, 4 deletions
diff --git a/libpam/Makefile.am b/libpam/Makefile.am
index a0955441..0c188fdc 100644
--- a/libpam/Makefile.am
+++ b/libpam/Makefile.am
@@ -24,7 +24,7 @@ libpam_la_LDFLAGS = -no-undefined -version-info 81:9:81
libpam_la_LIBADD = @LIBAUDIT@ $(LIBPRELUDE_LIBS) @LIBDL@
if STATIC_MODULES
- libpam_la_LIBADD += `ls ../modules/pam_*/*.lo` \
+ libpam_la_LIBADD += $(shell ls ../modules/pam_*/*.lo) \
@LIBDB@ @LIBCRYPT@ @LIBNSL@ @LIBCRACK@ -lutil
endif
if HAVE_VERSIONING
diff --git a/libpam/pam_static_modules.h b/libpam/pam_static_modules.h
index 27b70826..5445c5fe 100644
--- a/libpam/pam_static_modules.h
+++ b/libpam/pam_static_modules.h
@@ -45,7 +45,9 @@ extern struct pam_module _pam_filter_modstruct;
extern struct pam_module _pam_ftp_modstruct;
extern struct pam_module _pam_group_modstruct;
extern struct pam_module _pam_issue_modstruct;
+#ifdef HAVE_KEY_MANAGEMENT
extern struct pam_module _pam_keyinit_modstruct;
+#endif
extern struct pam_module _pam_lastlog_modstruct;
extern struct pam_module _pam_limits_modstruct;
extern struct pam_module _pam_listfile_modstruct;
@@ -55,7 +57,7 @@ extern struct pam_module _pam_mail_modstruct;
extern struct pam_module _pam_mkhomedir_modstruct;
extern struct pam_module _pam_motd_modstruct;
#ifdef HAVE_UNSHARE
-extern struct pam_module _pam_namespace;
+extern struct pam_module _pam_namespace_modstruct;
#endif
extern struct pam_module _pam_nologin_modstruct;
extern struct pam_module _pam_permit_modstruct;
@@ -92,12 +94,14 @@ static struct pam_module *static_modules[] = {
&_pam_echo_modstruct,
&_pam_env_modstruct,
&_pam_exec_modstruct,
- &_pam_faildelay,
+ &_pam_faildelay_modstruct,
&_pam_filter_modstruct,
&_pam_ftp_modstruct,
&_pam_group_modstruct,
&_pam_issue_modstruct,
+#ifdef HAVE_KEY_MANAGEMENT
&_pam_keyinit_modstruct,
+#endif
&_pam_lastlog_modstruct,
&_pam_limits_modstruct,
&_pam_listfile_modstruct,
@@ -107,7 +111,7 @@ static struct pam_module *static_modules[] = {
&_pam_mkhomedir_modstruct,
&_pam_motd_modstruct,
#ifdef HAVE_UNSHARE
- &_pam_namespace,
+ &_pam_namespace_modstruct,
#endif
&_pam_nologin_modstruct,
&_pam_permit_modstruct,