Clean up the top level

Move all the module code into the module directory and the man
page into the docs directory to look more like my other packages.

diff --git a/.gitignore b/.gitignore
index 6c7b9ef41b73d293a8fa44058ad99b17d1d8cb04..1dc8bcc41cb9964409643017eccee798a6518dc4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@
 /config.log
 /config.status
 /configure
+/docs/pam_krb5.5
 /libtool
 /m4/libtool.m4
 /m4/ltoptions.m4
@@ -30,7 +31,6 @@
 /m4/ltversion.m4
 /m4/lt~obsolete.m4
 /pam-krb5-*
-/pam_krb5.5
 /stamp-h1
 /tests/config/admin-keytab
 /tests/config/keytab

diff --git a/Makefile.am b/Makefile.am
index 70650475e7dfd028bd2789ee09cc53a5b690a631..72d4e456ba5bbd32fae93008210b088632b3ce24 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,13 +11,13 @@
 
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = .gitignore .travis.yml LICENSE README.md bootstrap                    \
-       docs/metadata pam_krb5.map pam_krb5.pod pam_krb5.sym tests/README   \
-       tests/TESTS tests/config/README tests/data/generate-krb5-conf       \
-       tests/data/krb5-pam.conf tests/data/krb5.conf tests/data/perl.conf  \
-       tests/data/scripts tests/data/valgrind.supp                         \
-       tests/docs/pod-spelling-t tests/docs/pod-t tests/docs/urls-t        \
-       tests/fakepam/README tests/tap/libtap.sh tests/tap/perl/Test/RRA.pm \
-       tests/tap/perl/Test/RRA/Automake.pm                                 \
+       docs/metadata docs/pam_krb5.pod module/pam_krb5.map                 \
+       module/pam_krb5.sym tests/README tests/TESTS tests/config/README    \
+       tests/data/generate-krb5-conf tests/data/krb5-pam.conf              \
+       tests/data/krb5.conf tests/data/perl.conf tests/data/scripts        \
+       tests/data/valgrind.supp tests/docs/pod-spelling-t tests/docs/pod-t \
+       tests/docs/urls-t tests/fakepam/README tests/tap/libtap.sh          \
+       tests/tap/perl/Test/RRA.pm tests/tap/perl/Test/RRA/Automake.pm      \
        tests/tap/perl/Test/RRA/Config.pm
 
 # Everything we build needs the Kerbeors headers and library flags.
@@ -34,27 +34,29 @@ pam_util_libpamutil_la_SOURCES = pam-util/args.c pam-util/args.h    \
        pam-util/options.h pam-util/vector.c pam-util/vector.h
 
 if HAVE_LD_VERSION_SCRIPT
-    VERSION_LDFLAGS = -Wl,--version-script=${srcdir}/pam_krb5.map
+    VERSION_LDFLAGS = -Wl,--version-script=${srcdir}/module/pam_krb5.map
 else
-    VERSION_LDFLAGS = -export-symbols ${srcdir}/pam_krb5.sym
+    VERSION_LDFLAGS = -export-symbols ${srcdir}/module/pam_krb5.sym
 endif
 
 pamdir = $(libdir)/security
-pam_LTLIBRARIES = pam_krb5.la
-pam_krb5_la_SOURCES = account.c alt-auth.c auth.c cache.c context.c fast.c \
-       internal.h options.c password.c prompting.c public.c setcred.c     \
-       support.c
-pam_krb5_la_LDFLAGS = -module -shared -avoid-version $(VERSION_LDFLAGS) \
-       $(AM_LDFLAGS)
-pam_krb5_la_LIBADD = pam-util/libpamutil.la portable/libportable.la \
+pam_LTLIBRARIES = module/pam_krb5.la
+module_pam_krb5_la_SOURCES = module/account.c module/alt-auth.c                \
+       module/auth.c module/cache.c module/context.c module/fast.c     \
+       module/internal.h module/options.c module/password.c            \
+       module/prompting.c module/public.c module/setcred.c             \
+       module/support.c
+module_pam_krb5_la_LDFLAGS = -module -shared \
+       -avoid-version $(VERSION_LDFLAGS) $(AM_LDFLAGS)
+module_pam_krb5_la_LIBADD = pam-util/libpamutil.la portable/libportable.la \
        $(KRB5_LIBS)
-dist_man_MANS = pam_krb5.5
+dist_man_MANS = docs/pam_krb5.5
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 build-aux/compile                 \
        build-aux/config.guess build-aux/config.sub build-aux/depcomp    \
        build-aux/install-sh build-aux/ltmain.sh build-aux/missing       \
-       config.h.in config.h.in~ configure m4/libtool.m4 m4/ltoptions.m4 \
-       m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 pam_krb5.5
+       config.h.in config.h.in~ configure docs/pam_krb5.5 m4/libtool.m4 \
+       m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4
 
 # Separate target for a human to request building everything with as many
 # compiler warnings enabled as possible.
