Merge branch 'master' into crypto_update

This commit is contained in:
Michael Rash 2012-07-10 08:23:16 -04:00
commit e5004dc829
5 changed files with 54 additions and 7550 deletions

7595
ChangeLog

File diff suppressed because it is too large Load Diff

View File

@ -113,6 +113,7 @@ EXTRA_DIST = \
test/conf/client-gpg/trustdb.gpg \
test/conf/default_access.conf \
test/conf/default_fwknopd.conf \
test/conf/dual_key_usage_access.conf \
test/conf/expired_epoch_stanza_access.conf \
test/conf/expired_stanza_access.conf \
test/conf/force_nat_access.conf \

View File

@ -1 +1 @@
fwknop-2.0
fwknop-2.0.1-pre2

View File

@ -11,7 +11,7 @@ AC_PREREQ(2.62)
dnl Define our name, version and email.
m4_define(my_package, [fwknop])
m4_define(my_version, [2.0])
m4_define(my_version, [2.0.1-pre2])
m4_define(my_bug_email, [dstuart@dstuart.org])
AC_INIT(my_package, my_version, my_bug_email)

View File

@ -1492,8 +1492,8 @@ sub process_include_exclude() {
sub diff_test_results() {
$diff_dir1 = "${output_dir}.last" unless $diff_dir2;
$diff_dir2 = $output_dir unless $diff_dir1;
$diff_dir1 = "${output_dir}.last" unless $diff_dir1;
$diff_dir2 = $output_dir unless $diff_dir2;
die "[*] Need results from a previous run before running --diff"
unless -d $diff_dir2;