Imported Upstream version 1.0

diff --git a/LICENSE b/LICENSE
index 3676f3bd3b9223c115ab795c16cc5a4aa9dc2e67..bbc997613f9bdd6288a37448886d01f6c7454dc0 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -36,6 +36,7 @@ Collected copyright notices for the entire package:
       Russ Allbery <rra@stanford.edu>
   Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
       Board of Trustees, Leland Stanford Jr. University
+  Copyright 1993 Alec Muffett
   Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009
       by Internet Systems Consortium, Inc. ("ISC")
   Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
@@ -58,9 +59,9 @@ You may do anything you like with that code, although I would strongly
 prefer that any improvements or modifications be sent to me
 (rra@stanford.edu) so that I can continue to maintain a canonical version.
 
-The files tests/portable/snprintf.c, tests/portable/strlcat.c, and
-tests/portable/strlcpy.c are released under the following
-copyright and license:
+The files tests/portable/snprintf.c, tests/portable/strlcat.c,
+tests/portable/strlcpy.c, tests/tap/basic.c, and tests/tap/basic.h are
+released under the following copyright and license:
 
   Copyright 2009 Russ Allbery <rra@stanford.edu>
   Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010

diff --git a/Makefile.am b/Makefile.am
index f87b37e19fedb453b76bf87e1fba1749cfd2cfd3..c4a72012ecab269c648bf01526728e47112fd31e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,7 @@ module_LTLIBRARIES = plugin/passwd_strength.la
 plugin_passwd_strength_la_SOURCES = plugin/api.c plugin/heimdal.c plugin/mit.c
 plugin_passwd_strength_la_LDFLAGS = -module -avoid-version
 plugin_passwd_strength_la_LIBADD = cracklib/libcracklib.la \
-       portable/libportable.la
+       portable/libportable.la $(KRB5_LIBS)
 
 # The Heimdal external-check program.
 bin_PROGRAMS = external/heimdal-strength

diff --git a/Makefile.in b/Makefile.in
index 5063b53bd65c4c56ad0579e0b65cffb648095bcb..b70acd3a61b4ee91ab2f9f23242b6a9bcbd49e65 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -120,8 +120,9 @@ cracklib_libcracklib_la_OBJECTS =  \
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
+am__DEPENDENCIES_1 =
 plugin_passwd_strength_la_DEPENDENCIES = cracklib/libcracklib.la \
-       portable/libportable.la
+       portable/libportable.la $(am__DEPENDENCIES_1)
 am_plugin_passwd_strength_la_OBJECTS = plugin/api.lo plugin/heimdal.lo \
        plugin/mit.lo
 plugin_passwd_strength_la_OBJECTS =  \
@@ -144,7 +145,6 @@ am_external_heimdal_strength_OBJECTS =  \
        external/external_heimdal_strength-heimdal-strength.$(OBJEXT)
 external_heimdal_strength_OBJECTS =  \
        $(am_external_heimdal_strength_OBJECTS)
-am__DEPENDENCIES_1 =
 external_heimdal_strength_DEPENDENCIES = cracklib/libcracklib.la \
        portable/libportable.la $(am__DEPENDENCIES_1)
 external_heimdal_strength_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -404,7 +404,7 @@ module_LTLIBRARIES = plugin/passwd_strength.la
 plugin_passwd_strength_la_SOURCES = plugin/api.c plugin/heimdal.c plugin/mit.c
 plugin_passwd_strength_la_LDFLAGS = -module -avoid-version
 plugin_passwd_strength_la_LIBADD = cracklib/libcracklib.la \
-       portable/libportable.la
+       portable/libportable.la $(KRB5_LIBS)
 
 external_heimdal_strength_CFLAGS = $(AM_CFLAGS)
 external_heimdal_strength_SOURCES = plugin/api.c plugin/api.h \