From 98e79396ce0e04a55b9bd1cb62e82116e584c4ef Mon Sep 17 00:00:00 2001
From: Michael Rash <mbr@cipherdyne.org>
Date: Sun, 13 Dec 2015 02:24:30 -0800
Subject: [PATCH] [test suite] start on --access-folder include dir test

---
 server/access.c                 |  10 ++++++++++
 test/conf/access-include.tar.gz | Bin 221 -> 502 bytes
 test/tests/rijndael_hmac.pl     |  12 ++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/server/access.c b/server/access.c
index 01fc727f..6e5ae1bd 100644
--- a/server/access.c
+++ b/server/access.c
@@ -1425,6 +1425,15 @@ parse_access_file(fko_srv_options_t *opts, char *access_filename, int *depth)
     /* First see if the access file exists.  If it doesn't, complain
      * and bail.
     */
+#if HAVE_LSTAT
+    if(lstat(access_filename, &st) != 0)
+    {
+        log_msg(LOG_ERR, "[*] Access file: '%s' was not found.",
+            access_filename);
+
+        return EXIT_FAILURE;
+    }
+#elif HAVE_STAT
     if(stat(access_filename, &st) != 0)
     {
         log_msg(LOG_ERR, "[*] Access file: '%s' was not found.",
@@ -1432,6 +1441,7 @@ parse_access_file(fko_srv_options_t *opts, char *access_filename, int *depth)
 
         return EXIT_FAILURE;
     }
+#endif
 
     if(verify_file_perms_ownership(access_filename) != 1)
         return EXIT_FAILURE;
diff --git a/test/conf/access-include.tar.gz b/test/conf/access-include.tar.gz
index 8fdca8e9e5fb03594c20ff2dac7f85840d484728..cc09175ab8f7d1613f3918134744cbd075cde172 100644
GIT binary patch
literal 502
zcmV<S0SW#eiwFRaK5bS21MSw&bDBUD2XM~*6?=EmEU@fO4jvFOW(<gmrk)tYMQM;t
z`BAHXebFS7#D<!-#!ja1bAe%ZK<4XvJU<9{mYqdO5EnCkF1-g_Voci}Wv1ch$48Q^
zP*qh_%H(pNtYAhYq`k|p*;8b>pCTkJr|B>E9a{gO{FnL9c<2{#o*ng%@EiFvnXoc{
zm0=a~KZUCNA5Ogc^-qCF!ash-HeiZzW&UOMPx-4<+N~-Q!bg11O8<HO!`^6Mm}sAF
zPikFr^3(NFxVlZmUCy(-*1qv{!!U<K&%LtD-pIY*q1OKOTY<N#s{h5(4~|m&(&747
zHS+ZRSGN71GDe~PPobjz9~*$z)Q2V|FV|KZ+o6hZoVgj)Z$G!3{&mOc`RjhOu&0xe
z>p1m(YNmE;Id9ZDmTq{j+-b6?e~&iJB&KbV8yXK-+fT-qMm(_MtfxB*rJ!7VOL!VK
z$K91b?ry$ZifP=oI#!@vsII+^@a!fb;_h0wSL2JX=XpMFG^&~sbfs7A)qf(+9<GE@
z%#Sn%zIpzWiAHwwzlI6Se<yJu|ADEuEb}j)vFrboROesL{CoK`g+Tv51zVtJUwO1k
s9YqPs7g2_0QObi{q-$uM0000000000000000KiA`17N3&82~5%08c;yKL7v#

literal 221
zcmV<303!b%iwFRA%WPHv1MSkmYQiuW!10{-6yFOtlQwD213l_tZ%|`p0oOuP55B$C
zDLBEEF`bP4f0qx^Kob5fL#R?3#X77v%WACdLHE3O`)Rz>=kr9FtjKd?UG8(GO{V)H
z?k=~vut{Cnim3NR`{ll&?|)SJxqsb^jw`FUuF`G(hwt>arr&3rw)FoM1N~p8FO%8y
zhiB{q7lpmv-}=k`KC?>nO<p+QpZA|P@)7(wH1$dj)g{)_y~QNU*jAxy+U?V$uL%GE
X00000000000DvoY)NFNh04M+edP#Dq

diff --git a/test/tests/rijndael_hmac.pl b/test/tests/rijndael_hmac.pl
index 92cd9fac..ba93dae8 100644
--- a/test/tests/rijndael_hmac.pl
+++ b/test/tests/rijndael_hmac.pl
@@ -166,6 +166,18 @@
         'fw_rule_removed' => $NEW_RULE_REMOVED,
         'key_file' => $cf{'rc_hmac_b64_key'},
     },
+    {
+        'category' => 'Rijndael+HMAC',
+        'subcategory' => 'client+server',
+        'detail'   => 'complete cycle, include (3)',
+        'function' => \&spa_cycle,
+        'cmdline'  => $default_client_hmac_args,
+        'fwknopd_cmdline' => "$fwknopdCmd -c $cf{'def'} --access-folder conf/access-include/defaults " .
+            "-d $default_digest_file -p $default_pid_file $intf_str",
+        'fw_rule_created' => $NEW_RULE_REQUIRED,
+        'fw_rule_removed' => $NEW_RULE_REMOVED,
+        'key_file' => $cf{'rc_hmac_b64_key'},
+    },
 
     {
         'category' => 'Rijndael+HMAC',