@@ -92,9 +94,11 @@ tests_tap_libtap_a_SOURCES = tests/tap/basic.c tests/tap/basic.h     \
 
 # The list of objects and libraries used for module testing by programs that
 # link with the fake PAM library or with both it and the module.
-MODULE_OBJECTS = account.lo alt-auth.lo auth.lo cache.lo context.lo fast.lo \
-       options.lo password.lo prompting.lo public.lo setcred.lo support.lo \
-       pam-util/libpamutil.la tests/fakepam/libfakepam.a
+MODULE_OBJECTS = module/account.lo module/alt-auth.lo module/auth.lo      \
+       module/cache.lo module/context.lo module/fast.lo module/options.lo \
+       module/password.lo module/prompting.lo module/public.lo            \
+       module/setcred.lo module/support.lo pam-util/libpamutil.la         \
+       tests/fakepam/libfakepam.a
 
 # The test programs themselves.
 tests_module_alt_auth_t_LDADD = $(MODULE_OBJECTS) tests/tap/libtap.a \

diff --git a/bootstrap b/bootstrap
index c6eef65cd18bed3219ce95cf3d47f44c8e8eb61e..948aa1b9f02ed9ad4df3a1c3c835c43c5370bb5d 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -9,4 +9,5 @@ rm -rf autom4te.cache
 
 # Generate manual pages.
 version=`grep '^pam-krb5' NEWS | head -1 | cut -d' ' -f2`
-pod2man --release="$version" --center=pam-krb5 -s 5 pam_krb5.pod > pam_krb5.5
+pod2man --release="$version" --center=pam-krb5 -s 5 docs/pam_krb5.pod \
+    >docs/pam_krb5.5

diff --git a/pam_krb5.pod b/docs/pam_krb5.pod
similarity index 99%
rename from pam_krb5.pod
rename to docs/pam_krb5.pod
index 6637c7a2010ad54c5ebeeba0ff32c163c78490a7..024584dfd4cdc334cde03f1f9dd5188aec7af48e 100644 (file)
--- a/pam_krb5.pod
+++ b/docs/pam_krb5.pod
@@ -3,7 +3,8 @@ KRB5CCNAME ChallengeResponseAuthentication GSS-API Heimdal KDC PKINIT
 PasswordAuthentication SRV Solaris Sourceforge aname appdefaults auth
 canonicalized ccache krb5.conf forwardable kdestroy keytab libdefaults
 logout pam-krb5 preauth 0.8rc1 screensaver screensavers sshd localname
-krb5.conf. 0.8rc1. Allbery Cusack Salomon
+krb5.conf. 0.8rc1. Allbery Cusack Salomon FSFAP SPDX-License-Identifier
+responder
 
 =head1 NAME
 

diff --git a/account.c b/module/account.c
similarity index 99%
rename from account.c
rename to module/account.c
index 9699cdefa6bc9011929f18caaf50dde2b8d4da0b..211975a43ac5e882b33c6758d3aec3af4774f434 100644 (file)
--- a/account.c
+++ b/module/account.c
@@ -24,7 +24,7 @@
 
 #include <errno.h>
 
-#include <internal.h>
+#include <module/internal.h>
 #include <pam-util/args.h>
 #include <pam-util/logging.h>
 

diff --git a/alt-auth.c b/module/alt-auth.c
similarity index 99%
rename from alt-auth.c
rename to module/alt-auth.c
index 335e44a31c35e7f0a86e1f72e7b743cfaae34201..9646ddd014bd698c1c51ad72ae4082ebf9b3e876 100644 (file)
--- a/alt-auth.c
+++ b/module/alt-auth.c
@@ -24,7 +24,7 @@
 
 #include <errno.h>
 
-#include <internal.h>
+#include <module/internal.h>
 #include <pam-util/args.h>
 #include <pam-util/logging.h>
 

diff --git a/auth.c b/module/auth.c
similarity index 99%
rename from auth.c
rename to module/auth.c
index d87d660ffb2f3cbfbc514e5d5ffb158be3422edd..4076a83159587d7374c178d0d18dbe31f3258680 100644 (file)
--- a/auth.c
+++ b/module/auth.c
@@ -28,7 +28,7 @@
 #include <pwd.h>
 #include <sys/stat.h>
 
-#include <internal.h>
+#include <module/internal.h>
 #include <pam-util/args.h>
 #include <pam-util/logging.h>
 #include <pam-util/vector.h>

diff --git a/cache.c b/module/cache.c
similarity index 99%
rename from cache.c
rename to module/cache.c
index 28706229d212d6b3ef4c121eec6739b708b009f0..7acfef07b8eb66df5f06fd4e0adc3bc9868e3645 100644 (file)
--- a/cache.c
+++ b/module/cache.c
@@ -20,7 +20,7 @@
 
 #include <errno.h>
 
