libpam_internal: supply debug functionality

Move function bodies from headers into dedicated object files stored in
libpam_internal. This library won't be installed.

Keep the debug function body in header, even though disabled when
building Linux-PAM, to stay API compatible with previous versions.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>

14 files changed, 33 insertions, 17 deletions

diff --git a/modules/pam_access/Makefile.am b/modules/pam_access/Makefile.am
index 99785484..6e61c428 100644
--- a/modules/pam_access/Makefile.am
+++ b/modules/pam_access/Makefile.am
@@ -28,7 +28,8 @@ if HAVE_VERSIONING
 endif
 
 securelib_LTLIBRARIES = pam_access.la
-pam_access_la_LIBADD = $(top_builddir)/libpam/libpam.la
+pam_access_la_LIBADD = $(top_builddir)/libpam_internal/libpam_internal.la \
+		       $(top_builddir)/libpam/libpam.la
 
 dist_secureconf_DATA = access.conf
 
diff --git a/modules/pam_debug/Makefile.am b/modules/pam_debug/Makefile.am
index 5b3bffcb..62e4a360 100644
--- a/modules/pam_debug/Makefile.am
+++ b/modules/pam_debug/Makefile.am
@@ -28,7 +28,8 @@ if HAVE_VERSIONING
 endif
 
 securelib_LTLIBRARIES = pam_debug.la
-pam_debug_la_LIBADD = $(top_builddir)/libpam/libpam.la
+pam_debug_la_LIBADD = $(top_builddir)/libpam_internal/libpam_internal.la \
+		      $(top_builddir)/libpam/libpam.la
 
 check_PROGRAMS = tst-pam_debug-retval
 tst_pam_debug_retval_LDADD = $(top_builddir)/libpam/libpam.la
diff --git a/modules/pam_env/Makefile.am b/modules/pam_env/Makefile.am
index b1e2435c..cf22e9b5 100644
--- a/modules/pam_env/Makefile.am
+++ b/modules/pam_env/Makefile.am
@@ -29,7 +29,8 @@ if HAVE_VERSIONING
 endif
 
 securelib_LTLIBRARIES = pam_env.la
-pam_env_la_LIBADD = $(top_builddir)/libpam/libpam.la $(ECONF_LIBS)
+pam_env_la_LIBADD = $(top_builddir)/libpam_internal/libpam_internal.la \
+		    $(top_builddir)/libpam/libpam.la $(ECONF_LIBS)
 
 check_PROGRAMS = tst-pam_env-retval
 tst_pam_env_retval_LDADD = $(top_builddir)/libpam/libpam.la
diff --git a/modules/pam_group/Makefile.am b/modules/pam_group/Makefile.am
index d161eb9c..11c3654f 100644
--- a/modules/pam_group/Makefile.am
+++ b/modules/pam_group/Makefile.am
@@ -28,7 +28,8 @@ if HAVE_VERSIONING
 endif
 
 securelib_LTLIBRARIES = pam_group.la
-pam_group_la_LIBADD = $(top_builddir)/libpam/libpam.la
+pam_group_la_LIBADD = $(top_builddir)/libpam_internal/libpam_internal.la \
+		      $(top_builddir)/libpam/libpam.la
 
 dist_secureconf_DATA = group.conf
 
diff --git a/modules/pam_issue/Makefile.am b/modules/pam_issue/Makefile.am
index c07f1220..649444db 100644
--- a/modules/pam_issue/Makefile.am
+++ b/modules/pam_issue/Makefile.am
@@ -28,7 +28,8 @@ if HAVE_VERSIONING
 endif
 
 securelib_LTLIBRARIES = pam_issue.la
-pam_issue_la_LIBADD = $(top_builddir)/libpam/libpam.la $(SYSTEMD_LIBS)
+pam_issue_la_LIBADD = $(top_builddir)/libpam_internal/libpam_internal.la \
+		      $(top_builddir)/libpam/libpam.la $(SYSTEMD_LIBS)
 
 if ENABLE_REGENERATE_MAN
 dist_noinst_DATA = README
