diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | doc/man/Makefile.am | 2 | ||||
| -rw-r--r-- | libpam/Makefile.am | 2 | ||||
| -rw-r--r-- | libpam/pam_static_modules.h | 2 | ||||
| -rw-r--r-- | modules/pam_sepermit/pam_sepermit.c | 2 |
6 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,12 @@ +2008-02-04 Thorsten Kukuk <kukuk@thkukuk.de> + + * libpam/pam_static_modules.h: Add _pam_sepermit_modstruct. + * modules/pam_sepermit/pam_sepermit.c: Fix typo. + + * README: Add --disable-pie to configure options for static library. + + * doc/man/Makefile.am: Fix building outside of src directory. + 2008-02-01 Tomas Mraz <t8m@centrum.cz> * modules/pam_namespace/namespace.conf.5.xml: Add documentation for @@ -50,7 +50,7 @@ Backup all important data before! If you do not wish to make the modules dynamically loadable, but build a static libpam including all PAM modules, you have to call: - ./configure --enable-static-modules + ./configure --enable-static-modules --disable-pie In this case you cannot use pam_unix in the PAM config files instead you have to use pam_unix_acct, pam_unix_auth, pam_unix_passwd and diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index ca8be05e..52e5caab 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -47,7 +47,7 @@ XMLS = pam.3.xml pam.8.xml \ if ENABLE_REGENERATE_MAN PAM.8: pam.8 pam.d.5: pam.conf.5 - test -f pam\\.d.5 && mv pam\\.d.5 pam.d.5 + test -f $(srcdir)/pam\\.d.5 && mv $(srcdir)/pam\\.d.5 $(srcdir)/pam.d.5 ||: pam_get_item.3: pam_item_types_std.inc.xml pam_item_types_ext.inc.xml pam_set_data.3: pam_item_types_std.inc.xml pam_item_types_ext.inc.xml diff --git a/libpam/Makefile.am b/libpam/Makefile.am index 0c188fdc..0daca423 100644 --- a/libpam/Makefile.am +++ b/libpam/Makefile.am @@ -20,7 +20,7 @@ include_HEADERS = include/security/_pam_compat.h \ noinst_HEADERS = pam_prelude.h pam_private.h pam_tokens.h \ pam_modutil_private.h pam_static_modules.h -libpam_la_LDFLAGS = -no-undefined -version-info 81:9:81 +libpam_la_LDFLAGS = -no-undefined -version-info 81:10:81 libpam_la_LIBADD = @LIBAUDIT@ $(LIBPRELUDE_LIBS) @LIBDL@ if STATIC_MODULES diff --git a/libpam/pam_static_modules.h b/libpam/pam_static_modules.h index 42dcf8f0..a66b486d 100644 --- a/libpam/pam_static_modules.h +++ b/libpam/pam_static_modules.h @@ -67,6 +67,7 @@ extern struct pam_module _pam_rootok_modstruct; extern struct pam_module _pam_securetty_modstruct; #ifdef WITH_SELINUX extern struct pam_module _pam_selinux_modstruct; +extern struct pam_module _pam_sepermit_modstruct; #endif extern struct pam_module _pam_shells_modstruct; extern struct pam_module _pam_stress_modstruct; @@ -124,6 +125,7 @@ static struct pam_module *static_modules[] = { &_pam_securetty_modstruct, #ifdef WITH_SELINUX &_pam_selinux_modstruct, + &_pam_sepermit_modstruct, #endif &_pam_shells_modstruct, &_pam_stress_modstruct, diff --git a/modules/pam_sepermit/pam_sepermit.c b/modules/pam_sepermit/pam_sepermit.c index 377fc2c5..47f95030 100644 --- a/modules/pam_sepermit/pam_sepermit.c +++ b/modules/pam_sepermit/pam_sepermit.c @@ -392,7 +392,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, /* static module data */ -struct pam_module _pam_access_modstruct = { +struct pam_module _pam_sepermit_modstruct = { "pam_sepermit", pam_sm_authenticate, pam_sm_setcred, |