Fix various character class check mistakes, add test suite

[kerberos/krb5-strength.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index af8399cd7a5c112efa315aa429e17027065eaf80..74708c5499ca5577530c3a0b9c554ed04d5020f9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,22 +1,24 @@
 # Automake makefile for krb5-strength.
 #
-# Written by Russ Allbery <rra@stanford.edu>
+# Written by Russ Allbery <eagle@eyrie.org>
 # Copyright 2007, 2009, 2010, 2012, 2013
 #     The Board of Trustees of the Leland Stanford Junior University
 #
 # See LICENSE for licensing terms.
 
 ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = .gitignore LICENSE autogen cracklib/HISTORY cracklib/LICENCE   \
-       cracklib/README cracklib/genrules.pl cracklib/mkdict tests/HOWTO    \
-       tests/TESTS tests/data/krb5.conf tests/data/make-krb5-conf          \
-       tests/data/passwords tests/data/perl.conf tests/data/perlcriticrc   \
-       tests/data/perltidyrc tests/data/wordlist tests/docs/pod-spelling-t \
-       tests/docs/pod-t tests/perl/critic-t tests/perl/minimum-version-t   \
-       tests/perl/strict-t tests/tap/libtap.sh tests/tap/perl/Test/RRA.pm  \
-       tests/tap/perl/Test/RRA/Config.pm                                   \
-       tests/tap/perl/Test/RRA/Automake.pm tests/tools/cdbmake-wordlist    \
-       tests/tools/heimdal-strength-t tools/heimdal-strength.pod
+EXTRA_DIST = .gitignore LICENSE autogen cracklib/HISTORY cracklib/LICENCE  \
+       cracklib/README cracklib/genrules.pl cracklib/mkdict tests/HOWTO   \
+       tests/TESTS tests/data/krb5.conf tests/data/make-krb5-conf         \
+       tests/data/passwords tests/data/perl.conf tests/data/perlcriticrc  \
+       tests/data/perltidyrc tests/data/wordlist tests/data/wordlist.cdb  \
+       tests/docs/pod-spelling-t tests/docs/pod-t tests/perl/critic-t     \
+       tests/perl/minimum-version-t tests/perl/strict-t                   \
+       tests/tap/libtap.sh tests/tap/perl/Test/RRA.pm                     \
+       tests/tap/perl/Test/RRA/Config.pm                                  \
+       tests/tap/perl/Test/RRA/Automake.pm tests/tools/cdbmake-wordlist-t \
+       tests/tools/heimdal-strength-t tests/util/xmalloc-t                \
+       tools/heimdal-strength.pod
 
 # Do this globally.  Everything needs to find the Kerberos headers and
 # libraries, and if we're using the system CrackLib or libcdb, add its
@@ -24,9 +26,6 @@ EXTRA_DIST = .gitignore LICENSE autogen cracklib/HISTORY cracklib/LICENCE   \
 AM_CPPFLAGS = $(CRACKLIB_CPPFLAGS) $(KRB5_CPPFLAGS) $(CDB_CPPFLAGS)
 AM_LDFLAGS = $(CRACKLIB_LDFLAGS) $(KRB5_LDFLAGS) $(CDB_LDFLAGS)
 
-# Put the module into /usr/local/lib/kadmind by default, relative to --libdir.
-moduledir = $(libdir)/kadmind
-
 # Build our portability library.
 noinst_LTLIBRARIES = portable/libportable.la
 portable_libportable_la_SOURCES = portable/dummy.c portable/kadmin.h   \
@@ -51,24 +50,29 @@ if EMBEDDED_CRACKLIB
     noinst_LTLIBRARIES += cracklib/libcracklib.la
 endif
 
+# Put the plugin into $(libdir)/krb5/plugins/pwqual by default,
+moduledir = $(libdir)/krb5/plugins/pwqual
+
 # Rules for building the password strength plugin.
-module_LTLIBRARIES = plugin/passwd_strength.la
-plugin_passwd_strength_la_SOURCES = plugin/api.c plugin/cdb.c \
-       plugin/heimdal.c plugin/internal.h plugin/mit.c
-plugin_passwd_strength_la_LDFLAGS = -module -avoid-version
+module_LTLIBRARIES = plugin/strength.la
+plugin_strength_la_SOURCES = plugin/cdb.c plugin/classes.c plugin/config.c \
+       plugin/cracklib.c plugin/error.c plugin/general.c plugin/heimdal.c \
+       plugin/internal.h plugin/mit.c plugin/principal.c plugin/vector.c
+plugin_strength_la_LDFLAGS = -module -avoid-version
 if EMBEDDED_CRACKLIB
-    plugin_passwd_strength_la_LIBADD = cracklib/libcracklib.la
+    plugin_strength_la_LIBADD = cracklib/libcracklib.la
 else
-    plugin_passwd_strength_la_LIBADD = $(CRACKLIB_LIBS)
+    plugin_strength_la_LIBADD = $(CRACKLIB_LIBS)
 endif
-plugin_passwd_strength_la_LIBADD += portable/libportable.la $(KRB5_LIBS) \
-       $(CDB_LIBS)
+plugin_strength_la_LIBADD += portable/libportable.la $(KRB5_LIBS) $(CDB_LIBS)
 
 # The Heimdal external check program.
 bin_PROGRAMS = tools/heimdal-strength
 tools_heimdal_strength_CFLAGS = $(AM_CFLAGS)
-tools_heimdal_strength_SOURCES = plugin/api.c plugin/cdb.c \
-       plugin/internal.h tools/heimdal-strength.c
+tools_heimdal_strength_SOURCES = plugin/cdb.c plugin/classes.c           \
+       plugin/config.c plugin/cracklib.c plugin/error.c plugin/general.c \
+       plugin/internal.h plugin/principal.c plugin/vector.c              \
+       tools/heimdal-strength.c
 if EMBEDDED_CRACKLIB
     tools_heimdal_strength_LDADD = cracklib/libcracklib.la
 else
@@ -119,7 +123,6 @@ warnings:
 # The bits below are for the test suite, not for the main package.
 check_PROGRAMS = tests/runtests tests/plugin/heimdal-t tests/plugin/mit-t   \
        tests/portable/asprintf-t tests/portable/snprintf-t                 \
-       tests/portable/strlcat-t tests/portable/strlcpy-t                   \
        tests/util/messages-krb5-t tests/util/messages-t tests/util/xmalloc
 if EMBEDDED_CRACKLIB
     check_PROGRAMS += cracklib/packer
@@ -146,12 +149,6 @@ tests_portable_asprintf_t_LDADD = tests/tap/libtap.a portable/libportable.la
 tests_portable_snprintf_t_SOURCES = tests/portable/snprintf-t.c \
        tests/portable/snprintf.c
 tests_portable_snprintf_t_LDADD = tests/tap/libtap.a portable/libportable.la
-tests_portable_strlcat_t_SOURCES = tests/portable/strlcat-t.c \
-       tests/portable/strlcat.c
-tests_portable_strlcat_t_LDADD = tests/tap/libtap.a portable/libportable.la
-tests_portable_strlcpy_t_SOURCES = tests/portable/strlcpy-t.c \
-       tests/portable/strlcpy.c
-tests_portable_strlcpy_t_LDADD = tests/tap/libtap.a portable/libportable.la
 tests_util_messages_t_LDADD = tests/tap/libtap.a util/libutil.a \
        portable/libportable.la
 tests_util_messages_krb5_t_LDADD = tests/tap/libtap.a util/libutil.a \