Relevant BUGIDs:

Purpose of commit: bugfixes

Commit summary:
---------------

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.

diff --git a/ChangeLog b/ChangeLog
index f42dd1d391ff1ff7d5df63a6f3f4ef326b15e784..5905e1f72905f49c884d836772790489b848abcc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/README b/README
index 86cf1838a68d67e73e8a560517cfa703b8a95f3e..81159140a689c9d7bfcc31c60f601415135ed68c 100644 (file)
--- a/README
+++ b/README
@@ -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 ca8be05eb137695e9b45924746d94502f82010d5..52e5caab2bc83ed6271b0baaaa5183660a26681d 100644 (file)
--- 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 0c188fdc8ccae1a3e5e2f064b3ab90922bb7264e..0daca4233c6224277be72d576b7901a064fbbaaa 100644 (file)
--- 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 42dcf8f057c28e7fb6a5a3b61f9bdcbe03df857e..a66b486dd243a1c4a2e361d90919c512f10eb493 100644 (file)
--- 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 377fc2c59d1ac325d7b5f447157e3b3fb73dec59..47f95030ece15c7b048d4c2795089cad80ba2c46 100644 (file)
--- 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,