aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2013-09-07 16:10:15 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2013-09-07 16:10:15 +0000
commit2dd970c2a1fc499a0598e6102908a6c124c04aa1 (patch)
tree90d685ee8badf6b53d689f32e97cf872f86c70f5
parent8a441b006240afe43bf29535b9111f19189b02cd (diff)
downloadsrc-2dd970c2a1fc499a0598e6102908a6c124c04aa1.tar.gz
src-2dd970c2a1fc499a0598e6102908a6c124c04aa1.zip
Prepare for OpenPAM Nummularia by reorganizing to match its new directory
structure.
Notes
Notes: svn path=/vendor/openpam/dist/; revision=255364
-rw-r--r--Makefile.am2
-rw-r--r--bin/openpam_dump_policy/Makefile.am4
-rw-r--r--bin/pamtest/Makefile.am2
-rw-r--r--bin/su/Makefile.am2
-rw-r--r--configure.ac4
-rw-r--r--doc/man/Makefile.am2
-rw-r--r--lib/libpam/Makefile.am (renamed from lib/Makefile.am)0
-rw-r--r--lib/libpam/Makefile.in (renamed from lib/Makefile.in)0
-rw-r--r--lib/libpam/openpam_borrow_cred.c (renamed from lib/openpam_borrow_cred.c)0
-rw-r--r--lib/libpam/openpam_check_owner_perms.c (renamed from lib/openpam_check_owner_perms.c)0
-rw-r--r--lib/libpam/openpam_configure.c (renamed from lib/openpam_configure.c)0
-rw-r--r--lib/libpam/openpam_constants.c (renamed from lib/openpam_constants.c)0
-rw-r--r--lib/libpam/openpam_constants.h (renamed from lib/openpam_constants.h)0
-rw-r--r--lib/libpam/openpam_ctype.h (renamed from lib/openpam_ctype.h)0
-rw-r--r--lib/libpam/openpam_debug.h (renamed from lib/openpam_debug.h)0
-rw-r--r--lib/libpam/openpam_dispatch.c (renamed from lib/openpam_dispatch.c)0
-rw-r--r--lib/libpam/openpam_dynamic.c (renamed from lib/openpam_dynamic.c)0
-rw-r--r--lib/libpam/openpam_features.c (renamed from lib/openpam_features.c)0
-rw-r--r--lib/libpam/openpam_features.h (renamed from lib/openpam_features.h)0
-rw-r--r--lib/libpam/openpam_findenv.c (renamed from lib/openpam_findenv.c)0
-rw-r--r--lib/libpam/openpam_free_data.c (renamed from lib/openpam_free_data.c)0
-rw-r--r--lib/libpam/openpam_free_envlist.c (renamed from lib/openpam_free_envlist.c)0
-rw-r--r--lib/libpam/openpam_get_feature.c (renamed from lib/openpam_get_feature.c)0
-rw-r--r--lib/libpam/openpam_get_option.c (renamed from lib/openpam_get_option.c)0
-rw-r--r--lib/libpam/openpam_impl.h (renamed from lib/openpam_impl.h)0
-rw-r--r--lib/libpam/openpam_load.c (renamed from lib/openpam_load.c)0
-rw-r--r--lib/libpam/openpam_log.c (renamed from lib/openpam_log.c)0
-rw-r--r--lib/libpam/openpam_nullconv.c (renamed from lib/openpam_nullconv.c)0
-rw-r--r--lib/libpam/openpam_readline.c (renamed from lib/openpam_readline.c)0
-rw-r--r--lib/libpam/openpam_readlinev.c (renamed from lib/openpam_readlinev.c)0
-rw-r--r--lib/libpam/openpam_readword.c (renamed from lib/openpam_readword.c)0
-rw-r--r--lib/libpam/openpam_restore_cred.c (renamed from lib/openpam_restore_cred.c)0
-rw-r--r--lib/libpam/openpam_set_feature.c (renamed from lib/openpam_set_feature.c)0
-rw-r--r--lib/libpam/openpam_set_option.c (renamed from lib/openpam_set_option.c)0
-rw-r--r--lib/libpam/openpam_static.c (renamed from lib/openpam_static.c)0
-rw-r--r--lib/libpam/openpam_straddch.c (renamed from lib/openpam_straddch.c)0
-rw-r--r--lib/libpam/openpam_strlcat.h (renamed from lib/openpam_strlcat.h)0
-rw-r--r--lib/libpam/openpam_strlcmp.h (renamed from lib/openpam_strlcmp.h)0
-rw-r--r--lib/libpam/openpam_strlcpy.h (renamed from lib/openpam_strlcpy.h)0
-rw-r--r--lib/libpam/openpam_subst.c (renamed from lib/openpam_subst.c)0
-rw-r--r--lib/libpam/openpam_ttyconv.c (renamed from lib/openpam_ttyconv.c)0
-rw-r--r--lib/libpam/pam_acct_mgmt.c (renamed from lib/pam_acct_mgmt.c)0
-rw-r--r--lib/libpam/pam_authenticate.c (renamed from lib/pam_authenticate.c)0
-rw-r--r--lib/libpam/pam_authenticate_secondary.c (renamed from lib/pam_authenticate_secondary.c)0
-rw-r--r--lib/libpam/pam_chauthtok.c (renamed from lib/pam_chauthtok.c)0
-rw-r--r--lib/libpam/pam_close_session.c (renamed from lib/pam_close_session.c)0
-rw-r--r--lib/libpam/pam_end.c (renamed from lib/pam_end.c)0
-rw-r--r--lib/libpam/pam_error.c (renamed from lib/pam_error.c)0
-rw-r--r--lib/libpam/pam_get_authtok.c (renamed from lib/pam_get_authtok.c)0
-rw-r--r--lib/libpam/pam_get_data.c (renamed from lib/pam_get_data.c)0
-rw-r--r--lib/libpam/pam_get_item.c (renamed from lib/pam_get_item.c)0
-rw-r--r--lib/libpam/pam_get_mapped_authtok.c (renamed from lib/pam_get_mapped_authtok.c)0
-rw-r--r--lib/libpam/pam_get_mapped_username.c (renamed from lib/pam_get_mapped_username.c)0
-rw-r--r--lib/libpam/pam_get_user.c (renamed from lib/pam_get_user.c)0
-rw-r--r--lib/libpam/pam_getenv.c (renamed from lib/pam_getenv.c)0
-rw-r--r--lib/libpam/pam_getenvlist.c (renamed from lib/pam_getenvlist.c)0
-rw-r--r--lib/libpam/pam_info.c (renamed from lib/pam_info.c)0
-rw-r--r--lib/libpam/pam_open_session.c (renamed from lib/pam_open_session.c)0
-rw-r--r--lib/libpam/pam_prompt.c (renamed from lib/pam_prompt.c)0
-rw-r--r--lib/libpam/pam_putenv.c (renamed from lib/pam_putenv.c)0
-rw-r--r--lib/libpam/pam_set_data.c (renamed from lib/pam_set_data.c)0
-rw-r--r--lib/libpam/pam_set_item.c (renamed from lib/pam_set_item.c)0
-rw-r--r--lib/libpam/pam_set_mapped_authtok.c (renamed from lib/pam_set_mapped_authtok.c)0
-rw-r--r--lib/libpam/pam_set_mapped_username.c (renamed from lib/pam_set_mapped_username.c)0
-rw-r--r--lib/libpam/pam_setcred.c (renamed from lib/pam_setcred.c)0
-rw-r--r--lib/libpam/pam_setenv.c (renamed from lib/pam_setenv.c)0
-rw-r--r--lib/libpam/pam_sm_acct_mgmt.c (renamed from lib/pam_sm_acct_mgmt.c)0
-rw-r--r--lib/libpam/pam_sm_authenticate.c (renamed from lib/pam_sm_authenticate.c)0
-rw-r--r--lib/libpam/pam_sm_authenticate_secondary.c (renamed from lib/pam_sm_authenticate_secondary.c)0
-rw-r--r--lib/libpam/pam_sm_chauthtok.c (renamed from lib/pam_sm_chauthtok.c)0
-rw-r--r--lib/libpam/pam_sm_close_session.c (renamed from lib/pam_sm_close_session.c)0
-rw-r--r--lib/libpam/pam_sm_get_mapped_authtok.c (renamed from lib/pam_sm_get_mapped_authtok.c)0
-rw-r--r--lib/libpam/pam_sm_get_mapped_username.c (renamed from lib/pam_sm_get_mapped_username.c)0
-rw-r--r--lib/libpam/pam_sm_open_session.c (renamed from lib/pam_sm_open_session.c)0
-rw-r--r--lib/libpam/pam_sm_set_mapped_authtok.c (renamed from lib/pam_sm_set_mapped_authtok.c)0
-rw-r--r--lib/libpam/pam_sm_set_mapped_username.c (renamed from lib/pam_sm_set_mapped_username.c)0
-rw-r--r--lib/libpam/pam_sm_setcred.c (renamed from lib/pam_sm_setcred.c)0
-rw-r--r--lib/libpam/pam_start.c (renamed from lib/pam_start.c)0
-rw-r--r--lib/libpam/pam_strerror.c (renamed from lib/pam_strerror.c)0
-rw-r--r--lib/libpam/pam_verror.c (renamed from lib/pam_verror.c)0
-rw-r--r--lib/libpam/pam_vinfo.c (renamed from lib/pam_vinfo.c)0
-rw-r--r--lib/libpam/pam_vprompt.c (renamed from lib/pam_vprompt.c)0
-rw-r--r--modules/pam_deny/Makefile.am2
-rw-r--r--modules/pam_permit/Makefile.am2
-rw-r--r--modules/pam_unix/Makefile.am2
85 files changed, 11 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index 5c4fbf3f0a2a..8e236a7163a4 100644
--- a/Makefile.am
+++ b/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/bin/openpam_dump_policy/Makefile.am b/bin/openpam_dump_policy/Makefile.am
index a5fda16068bf..2af2eaf3036f 100644
--- a/bin/openpam_dump_policy/Makefile.am
+++ b/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/bin/pamtest/Makefile.am b/bin/pamtest/Makefile.am
index 80694def17a4..943872c2699b 100644
--- a/bin/pamtest/Makefile.am
+++ b/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/bin/su/Makefile.am b/bin/su/Makefile.am
index 50f0cb986e45..b0462c8c0e43 100644
--- a/bin/su/Makefile.am
+++ b/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/configure.ac b/configure.ac
index fb30726a4d1b..4abd34d6f11b 100644
--- a/configure.ac
+++ b/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/doc/man/Makefile.am b/doc/man/Makefile.am
index 4062a54d54fb..947710a7a5c5 100644
--- a/doc/man/Makefile.am
+++ b/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/lib/Makefile.am b/lib/libpam/Makefile.am
index 9ce2d2f5bc1e..9ce2d2f5bc1e 100644
--- a/lib/Makefile.am
+++ b/lib/libpam/Makefile.am
diff --git a/lib/Makefile.in b/lib/libpam/Makefile.in
index 353fbaba9b64..353fbaba9b64 100644
--- a/lib/Makefile.in
+++ b/lib/libpam/Makefile.in
diff --git a/lib/openpam_borrow_cred.c b/lib/libpam/openpam_borrow_cred.c
index e0dfc555758f..e0dfc555758f 100644
--- a/lib/openpam_borrow_cred.c
+++ b/lib/libpam/openpam_borrow_cred.c
diff --git a/lib/openpam_check_owner_perms.c b/lib/libpam/openpam_check_owner_perms.c
index d3b2ca98596b..d3b2ca98596b 100644
--- a/lib/openpam_check_owner_perms.c
+++ b/lib/libpam/openpam_check_owner_perms.c
diff --git a/lib/openpam_configure.c b/lib/libpam/openpam_configure.c
index 8172a6fdf11c..8172a6fdf11c 100644
--- a/lib/openpam_configure.c
+++ b/lib/libpam/openpam_configure.c
diff --git a/lib/openpam_constants.c b/lib/libpam/openpam_constants.c
index 833e81f28020..833e81f28020 100644
--- a/lib/openpam_constants.c
+++ b/lib/libpam/openpam_constants.c
diff --git a/lib/openpam_constants.h b/lib/libpam/openpam_constants.h
index a7d6ce8dd7d7..a7d6ce8dd7d7 100644
--- a/lib/openpam_constants.h
+++ b/lib/libpam/openpam_constants.h
diff --git a/lib/openpam_ctype.h b/lib/libpam/openpam_ctype.h
index b3ec84689970..b3ec84689970 100644
--- a/lib/openpam_ctype.h
+++ b/lib/libpam/openpam_ctype.h
diff --git a/lib/openpam_debug.h b/lib/libpam/openpam_debug.h
index 050783e49369..050783e49369 100644
--- a/lib/openpam_debug.h
+++ b/lib/libpam/openpam_debug.h
diff --git a/lib/openpam_dispatch.c b/lib/libpam/openpam_dispatch.c
index 54dfd3bdc8f3..54dfd3bdc8f3 100644
--- a/lib/openpam_dispatch.c
+++ b/lib/libpam/openpam_dispatch.c
diff --git a/lib/openpam_dynamic.c b/lib/libpam/openpam_dynamic.c
index 1dfc1ac43eb8..1dfc1ac43eb8 100644
--- a/lib/openpam_dynamic.c
+++ b/lib/libpam/openpam_dynamic.c
diff --git a/lib/openpam_features.c b/lib/libpam/openpam_features.c
index 586fc2a57305..586fc2a57305 100644
--- a/lib/openpam_features.c
+++ b/lib/libpam/openpam_features.c
diff --git a/lib/openpam_features.h b/lib/libpam/openpam_features.h
index 227b1a9f729c..227b1a9f729c 100644
--- a/lib/openpam_features.h
+++ b/lib/libpam/openpam_features.h
diff --git a/lib/openpam_findenv.c b/lib/libpam/openpam_findenv.c
index b833ec9229c0..b833ec9229c0 100644
--- a/lib/openpam_findenv.c
+++ b/lib/libpam/openpam_findenv.c
diff --git a/lib/openpam_free_data.c b/lib/libpam/openpam_free_data.c
index 561687c7ec2e..561687c7ec2e 100644
--- a/lib/openpam_free_data.c
+++ b/lib/libpam/openpam_free_data.c
diff --git a/lib/openpam_free_envlist.c b/lib/libpam/openpam_free_envlist.c
index 14754dc4031b..14754dc4031b 100644
--- a/lib/openpam_free_envlist.c
+++ b/lib/libpam/openpam_free_envlist.c
diff --git a/lib/openpam_get_feature.c b/lib/libpam/openpam_get_feature.c
index b552357c58d4..b552357c58d4 100644
--- a/lib/openpam_get_feature.c
+++ b/lib/libpam/openpam_get_feature.c
diff --git a/lib/openpam_get_option.c b/lib/libpam/openpam_get_option.c
index 1f62d218ebfc..1f62d218ebfc 100644
--- a/lib/openpam_get_option.c
+++ b/lib/libpam/openpam_get_option.c
diff --git a/lib/openpam_impl.h b/lib/libpam/openpam_impl.h
index 9e8b45f6d55c..9e8b45f6d55c 100644
--- a/lib/openpam_impl.h
+++ b/lib/libpam/openpam_impl.h
diff --git a/lib/openpam_load.c b/lib/libpam/openpam_load.c
index 871d1a8c057c..871d1a8c057c 100644
--- a/lib/openpam_load.c
+++ b/lib/libpam/openpam_load.c
diff --git a/lib/openpam_log.c b/lib/libpam/openpam_log.c
index 2b89f6c6d7d1..2b89f6c6d7d1 100644
--- a/lib/openpam_log.c
+++ b/lib/libpam/openpam_log.c
diff --git a/lib/openpam_nullconv.c b/lib/libpam/openpam_nullconv.c
index a95b1e0c50f8..a95b1e0c50f8 100644
--- a/lib/openpam_nullconv.c
+++ b/lib/libpam/openpam_nullconv.c
diff --git a/lib/openpam_readline.c b/lib/libpam/openpam_readline.c
index 047ab836910a..047ab836910a 100644
--- a/lib/openpam_readline.c
+++ b/lib/libpam/openpam_readline.c
diff --git a/lib/openpam_readlinev.c b/lib/libpam/openpam_readlinev.c
index 5a43b61f36f2..5a43b61f36f2 100644
--- a/lib/openpam_readlinev.c
+++ b/lib/libpam/openpam_readlinev.c
diff --git a/lib/openpam_readword.c b/lib/libpam/openpam_readword.c
index 1c0e9b68149c..1c0e9b68149c 100644
--- a/lib/openpam_readword.c
+++ b/lib/libpam/openpam_readword.c
diff --git a/lib/openpam_restore_cred.c b/lib/libpam/openpam_restore_cred.c
index 41d44d024d5c..41d44d024d5c 100644
--- a/lib/openpam_restore_cred.c
+++ b/lib/libpam/openpam_restore_cred.c
diff --git a/lib/openpam_set_feature.c b/lib/libpam/openpam_set_feature.c
index 4f6a4a5c92c7..4f6a4a5c92c7 100644
--- a/lib/openpam_set_feature.c
+++ b/lib/libpam/openpam_set_feature.c
diff --git a/lib/openpam_set_option.c b/lib/libpam/openpam_set_option.c
index 1712a718ec4c..1712a718ec4c 100644
--- a/lib/openpam_set_option.c
+++ b/lib/libpam/openpam_set_option.c
diff --git a/lib/openpam_static.c b/lib/libpam/openpam_static.c
index 40b807cb3698..40b807cb3698 100644
--- a/lib/openpam_static.c
+++ b/lib/libpam/openpam_static.c
diff --git a/lib/openpam_straddch.c b/lib/libpam/openpam_straddch.c
index 9845cc610a93..9845cc610a93 100644
--- a/lib/openpam_straddch.c
+++ b/lib/libpam/openpam_straddch.c
diff --git a/lib/openpam_strlcat.h b/lib/libpam/openpam_strlcat.h
index 1f266936be43..1f266936be43 100644
--- a/lib/openpam_strlcat.h
+++ b/lib/libpam/openpam_strlcat.h
diff --git a/lib/openpam_strlcmp.h b/lib/libpam/openpam_strlcmp.h
index 2a78e0f67666..2a78e0f67666 100644
--- a/lib/openpam_strlcmp.h
+++ b/lib/libpam/openpam_strlcmp.h
diff --git a/lib/openpam_strlcpy.h b/lib/libpam/openpam_strlcpy.h
index 9c6554834830..9c6554834830 100644
--- a/lib/openpam_strlcpy.h
+++ b/lib/libpam/openpam_strlcpy.h
diff --git a/lib/openpam_subst.c b/lib/libpam/openpam_subst.c
index bab7a785faa9..bab7a785faa9 100644
--- a/lib/openpam_subst.c
+++ b/lib/libpam/openpam_subst.c
diff --git a/lib/openpam_ttyconv.c b/lib/libpam/openpam_ttyconv.c
index 14a324d59ed3..14a324d59ed3 100644
--- a/lib/openpam_ttyconv.c
+++ b/lib/libpam/openpam_ttyconv.c
diff --git a/lib/pam_acct_mgmt.c b/lib/libpam/pam_acct_mgmt.c
index 49c34ab3ea65..49c34ab3ea65 100644
--- a/lib/pam_acct_mgmt.c
+++ b/lib/libpam/pam_acct_mgmt.c
diff --git a/lib/pam_authenticate.c b/lib/libpam/pam_authenticate.c
index fc6c20f394dc..fc6c20f394dc 100644
--- a/lib/pam_authenticate.c
+++ b/lib/libpam/pam_authenticate.c
diff --git a/lib/pam_authenticate_secondary.c b/lib/libpam/pam_authenticate_secondary.c
index 1a5731358970..1a5731358970 100644
--- a/lib/pam_authenticate_secondary.c
+++ b/lib/libpam/pam_authenticate_secondary.c
diff --git a/lib/pam_chauthtok.c b/lib/libpam/pam_chauthtok.c
index 1750b0f5fdd7..1750b0f5fdd7 100644
--- a/lib/pam_chauthtok.c
+++ b/lib/libpam/pam_chauthtok.c
diff --git a/lib/pam_close_session.c b/lib/libpam/pam_close_session.c
index 9e63a1dc965f..9e63a1dc965f 100644
--- a/lib/pam_close_session.c
+++ b/lib/libpam/pam_close_session.c
diff --git a/lib/pam_end.c b/lib/libpam/pam_end.c
index 09cde350ea6a..09cde350ea6a 100644
--- a/lib/pam_end.c
+++ b/lib/libpam/pam_end.c
diff --git a/lib/pam_error.c b/lib/libpam/pam_error.c
index 1e0de5b267b4..1e0de5b267b4 100644
--- a/lib/pam_error.c
+++ b/lib/libpam/pam_error.c
diff --git a/lib/pam_get_authtok.c b/lib/libpam/pam_get_authtok.c
index 1a3aebc81093..1a3aebc81093 100644
--- a/lib/pam_get_authtok.c
+++ b/lib/libpam/pam_get_authtok.c
diff --git a/lib/pam_get_data.c b/lib/libpam/pam_get_data.c
index 1a8ba1de8df5..1a8ba1de8df5 100644
--- a/lib/pam_get_data.c
+++ b/lib/libpam/pam_get_data.c
diff --git a/lib/pam_get_item.c b/lib/libpam/pam_get_item.c
index 95b9df6d02bd..95b9df6d02bd 100644
--- a/lib/pam_get_item.c
+++ b/lib/libpam/pam_get_item.c
diff --git a/lib/pam_get_mapped_authtok.c b/lib/libpam/pam_get_mapped_authtok.c
index 54ff6c3e7e89..54ff6c3e7e89 100644
--- a/lib/pam_get_mapped_authtok.c
+++ b/lib/libpam/pam_get_mapped_authtok.c
diff --git a/lib/pam_get_mapped_username.c b/lib/libpam/pam_get_mapped_username.c
index 4f8ac17fd131..4f8ac17fd131 100644
--- a/lib/pam_get_mapped_username.c
+++ b/lib/libpam/pam_get_mapped_username.c
diff --git a/lib/pam_get_user.c b/lib/libpam/pam_get_user.c
index 53245b99e57d..53245b99e57d 100644
--- a/lib/pam_get_user.c
+++ b/lib/libpam/pam_get_user.c
diff --git a/lib/pam_getenv.c b/lib/libpam/pam_getenv.c
index e2ebf579edaa..e2ebf579edaa 100644
--- a/lib/pam_getenv.c
+++ b/lib/libpam/pam_getenv.c
diff --git a/lib/pam_getenvlist.c b/lib/libpam/pam_getenvlist.c
index 06c003f02ef6..06c003f02ef6 100644
--- a/lib/pam_getenvlist.c
+++ b/lib/libpam/pam_getenvlist.c
diff --git a/lib/pam_info.c b/lib/libpam/pam_info.c
index 7e51dbf6b889..7e51dbf6b889 100644
--- a/lib/pam_info.c
+++ b/lib/libpam/pam_info.c
diff --git a/lib/pam_open_session.c b/lib/libpam/pam_open_session.c
index 36c59b049e2a..36c59b049e2a 100644
--- a/lib/pam_open_session.c
+++ b/lib/libpam/pam_open_session.c
diff --git a/lib/pam_prompt.c b/lib/libpam/pam_prompt.c
index 194e7655237f..194e7655237f 100644
--- a/lib/pam_prompt.c
+++ b/lib/libpam/pam_prompt.c
diff --git a/lib/pam_putenv.c b/lib/libpam/pam_putenv.c
index e1f0bc35e29c..e1f0bc35e29c 100644
--- a/lib/pam_putenv.c
+++ b/lib/libpam/pam_putenv.c
diff --git a/lib/pam_set_data.c b/lib/libpam/pam_set_data.c
index a8de632f7bf7..a8de632f7bf7 100644
--- a/lib/pam_set_data.c
+++ b/lib/libpam/pam_set_data.c
diff --git a/lib/pam_set_item.c b/lib/libpam/pam_set_item.c
index 05d538f7bdca..05d538f7bdca 100644
--- a/lib/pam_set_item.c
+++ b/lib/libpam/pam_set_item.c
diff --git a/lib/pam_set_mapped_authtok.c b/lib/libpam/pam_set_mapped_authtok.c
index d8db84fd34fa..d8db84fd34fa 100644
--- a/lib/pam_set_mapped_authtok.c
+++ b/lib/libpam/pam_set_mapped_authtok.c
diff --git a/lib/pam_set_mapped_username.c b/lib/libpam/pam_set_mapped_username.c
index 4b8f8153916d..4b8f8153916d 100644
--- a/lib/pam_set_mapped_username.c
+++ b/lib/libpam/pam_set_mapped_username.c
diff --git a/lib/pam_setcred.c b/lib/libpam/pam_setcred.c
index 51fb0816b6d8..51fb0816b6d8 100644
--- a/lib/pam_setcred.c
+++ b/lib/libpam/pam_setcred.c
diff --git a/lib/pam_setenv.c b/lib/libpam/pam_setenv.c
index 6fd4c1001e83..6fd4c1001e83 100644
--- a/lib/pam_setenv.c
+++ b/lib/libpam/pam_setenv.c
diff --git a/lib/pam_sm_acct_mgmt.c b/lib/libpam/pam_sm_acct_mgmt.c
index f5c14cf99a7a..f5c14cf99a7a 100644
--- a/lib/pam_sm_acct_mgmt.c
+++ b/lib/libpam/pam_sm_acct_mgmt.c
diff --git a/lib/pam_sm_authenticate.c b/lib/libpam/pam_sm_authenticate.c
index 97851af43e69..97851af43e69 100644
--- a/lib/pam_sm_authenticate.c
+++ b/lib/libpam/pam_sm_authenticate.c
diff --git a/lib/pam_sm_authenticate_secondary.c b/lib/libpam/pam_sm_authenticate_secondary.c
index 3f3f6bdf4705..3f3f6bdf4705 100644
--- a/lib/pam_sm_authenticate_secondary.c
+++ b/lib/libpam/pam_sm_authenticate_secondary.c
diff --git a/lib/pam_sm_chauthtok.c b/lib/libpam/pam_sm_chauthtok.c
index 593344cca222..593344cca222 100644
--- a/lib/pam_sm_chauthtok.c
+++ b/lib/libpam/pam_sm_chauthtok.c
diff --git a/lib/pam_sm_close_session.c b/lib/libpam/pam_sm_close_session.c
index 290f497b1cd5..290f497b1cd5 100644
--- a/lib/pam_sm_close_session.c
+++ b/lib/libpam/pam_sm_close_session.c
diff --git a/lib/pam_sm_get_mapped_authtok.c b/lib/libpam/pam_sm_get_mapped_authtok.c
index e86e6e5d3624..e86e6e5d3624 100644
--- a/lib/pam_sm_get_mapped_authtok.c
+++ b/lib/libpam/pam_sm_get_mapped_authtok.c
diff --git a/lib/pam_sm_get_mapped_username.c b/lib/libpam/pam_sm_get_mapped_username.c
index 596ca6cb1aba..596ca6cb1aba 100644
--- a/lib/pam_sm_get_mapped_username.c
+++ b/lib/libpam/pam_sm_get_mapped_username.c
diff --git a/lib/pam_sm_open_session.c b/lib/libpam/pam_sm_open_session.c
index acb401ab3da7..acb401ab3da7 100644
--- a/lib/pam_sm_open_session.c
+++ b/lib/libpam/pam_sm_open_session.c
diff --git a/lib/pam_sm_set_mapped_authtok.c b/lib/libpam/pam_sm_set_mapped_authtok.c
index dab40fd9d001..dab40fd9d001 100644
--- a/lib/pam_sm_set_mapped_authtok.c
+++ b/lib/libpam/pam_sm_set_mapped_authtok.c
diff --git a/lib/pam_sm_set_mapped_username.c b/lib/libpam/pam_sm_set_mapped_username.c
index 3011016b4b41..3011016b4b41 100644
--- a/lib/pam_sm_set_mapped_username.c
+++ b/lib/libpam/pam_sm_set_mapped_username.c
diff --git a/lib/pam_sm_setcred.c b/lib/libpam/pam_sm_setcred.c
index 0d306838bc1b..0d306838bc1b 100644
--- a/lib/pam_sm_setcred.c
+++ b/lib/libpam/pam_sm_setcred.c
diff --git a/lib/pam_start.c b/lib/libpam/pam_start.c
index 84e0085b30b7..84e0085b30b7 100644
--- a/lib/pam_start.c
+++ b/lib/libpam/pam_start.c
diff --git a/lib/pam_strerror.c b/lib/libpam/pam_strerror.c
index e29219d8472d..e29219d8472d 100644
--- a/lib/pam_strerror.c
+++ b/lib/libpam/pam_strerror.c
diff --git a/lib/pam_verror.c b/lib/libpam/pam_verror.c
index 9ed85b688a08..9ed85b688a08 100644
--- a/lib/pam_verror.c
+++ b/lib/libpam/pam_verror.c
diff --git a/lib/pam_vinfo.c b/lib/libpam/pam_vinfo.c
index 95f45f4d2062..95f45f4d2062 100644
--- a/lib/pam_vinfo.c
+++ b/lib/libpam/pam_vinfo.c
diff --git a/lib/pam_vprompt.c b/lib/libpam/pam_vprompt.c
index 1e390e09c36b..1e390e09c36b 100644
--- a/lib/pam_vprompt.c
+++ b/lib/libpam/pam_vprompt.c
diff --git a/modules/pam_deny/Makefile.am b/modules/pam_deny/Makefile.am
index d432915cc50e..ae6f59b69e85 100644
--- a/modules/pam_deny/Makefile.am
+++ b/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/modules/pam_permit/Makefile.am b/modules/pam_permit/Makefile.am
index 363ca7cf2293..ab598543c0f3 100644
--- a/modules/pam_permit/Makefile.am
+++ b/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/modules/pam_unix/Makefile.am b/modules/pam_unix/Makefile.am
index ad1ec67958f6..e368d1189c5a 100644
--- a/modules/pam_unix/Makefile.am
+++ b/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