[client] merged --stanza-list changes from Franck, closes #94
authorMichael Rash <mbr@cipherdyne.org>
Fri, 9 Aug 2013 00:54:07 +0000 (20:54 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Fri, 9 Aug 2013 00:54:07 +0000 (20:54 -0400)
1  2 
Makefile.am
test/test-fwknop.pl
test/tests/basic_operations.pl

diff --cc Makefile.am
@@@ -209,6 -209,6 +209,7 @@@ EXTRA_DIST = 
      test/conf/fwknoprc_gpg_args_no_pw_hmac_key \
      test/conf/fwknoprc_gpg_signing_pw \
      test/conf/fwknoprc_named_gpg_signing_pw \
++    test/conf/fwknoprc_stanza_list \
      test/conf/icmp_pcap_filter_fwknopd.conf \
      test/conf/invalid_expire_access.conf \
      test/conf/invalid_source_access.conf \
Simple merge
Simple merge