MFV (r255364): move the code around in preparation for Nummularia.

85 files changed, 15 insertions, 11 deletions

diff --git a/contrib/openpam/Makefile.am b/contrib/openpam/Makefile.am
index 5c4fbf3..8e236a7 100644
--- a/contrib/openpam/Makefile.am
+++ b/contrib/openpam/Makefile.am
@@ -2,7 +2,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = lib bin modules include
+SUBDIRS = lib/libpam bin modules include
 
 if WITH_DOC
 SUBDIRS += doc
diff --git a/contrib/openpam/bin/openpam_dump_policy/Makefile.am b/contrib/openpam/bin/openpam_dump_policy/Makefile.am
index a5fda16..2af2eaf 100644
--- a/contrib/openpam/bin/openpam_dump_policy/Makefile.am
+++ b/contrib/openpam/bin/openpam_dump_policy/Makefile.am
@@ -1,7 +1,7 @@
 # $Id: Makefile.am 538 2012-03-31 17:04:29Z des $
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam
 
 noinst_PROGRAMS = openpam_dump_policy
 openpam_dump_policy_SOURCES = openpam_dump_policy.c
-openpam_dump_policy_LDADD = $(top_builddir)/lib/libpam.la
+openpam_dump_policy_LDADD = $(top_builddir)/lib/libpam/libpam.la
diff --git a/contrib/openpam/bin/pamtest/Makefile.am b/contrib/openpam/bin/pamtest/Makefile.am
index 80694de..943872c 100644
--- a/contrib/openpam/bin/pamtest/Makefile.am
+++ b/contrib/openpam/bin/pamtest/Makefile.am
@@ -4,6 +4,6 @@ INCLUDES = -I$(top_srcdir)/include
 
 bin_PROGRAMS = pamtest
 pamtest_SOURCES = pamtest.c
-pamtest_LDADD = $(top_builddir)/lib/libpam.la
+pamtest_LDADD = $(top_builddir)/lib/libpam/libpam.la
 
 dist_man1_MANS = pamtest.1
diff --git a/contrib/openpam/bin/su/Makefile.am b/contrib/openpam/bin/su/Makefile.am
index 50f0cb9..b0462c8 100644
--- a/contrib/openpam/bin/su/Makefile.am
+++ b/contrib/openpam/bin/su/Makefile.am
@@ -4,6 +4,6 @@ INCLUDES = -I$(top_srcdir)/include
 
 bin_PROGRAMS = su
 su_SOURCES = su.c
-su_LDADD = $(top_builddir)/lib/libpam.la
+su_LDADD = $(top_builddir)/lib/libpam/libpam.la
 
 dist_man1_MANS = su.1
diff --git a/contrib/openpam/configure.ac b/contrib/openpam/configure.ac
index fb30726..4abd34d 100644
--- a/contrib/openpam/configure.ac
+++ b/contrib/openpam/configure.ac
@@ -3,7 +3,7 @@ dnl $Id: configure.ac 610 2012-05-26 14:03:45Z des $
 AC_PREREQ([2.62])
 AC_REVISION([$Id: configure.ac 610 2012-05-26 14:03:45Z des $])
 AC_INIT([OpenPAM], [20120526], [des@des.no])
-AC_CONFIG_SRCDIR([lib/pam_start.c])
+AC_CONFIG_SRCDIR([lib/libpam/pam_start.c])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
 AM_CONFIG_HEADER([config.h])