diff --git a/modules/pam_lastlog/Makefile.am b/modules/pam_lastlog/Makefile.am
index 1d25d480..893ef1f3 100644
--- a/modules/pam_lastlog/Makefile.am
+++ b/modules/pam_lastlog/Makefile.am
@@ -28,7 +28,8 @@ if HAVE_VERSIONING
 endif
 
 securelib_LTLIBRARIES = pam_lastlog.la
-pam_lastlog_la_LIBADD = $(top_builddir)/libpam/libpam.la -lutil
+pam_lastlog_la_LIBADD = $(top_builddir)/libpam_internal/libpam_internal.la \
+			$(top_builddir)/libpam/libpam.la -lutil
 
 if ENABLE_REGENERATE_MAN
 dist_noinst_DATA = README
diff --git a/modules/pam_limits/Makefile.am b/modules/pam_limits/Makefile.am
index c60ddd06..ab3cf33e 100644
--- a/modules/pam_limits/Makefile.am
+++ b/modules/pam_limits/Makefile.am
@@ -31,7 +31,8 @@ if HAVE_VERSIONING
 endif
 
 securelib_LTLIBRARIES = pam_limits.la
-pam_limits_la_LIBADD = $(top_builddir)/libpam/libpam.la
+pam_limits_la_LIBADD = $(top_builddir)/libpam_internal/libpam_internal.la \
+		       $(top_builddir)/libpam/libpam.la
 
 dist_secureconf_DATA = limits.conf
 
diff --git a/modules/pam_mail/Makefile.am b/modules/pam_mail/Makefile.am
index 1dff98e9..585d3475 100644
--- a/modules/pam_mail/Makefile.am
+++ b/modules/pam_mail/Makefile.am
@@ -28,7 +28,8 @@ if HAVE_VERSIONING
 endif
 
 securelib_LTLIBRARIES = pam_mail.la
-pam_mail_la_LIBADD = $(top_builddir)/libpam/libpam.la
+pam_mail_la_LIBADD = $(top_builddir)/libpam_internal/libpam_internal.la \
+		     $(top_builddir)/libpam/libpam.la
 
 if ENABLE_REGENERATE_MAN
 dist_noinst_DATA = README
diff --git a/modules/pam_mkhomedir/Makefile.am b/modules/pam_mkhomedir/Makefile.am
index 111525d8..60c059c1 100644
--- a/modules/pam_mkhomedir/Makefile.am
+++ b/modules/pam_mkhomedir/Makefile.am
@@ -27,7 +27,8 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include \
 
 securelib_LTLIBRARIES = pam_mkhomedir.la
 pam_mkhomedir_la_SOURCES = pam_mkhomedir.c
-pam_mkhomedir_la_LIBADD = $(top_builddir)/libpam/libpam.la
+pam_mkhomedir_la_LIBADD = $(top_builddir)/libpam_internal/libpam_internal.la \
+			  $(top_builddir)/libpam/libpam.la
 pam_mkhomedir_la_LDFLAGS = -no-undefined -avoid-version -module
 if HAVE_VERSIONING
   pam_mkhomedir_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
diff --git a/modules/pam_motd/Makefile.am b/modules/pam_motd/Makefile.am
index e67e774e..06fbbb10 100644
--- a/modules/pam_motd/Makefile.am
+++ b/modules/pam_motd/Makefile.am
@@ -28,7 +28,8 @@ if HAVE_VERSIONING
 endif
 
 securelib_LTLIBRARIES = pam_motd.la
-pam_motd_la_LIBADD = $(top_builddir)/libpam/libpam.la
+pam_motd_la_LIBADD = $(top_builddir)/libpam_internal/libpam_internal.la \
+		     $(top_builddir)/libpam/libpam.la
 
 if ENABLE_REGENERATE_MAN
 dist_noinst_DATA = README
diff --git a/modules/pam_permit/Makefile.am b/modules/pam_permit/Makefile.am
index 62170418..43212758 100644
--- a/modules/pam_permit/Makefile.am
+++ b/modules/pam_permit/Makefile.am
@@ -28,7 +28,8 @@ if HAVE_VERSIONING
 endif
 
 securelib_LTLIBRARIES = pam_permit.la
-pam_permit_la_LIBADD = $(top_builddir)/libpam/libpam.la
+pam_permit_la_LIBADD = $(top_builddir)/libpam_internal/libpam_internal.la \
+		       $(top_builddir)/libpam/libpam.la
 
 check_PROGRAMS = tst-pam_permit-retval
 tst_pam_permit_retval_LDADD = $(top_builddir)/libpam/libpam.la