-#include <internal.h>
+#include <module/internal.h>
 #include <pam-util/args.h>
 #include <pam-util/logging.h>
 

diff --git a/context.c b/module/context.c
similarity index 99%
rename from context.c
rename to module/context.c
index cc18de780beabd918e9f1cb3621f10b30e6fe256..9664483d4772a5dbd6ff901d5c543f8f5a1d30c0 100644 (file)
--- a/context.c
+++ b/module/context.c
@@ -19,7 +19,7 @@
 
 #include <errno.h>
 
-#include <internal.h>
+#include <module/internal.h>
 #include <pam-util/args.h>
 #include <pam-util/logging.h>
 

diff --git a/fast.c b/module/fast.c
similarity index 99%
rename from fast.c
rename to module/fast.c
index 5222ac312fe1258e717299d3b6cf58bebbeaf0a4..948a35daba6b2b5f4d7da3373ede5eeee8f0464a 100644 (file)
--- a/fast.c
+++ b/module/fast.c
@@ -21,7 +21,7 @@
 
 #include <errno.h>
 
-#include <internal.h>
+#include <module/internal.h>
 #include <pam-util/args.h>
 #include <pam-util/logging.h>
 

diff --git a/internal.h b/module/internal.h
similarity index 100%
rename from internal.h
rename to module/internal.h

diff --git a/options.c b/module/options.c
similarity index 99%
rename from options.c
rename to module/options.c
index 2395da5615aeb384b2d34458382b962287772e91..296c01531a34f2c1c65f99007723d2dc0d38bbc7 100644 (file)
--- a/options.c
+++ b/module/options.c
@@ -20,7 +20,7 @@
 
 #include <errno.h>
 
-#include <internal.h>
+#include <module/internal.h>
 #include <pam-util/args.h>
 #include <pam-util/logging.h>
 #include <pam-util/options.h>

diff --git a/pam_krb5.map b/module/pam_krb5.map
similarity index 100%
rename from pam_krb5.map
rename to module/pam_krb5.map

diff --git a/pam_krb5.sym b/module/pam_krb5.sym
similarity index 100%
rename from pam_krb5.sym
rename to module/pam_krb5.sym

diff --git a/password.c b/module/password.c
similarity index 99%
rename from password.c
rename to module/password.c
index 7292109e0e5671bf97da5fa8f6eed885faa77778..60b2c9a78929fa9773e1ef1dbbc5f0d46f0fd355 100644 (file)
--- a/password.c
+++ b/module/password.c
@@ -17,7 +17,7 @@
 
 #include <errno.h>
 
-#include <internal.h>
+#include <module/internal.h>
 #include <pam-util/args.h>
 #include <pam-util/logging.h>
 

diff --git a/prompting.c b/module/prompting.c
similarity index 99%
rename from prompting.c
rename to module/prompting.c
index 6f9f36ae054b462227a08f2866d22afd5fb354b1..073b57dbde202f1611bdd773e927e6915db3dc0d 100644 (file)
--- a/prompting.c
+++ b/module/prompting.c
@@ -21,7 +21,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include <internal.h>
+#include <module/internal.h>
 #include <pam-util/args.h>
 #include <pam-util/logging.h>
 

diff --git a/public.c b/module/public.c
similarity index 99%
rename from public.c
rename to module/public.c
index c76f02b6f5e7325e6ed25536e0103fec2cbad437..44d5f7736794590a528b1ac296d364cf5a3f0306 100644 (file)
--- a/public.c
+++ b/module/public.c
@@ -27,7 +27,7 @@
 #include <portable/pam.h>
 #include <portable/system.h>
 
-#include <internal.h>
+#include <module/internal.h>
 #include <pam-util/args.h>
 #include <pam-util/logging.h>
 

diff --git a/setcred.c b/module/setcred.c
similarity index 99%
rename from setcred.c
rename to module/setcred.c
index 31f5b3c1aa164ebc40252722d2658b6350551d96..5b98b2919c88d8a019219fef11b3f5e5f158deb4 100644 (file)
--- a/setcred.c
+++ b/module/setcred.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <pwd.h>
 
-#include <internal.h>
+#include <module/internal.h>
 #include <pam-util/args.h>
 #include <pam-util/logging.h>
 

diff --git a/support.c b/module/support.c
similarity index 99%
rename from support.c
rename to module/support.c
index 5f587a4e39ba1cf15f7e7ffaa1a78d1c0b4d1760..79b654ed2f327b508dc2a9438b1eb5f8897de2f5 100644 (file)
--- a/support.c
+++ b/module/support.c
@@ -21,7 +21,7 @@
 #include <errno.h>
 #include <pwd.h>
 
-#include <internal.h>
+#include <module/internal.h>
 #include <pam-util/args.h>
 #include <pam-util/logging.h>