@@ -119,7 +119,7 @@ AC_CONFIG_FILES([
     doc/man/Makefile
     include/Makefile
     include/security/Makefile
-    lib/Makefile
+    lib/libpam/Makefile
     modules/Makefile
     modules/pam_deny/Makefile
     modules/pam_permit/Makefile
diff --git a/contrib/openpam/doc/man/Makefile.am b/contrib/openpam/doc/man/Makefile.am
index 4062a54..947710a 100644
--- a/contrib/openpam/doc/man/Makefile.am
+++ b/contrib/openpam/doc/man/Makefile.am
@@ -73,7 +73,7 @@ CLEANFILES = $(ALLCMAN) openpam.3 pam.3
 
 GENDOC = $(top_srcdir)/misc/gendoc.pl
 
-LIBSRCDIR = $(top_srcdir)/lib
+LIBSRCDIR = $(top_srcdir)/lib/libpam
 
 VPATH = $(LIBSRCDIR) $(srcdir)
 
diff --git a/contrib/openpam/lib/Makefile.am b/contrib/openpam/lib/libpam/Makefile.am
index 9ce2d2f..9ce2d2f 100644
--- a/contrib/openpam/lib/Makefile.am
+++ b/contrib/openpam/lib/libpam/Makefile.am
diff --git a/contrib/openpam/lib/Makefile.in b/contrib/openpam/lib/libpam/Makefile.in
index 353fbab..353fbab 100644
--- a/contrib/openpam/lib/Makefile.in
+++ b/contrib/openpam/lib/libpam/Makefile.in
diff --git a/contrib/openpam/lib/openpam_borrow_cred.c b/contrib/openpam/lib/libpam/openpam_borrow_cred.c
index e0dfc55..e0dfc55 100644
--- a/contrib/openpam/lib/openpam_borrow_cred.c
+++ b/contrib/openpam/lib/libpam/openpam_borrow_cred.c
diff --git a/contrib/openpam/lib/openpam_check_owner_perms.c b/contrib/openpam/lib/libpam/openpam_check_owner_perms.c
index d3b2ca9..d3b2ca9 100644
--- a/contrib/openpam/lib/openpam_check_owner_perms.c
+++ b/contrib/openpam/lib/libpam/openpam_check_owner_perms.c
diff --git a/contrib/openpam/lib/openpam_configure.c b/contrib/openpam/lib/libpam/openpam_configure.c
index 8172a6f..8172a6f 100644
--- a/contrib/openpam/lib/openpam_configure.c
+++ b/contrib/openpam/lib/libpam/openpam_configure.c
diff --git a/contrib/openpam/lib/openpam_constants.c b/contrib/openpam/lib/libpam/openpam_constants.c
index 833e81f..833e81f 100644
--- a/contrib/openpam/lib/openpam_constants.c
+++ b/contrib/openpam/lib/libpam/openpam_constants.c
diff --git a/contrib/openpam/lib/openpam_constants.h b/contrib/openpam/lib/libpam/openpam_constants.h
index a7d6ce8..a7d6ce8 100644
--- a/contrib/openpam/lib/openpam_constants.h
+++ b/contrib/openpam/lib/libpam/openpam_constants.h
diff --git a/contrib/openpam/lib/openpam_ctype.h b/contrib/openpam/lib/libpam/openpam_ctype.h
index b3ec846..b3ec846 100644
--- a/contrib/openpam/lib/openpam_ctype.h
+++ b/contrib/openpam/lib/libpam/openpam_ctype.h
diff --git a/contrib/openpam/lib/openpam_debug.h b/contrib/openpam/lib/libpam/openpam_debug.h
index 050783e..050783e 100644
--- a/contrib/openpam/lib/openpam_debug.h
+++ b/contrib/openpam/lib/libpam/openpam_debug.h
diff --git a/contrib/openpam/lib/openpam_dispatch.c b/contrib/openpam/lib/libpam/openpam_dispatch.c
index 54dfd3b..54dfd3b 100644
--- a/contrib/openpam/lib/openpam_dispatch.c
+++ b/contrib/openpam/lib/libpam/openpam_dispatch.c
diff --git a/contrib/openpam/lib/openpam_dynamic.c b/contrib/openpam/lib/libpam/openpam_dynamic.c
index 1dfc1ac..1dfc1ac 100644
--- a/contrib/openpam/lib/openpam_dynamic.c
+++ b/contrib/openpam/lib/libpam/openpam_dynamic.c
diff --git a/contrib/openpam/lib/openpam_features.c b/contrib/openpam/lib/libpam/openpam_features.c
index 586fc2a..586fc2a 100644
--- a/contrib/openpam/lib/openpam_features.c
+++ b/contrib/openpam/lib/libpam/openpam_features.c
diff --git a/contrib/openpam/lib/openpam_features.h b/contrib/openpam/lib/libpam/openpam_features.h
index 227b1a9..227b1a9 100644
--- a/contrib/openpam/lib/openpam_features.h
+++ b/contrib/openpam/lib/libpam/openpam_features.h
diff --git a/contrib/openpam/lib/openpam_findenv.c b/contrib/openpam/lib/libpam/openpam_findenv.c
index b833ec9..b833ec9 100644
--- a/contrib/openpam/lib/openpam_findenv.c
+++ b/contrib/openpam/lib/libpam/openpam_findenv.c
diff --git a/contrib/openpam/lib/openpam_free_data.c b/contrib/openpam/lib/libpam/openpam_free_data.c
index 561687c..561687c 100644
--- a/contrib/openpam/lib/openpam_free_data.c
+++ b/contrib/openpam/lib/libpam/openpam_free_data.c
diff --git a/contrib/openpam/lib/openpam_free_envlist.c b/contrib/openpam/lib/libpam/openpam_free_envlist.c
index 14754dc..14754dc 100644
--- a/contrib/openpam/lib/openpam_free_envlist.c
+++ b/contrib/openpam/lib/libpam/openpam_free_envlist.c
diff --git a/contrib/openpam/lib/openpam_get_feature.c b/contrib/openpam/lib/libpam/openpam_get_feature.c
index b552357..b552357 100644
--- a/contrib/openpam/lib/openpam_get_feature.c
+++ b/contrib/openpam/lib/libpam/openpam_get_feature.c
diff --git a/contrib/openpam/lib/openpam_get_option.c b/contrib/openpam/lib/libpam/openpam_get_option.c
index 1f62d21..1f62d21 100644
--- a/contrib/openpam/lib/openpam_get_option.c
+++ b/contrib/openpam/lib/libpam/openpam_get_option.c
diff --git a/contrib/openpam/lib/openpam_impl.h b/contrib/openpam/lib/libpam/openpam_impl.h
index 9e8b45f..9e8b45f 100644
--- a/contrib/openpam/lib/openpam_impl.h
+++ b/contrib/openpam/lib/libpam/openpam_impl.h
diff --git a/contrib/openpam/lib/openpam_load.c b/contrib/openpam/lib/libpam/openpam_load.c
index 871d1a8..871d1a8 100644
--- a/contrib/openpam/lib/openpam_load.c
+++ b/contrib/openpam/lib/libpam/openpam_load.c
diff --git a/contrib/openpam/lib/openpam_log.c b/contrib/openpam/lib/libpam/openpam_log.c
index 39c2770..2b89f6c 100644
--- a/contrib/openpam/lib/openpam_log.c
+++ b/contrib/openpam/lib/libpam/openpam_log.c
@@ -49,7 +49,11 @@
 
 #include "openpam_impl.h"
 
+#ifdef OPENPAM_DEBUG
+int openpam_debug = 1;
+#else
 int openpam_debug = 0;
+#endif
 
 #if !defined(openpam_log)
 
diff --git a/contrib/openpam/lib/openpam_nullconv.c b/contrib/openpam/lib/libpam/openpam_nullconv.c
index a95b1e0..a95b1e0 100644
--- a/contrib/openpam/lib/openpam_nullconv.c
+++ b/contrib/openpam/lib/libpam/openpam_nullconv.c
diff --git a/contrib/openpam/lib/openpam_readline.c b/contrib/openpam/lib/libpam/openpam_readline.c
index 047ab8369..047ab8369 100644
--- a/contrib/openpam/lib/openpam_readline.c
+++ b/contrib/openpam/lib/libpam/openpam_readline.c
diff --git a/contrib/openpam/lib/openpam_readlinev.c b/contrib/openpam/lib/libpam/openpam_readlinev.c
index 5a43b61..5a43b61 100644
--- a/contrib/openpam/lib/openpam_readlinev.c
+++ b/contrib/openpam/lib/libpam/openpam_readlinev.c
diff --git a/contrib/openpam/lib/openpam_readword.c b/contrib/openpam/lib/libpam/openpam_readword.c
index 1c0e9b6..1c0e9b6 100644
--- a/contrib/openpam/lib/openpam_readword.c
+++ b/contrib/openpam/lib/libpam/openpam_readword.c
diff --git a/contrib/openpam/lib/openpam_restore_cred.c b/contrib/openpam/lib/libpam/openpam_restore_cred.c
index 41d44d0..41d44d0 100644
--- a/contrib/openpam/lib/openpam_restore_cred.c
+++ b/contrib/openpam/lib/libpam/openpam_restore_cred.c
diff --git a/contrib/openpam/lib/openpam_set_feature.c b/contrib/openpam/lib/libpam/openpam_set_feature.c
index 4f6a4a5..4f6a4a5 100644
--- a/contrib/openpam/lib/openpam_set_feature.c
+++ b/contrib/openpam/lib/libpam/openpam_set_feature.c
diff --git a/contrib/openpam/lib/openpam_set_option.c b/contrib/openpam/lib/libpam/openpam_set_option.c
index 1712a71..1712a71 100644
--- a/contrib/openpam/lib/openpam_set_option.c
+++ b/contrib/openpam/lib/libpam/openpam_set_option.c
diff --git a/contrib/openpam/lib/openpam_static.c b/contrib/openpam/lib/libpam/openpam_static.c
index 40b807c..40b807c 100644
--- a/contrib/openpam/lib/openpam_static.c
+++ b/contrib/openpam/lib/libpam/openpam_static.c
diff --git a/contrib/openpam/lib/openpam_straddch.c b/contrib/openpam/lib/libpam/openpam_straddch.c
index 9845cc6..9845cc6 100644
--- a/contrib/openpam/lib/openpam_straddch.c
+++ b/contrib/openpam/lib/libpam/openpam_straddch.c
diff --git a/contrib/openpam/lib/openpam_strlcat.h b/contrib/openpam/lib/libpam/openpam_strlcat.h
index 1f26693..1f26693 100644
--- a/contrib/openpam/lib/openpam_strlcat.h
+++ b/contrib/openpam/lib/libpam/openpam_strlcat.h
diff --git a/contrib/openpam/lib/openpam_strlcmp.h b/contrib/openpam/lib/libpam/openpam_strlcmp.h
index 2a78e0f..2a78e0f 100644
--- a/contrib/openpam/lib/openpam_strlcmp.h
+++ b/contrib/openpam/lib/libpam/openpam_strlcmp.h
diff --git a/contrib/openpam/lib/openpam_strlcpy.h b/contrib/openpam/lib/libpam/openpam_strlcpy.h
index 9c65548..9c65548 100644
--- a/contrib/openpam/lib/openpam_strlcpy.h
+++ b/contrib/openpam/lib/libpam/openpam_strlcpy.h
diff --git a/contrib/openpam/lib/openpam_subst.c b/contrib/openpam/lib/libpam/openpam_subst.c
index bab7a78..bab7a78 100644
--- a/contrib/openpam/lib/openpam_subst.c
+++ b/contrib/openpam/lib/libpam/openpam_subst.c
diff --git a/contrib/openpam/lib/openpam_ttyconv.c b/contrib/openpam/lib/libpam/openpam_ttyconv.c
index 14a324d..14a324d 100644
--- a/contrib/openpam/lib/openpam_ttyconv.c
+++ b/contrib/openpam/lib/libpam/openpam_ttyconv.c
diff --git a/contrib/openpam/lib/pam_acct_mgmt.c b/contrib/openpam/lib/libpam/pam_acct_mgmt.c
index 49c34ab..49c34ab 100644
--- a/contrib/openpam/lib/pam_acct_mgmt.c
+++ b/contrib/openpam/lib/libpam/pam_acct_mgmt.c
diff --git a/contrib/openpam/lib/pam_authenticate.c b/contrib/openpam/lib/libpam/pam_authenticate.c
index fc6c20f..fc6c20f 100644
--- a/contrib/openpam/lib/pam_authenticate.c
+++ b/contrib/openpam/lib/libpam/pam_authenticate.c
diff --git a/contrib/openpam/lib/pam_authenticate_secondary.c b/contrib/openpam/lib/libpam/pam_authenticate_secondary.c
index 1a57313..1a57313 100644
--- a/contrib/openpam/lib/pam_authenticate_secondary.c
+++ b/contrib/openpam/lib/libpam/pam_authenticate_secondary.c
diff --git a/contrib/openpam/lib/pam_chauthtok.c b/contrib/openpam/lib/libpam/pam_chauthtok.c
index 1750b0f..1750b0f 100644
--- a/contrib/openpam/lib/pam_chauthtok.c
+++ b/contrib/openpam/lib/libpam/pam_chauthtok.c
diff --git a/contrib/openpam/lib/pam_close_session.c b/contrib/openpam/lib/libpam/pam_close_session.c
index 9e63a1d..9e63a1d 100644
--- a/contrib/openpam/lib/pam_close_session.c
+++ b/contrib/openpam/lib/libpam/pam_close_session.c
diff --git a/contrib/openpam/lib/pam_end.c b/contrib/openpam/lib/libpam/pam_end.c
index 09cde35..09cde35 100644
--- a/contrib/openpam/lib/pam_end.c
+++ b/contrib/openpam/lib/libpam/pam_end.c
diff --git a/contrib/openpam/lib/pam_error.c b/contrib/openpam/lib/libpam/pam_error.c
index 1e0de5b..1e0de5b 100644
--- a/contrib/openpam/lib/pam_error.c
+++ b/contrib/openpam/lib/libpam/pam_error.c
diff --git a/contrib/openpam/lib/pam_get_authtok.c b/contrib/openpam/lib/libpam/pam_get_authtok.c
index 1a3aebc..1a3aebc 100644
--- a/contrib/openpam/lib/pam_get_authtok.c
+++ b/contrib/openpam/lib/libpam/pam_get_authtok.c
diff --git a/contrib/openpam/lib/pam_get_data.c b/contrib/openpam/lib/libpam/pam_get_data.c
index 1a8ba1d..1a8ba1d 100644
--- a/contrib/openpam/lib/pam_get_data.c
+++ b/contrib/openpam/lib/libpam/pam_get_data.c
diff --git a/contrib/openpam/lib/pam_get_item.c b/contrib/openpam/lib/libpam/pam_get_item.c
index 95b9df6..95b9df6 100644
--- a/contrib/openpam/lib/pam_get_item.c
+++ b/contrib/openpam/lib/libpam/pam_get_item.c
diff --git a/contrib/openpam/lib/pam_get_mapped_authtok.c b/contrib/openpam/lib/libpam/pam_get_mapped_authtok.c
index 54ff6c3..54ff6c3 100644
--- a/contrib/openpam/lib/pam_get_mapped_authtok.c
+++ b/contrib/openpam/lib/libpam/pam_get_mapped_authtok.c
diff --git a/contrib/openpam/lib/pam_get_mapped_username.c b/contrib/openpam/lib/libpam/pam_get_mapped_username.c
index 4f8ac17..4f8ac17 100644
--- a/contrib/openpam/lib/pam_get_mapped_username.c
+++ b/contrib/openpam/lib/libpam/pam_get_mapped_username.c
diff --git a/contrib/openpam/lib/pam_get_user.c b/contrib/openpam/lib/libpam/pam_get_user.c
index 53245b9..53245b9 100644
--- a/contrib/openpam/lib/pam_get_user.c
+++ b/contrib/openpam/lib/libpam/pam_get_user.c
diff --git a/contrib/openpam/lib/pam_getenv.c b/contrib/openpam/lib/libpam/pam_getenv.c
index e2ebf57..e2ebf57 100644
--- a/contrib/openpam/lib/pam_getenv.c
+++ b/contrib/openpam/lib/libpam/pam_getenv.c
diff --git a/contrib/openpam/lib/pam_getenvlist.c b/contrib/openpam/lib/libpam/pam_getenvlist.c
index 06c003f..06c003f 100644
--- a/contrib/openpam/lib/pam_getenvlist.c
+++ b/contrib/openpam/lib/libpam/pam_getenvlist.c
diff --git a/contrib/openpam/lib/pam_info.c b/contrib/openpam/lib/libpam/pam_info.c
index 7e51dbf..7e51dbf 100644
--- a/contrib/openpam/lib/pam_info.c
+++ b/contrib/openpam/lib/libpam/pam_info.c
diff --git a/contrib/openpam/lib/pam_open_session.c b/contrib/openpam/lib/libpam/pam_open_session.c
index 36c59b0..36c59b0 100644
--- a/contrib/openpam/lib/pam_open_session.c
+++ b/contrib/openpam/lib/libpam/pam_open_session.c
diff --git a/contrib/openpam/lib/pam_prompt.c b/contrib/openpam/lib/libpam/pam_prompt.c
index 194e765..194e765 100644
--- a/contrib/openpam/lib/pam_prompt.c
+++ b/contrib/openpam/lib/libpam/pam_prompt.c
diff --git a/contrib/openpam/lib/pam_putenv.c b/contrib/openpam/lib/libpam/pam_putenv.c
index e1f0bc3..e1f0bc3 100644
--- a/contrib/openpam/lib/pam_putenv.c
+++ b/contrib/openpam/lib/libpam/pam_putenv.c
diff --git a/contrib/openpam/lib/pam_set_data.c b/contrib/openpam/lib/libpam/pam_set_data.c
index a8de632..a8de632 100644
--- a/contrib/openpam/lib/pam_set_data.c
+++ b/contrib/openpam/lib/libpam/pam_set_data.c
diff --git a/contrib/openpam/lib/pam_set_item.c b/contrib/openpam/lib/libpam/pam_set_item.c
index 05d538f..05d538f 100644
--- a/contrib/openpam/lib/pam_set_item.c
+++ b/contrib/openpam/lib/libpam/pam_set_item.c
diff --git a/contrib/openpam/lib/pam_set_mapped_authtok.c b/contrib/openpam/lib/libpam/pam_set_mapped_authtok.c
index d8db84f..d8db84f 100644
--- a/contrib/openpam/lib/pam_set_mapped_authtok.c
+++ b/contrib/openpam/lib/libpam/pam_set_mapped_authtok.c
diff --git a/contrib/openpam/lib/pam_set_mapped_username.c b/contrib/openpam/lib/libpam/pam_set_mapped_username.c
index 4b8f815..4b8f815 100644
--- a/contrib/openpam/lib/pam_set_mapped_username.c
+++ b/contrib/openpam/lib/libpam/pam_set_mapped_username.c
diff --git a/contrib/openpam/lib/pam_setcred.c b/contrib/openpam/lib/libpam/pam_setcred.c
index 51fb081..51fb081 100644
--- a/contrib/openpam/lib/pam_setcred.c
+++ b/contrib/openpam/lib/libpam/pam_setcred.c
diff --git a/contrib/openpam/lib/pam_setenv.c b/contrib/openpam/lib/libpam/pam_setenv.c
index 6fd4c10..6fd4c10 100644
--- a/contrib/openpam/lib/pam_setenv.c
+++ b/contrib/openpam/lib/libpam/pam_setenv.c
diff --git a/contrib/openpam/lib/pam_sm_acct_mgmt.c b/contrib/openpam/lib/libpam/pam_sm_acct_mgmt.c
index f5c14cf..f5c14cf 100644
--- a/contrib/openpam/lib/pam_sm_acct_mgmt.c
+++ b/contrib/openpam/lib/libpam/pam_sm_acct_mgmt.c
diff --git a/contrib/openpam/lib/pam_sm_authenticate.c b/contrib/openpam/lib/libpam/pam_sm_authenticate.c
index 97851af..97851af 100644
--- a/contrib/openpam/lib/pam_sm_authenticate.c
+++ b/contrib/openpam/lib/libpam/pam_sm_authenticate.c
diff --git a/contrib/openpam/lib/pam_sm_authenticate_secondary.c b/contrib/openpam/lib/libpam/pam_sm_authenticate_secondary.c
index 3f3f6bd..3f3f6bd 100644
--- a/contrib/openpam/lib/pam_sm_authenticate_secondary.c
+++ b/contrib/openpam/lib/libpam/pam_sm_authenticate_secondary.c
diff --git a/contrib/openpam/lib/pam_sm_chauthtok.c b/contrib/openpam/lib/libpam/pam_sm_chauthtok.c
index 593344c..593344c 100644
--- a/contrib/openpam/lib/pam_sm_chauthtok.c
+++ b/contrib/openpam/lib/libpam/pam_sm_chauthtok.c
diff --git a/contrib/openpam/lib/pam_sm_close_session.c b/contrib/openpam/lib/libpam/pam_sm_close_session.c
index 290f497..290f497 100644
--- a/contrib/openpam/lib/pam_sm_close_session.c
+++ b/contrib/openpam/lib/libpam/pam_sm_close_session.c
diff --git a/contrib/openpam/lib/pam_sm_get_mapped_authtok.c b/contrib/openpam/lib/libpam/pam_sm_get_mapped_authtok.c
index e86e6e5..e86e6e5 100644
--- a/contrib/openpam/lib/pam_sm_get_mapped_authtok.c
+++ b/contrib/openpam/lib/libpam/pam_sm_get_mapped_authtok.c
diff --git a/contrib/openpam/lib/pam_sm_get_mapped_username.c b/contrib/openpam/lib/libpam/pam_sm_get_mapped_username.c
index 596ca6c..596ca6c 100644
--- a/contrib/openpam/lib/pam_sm_get_mapped_username.c
+++ b/contrib/openpam/lib/libpam/pam_sm_get_mapped_username.c
diff --git a/contrib/openpam/lib/pam_sm_open_session.c b/contrib/openpam/lib/libpam/pam_sm_open_session.c
index acb401a..acb401a 100644
--- a/contrib/openpam/lib/pam_sm_open_session.c
+++ b/contrib/openpam/lib/libpam/pam_sm_open_session.c
diff --git a/contrib/openpam/lib/pam_sm_set_mapped_authtok.c b/contrib/openpam/lib/libpam/pam_sm_set_mapped_authtok.c
index dab40fd..dab40fd 100644
--- a/contrib/openpam/lib/pam_sm_set_mapped_authtok.c
+++ b/contrib/openpam/lib/libpam/pam_sm_set_mapped_authtok.c
diff --git a/contrib/openpam/lib/pam_sm_set_mapped_username.c b/contrib/openpam/lib/libpam/pam_sm_set_mapped_username.c
index 3011016..3011016 100644
--- a/contrib/openpam/lib/pam_sm_set_mapped_username.c
+++ b/contrib/openpam/lib/libpam/pam_sm_set_mapped_username.c
diff --git a/contrib/openpam/lib/pam_sm_setcred.c b/contrib/openpam/lib/libpam/pam_sm_setcred.c
index 0d30683..0d30683 100644
--- a/contrib/openpam/lib/pam_sm_setcred.c
+++ b/contrib/openpam/lib/libpam/pam_sm_setcred.c
diff --git a/contrib/openpam/lib/pam_start.c b/contrib/openpam/lib/libpam/pam_start.c
index 84e0085..84e0085 100644
--- a/contrib/openpam/lib/pam_start.c
+++ b/contrib/openpam/lib/libpam/pam_start.c
diff --git a/contrib/openpam/lib/pam_strerror.c b/contrib/openpam/lib/libpam/pam_strerror.c
index e29219d..e29219d 100644
--- a/contrib/openpam/lib/pam_strerror.c
+++ b/contrib/openpam/lib/libpam/pam_strerror.c
diff --git a/contrib/openpam/lib/pam_verror.c b/contrib/openpam/lib/libpam/pam_verror.c
index 9ed85b6..9ed85b6 100644
--- a/contrib/openpam/lib/pam_verror.c
+++ b/contrib/openpam/lib/libpam/pam_verror.c
diff --git a/contrib/openpam/lib/pam_vinfo.c b/contrib/openpam/lib/libpam/pam_vinfo.c
index 95f45f4..95f45f4 100644
--- a/contrib/openpam/lib/pam_vinfo.c
+++ b/contrib/openpam/lib/libpam/pam_vinfo.c
diff --git a/contrib/openpam/lib/pam_vprompt.c b/contrib/openpam/lib/libpam/pam_vprompt.c
index 1e390e0..1e390e0 100644
--- a/contrib/openpam/lib/pam_vprompt.c
+++ b/contrib/openpam/lib/libpam/pam_vprompt.c
diff --git a/contrib/openpam/modules/pam_deny/Makefile.am b/contrib/openpam/modules/pam_deny/Makefile.am
index d432915..ae6f59b 100644
--- a/contrib/openpam/modules/pam_deny/Makefile.am
+++ b/contrib/openpam/modules/pam_deny/Makefile.am
@@ -7,4 +7,4 @@ pkglib_LTLIBRARIES = pam_deny.la
 
 pam_deny_la_SOURCES = pam_deny.c
 pam_deny_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@
-pam_deny_la_LIBADD = $(top_builddir)/lib/libpam.la
+pam_deny_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la
diff --git a/contrib/openpam/modules/pam_permit/Makefile.am b/contrib/openpam/modules/pam_permit/Makefile.am
index 363ca7c..ab59854 100644
--- a/contrib/openpam/modules/pam_permit/Makefile.am
+++ b/contrib/openpam/modules/pam_permit/Makefile.am
@@ -7,4 +7,4 @@ pkglib_LTLIBRARIES = pam_permit.la
 
 pam_permit_la_SOURCES = pam_permit.c
 pam_permit_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@
-pam_permit_la_LIBADD = $(top_builddir)/lib/libpam.la
+pam_permit_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la
diff --git a/contrib/openpam/modules/pam_unix/Makefile.am b/contrib/openpam/modules/pam_unix/Makefile.am
index ad1ec67..e368d11 100644
--- a/contrib/openpam/modules/pam_unix/Makefile.am
+++ b/contrib/openpam/modules/pam_unix/Makefile.am
@@ -8,5 +8,5 @@ pkglib_LTLIBRARIES = pam_unix.la
 
 pam_unix_la_SOURCES = pam_unix.c
 pam_unix_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@
-pam_unix_la_LIBADD = $(top_builddir)/lib/libpam.la @CRYPT_LIBS@
+pam_unix_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la @CRYPT_LIBS@
 endif