diff --git a/modules/pam_stress/Makefile.am b/modules/pam_stress/Makefile.am
index 606c9155..5959873a 100644
--- a/modules/pam_stress/Makefile.am
+++ b/modules/pam_stress/Makefile.am
@@ -27,7 +27,8 @@ if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
 endif
 securelib_LTLIBRARIES = pam_stress.la
-pam_stress_la_LIBADD = $(top_builddir)/libpam/libpam.la
+pam_stress_la_LIBADD = $(top_builddir)/libpam_internal/libpam_internal.la \
+		       $(top_builddir)/libpam/libpam.la
 
 if ENABLE_REGENERATE_MAN
 dist_noinst_DATA = README
diff --git a/modules/pam_time/Makefile.am b/modules/pam_time/Makefile.am
index 9a97ca47..20b73f07 100644
--- a/modules/pam_time/Makefile.am
+++ b/modules/pam_time/Makefile.am
@@ -26,7 +26,8 @@ AM_LDFLAGS = -no-undefined -avoid-version -module
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
 endif
-pam_time_la_LIBADD = $(top_builddir)/libpam/libpam.la
+pam_time_la_LIBADD = $(top_builddir)/libpam_internal/libpam_internal.la \
+		     $(top_builddir)/libpam/libpam.la
 
 securelib_LTLIBRARIES = pam_time.la
 dist_secureconf_DATA = time.conf
diff --git a/modules/pam_unix/Makefile.am b/modules/pam_unix/Makefile.am
index 0deceacb..a78cbf5b 100644
--- a/modules/pam_unix/Makefile.am
+++ b/modules/pam_unix/Makefile.am
@@ -38,7 +38,8 @@ pam_unix_la_LDFLAGS = -no-undefined -avoid-version -module
 if HAVE_VERSIONING
   pam_unix_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
 endif
-pam_unix_la_LIBADD = $(top_builddir)/libpam/libpam.la \
+pam_unix_la_LIBADD = $(top_builddir)/libpam_internal/libpam_internal.la \
+	$(top_builddir)/libpam/libpam.la \
 	@LIBCRYPT@ @LIBSELINUX@ @TIRPC_LIBS@ @NSL_LIBS@
 
 securelib_LTLIBRARIES = pam_unix.la
@@ -61,20 +62,22 @@ endif
 
 bigcrypt_SOURCES = bigcrypt.c bigcrypt_main.c
 bigcrypt_CFLAGS = $(AM_CFLAGS)
-bigcrypt_LDADD = @LIBCRYPT@
+bigcrypt_LDADD = $(top_builddir)/libpam_internal/libpam_internal.la @LIBCRYPT@
 
 unix_chkpwd_SOURCES = unix_chkpwd.c audit.c md5_good.c md5_broken.c bigcrypt.c \
 	passverify.c
 unix_chkpwd_CFLAGS = $(AM_CFLAGS) @EXE_CFLAGS@ -DHELPER_COMPILE=\"unix_chkpwd\"
 unix_chkpwd_LDFLAGS = @EXE_LDFLAGS@
-unix_chkpwd_LDADD = @LIBCRYPT@ @LIBSELINUX@ @LIBAUDIT@
+unix_chkpwd_LDADD = $(top_builddir)/libpam_internal/libpam_internal.la \
+		    @LIBCRYPT@ @LIBSELINUX@ @LIBAUDIT@
 
 if WITH_SELINUX
 unix_update_SOURCES = unix_update.c audit.c md5_good.c md5_broken.c bigcrypt.c \
 	passverify.c
 unix_update_CFLAGS = $(AM_CFLAGS) @EXE_CFLAGS@ -DHELPER_COMPILE=\"unix_update\"
 unix_update_LDFLAGS = @EXE_LDFLAGS@
-unix_update_LDADD = @LIBCRYPT@ @LIBSELINUX@ @LIBAUDIT@
+unix_update_LDADD = $(top_builddir)/libpam_internal/libpam_internal.la \
+		    @LIBCRYPT@ @LIBSELINUX@ @LIBAUDIT@
 endif
 
 if ENABLE_REGENERATE_MAN