From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Thu, 11 Jul 2013 08:34:00 +0000 (+0200)
Subject: Override policy recommendation in enforcement
X-Git-Tag: 5.1.0rc1~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a013e1af5549fb042a9f4a8f95707f63061b97b;p=thirdparty%2Fstrongswan.git

Override policy recommendation in enforcement
---

diff --git a/testing/tests/tnc/tnccs-11-radius-pts/hosts/alice/etc/pts/data.sql b/testing/tests/tnc/tnccs-11-radius-pts/hosts/alice/etc/pts/data.sql
index 07dc7dc559..090eb47ff3 100644
--- a/testing/tests/tnc/tnccs-11-radius-pts/hosts/alice/etc/pts/data.sql
+++ b/testing/tests/tnc/tnccs-11-radius-pts/hosts/alice/etc/pts/data.sql
@@ -423,25 +423,25 @@ INSERT INTO packages (			/*  4 */
 INSERT INTO versions (
   package, product, release, time
 ) VALUES (
-  1, 1, '1.0.1e-2', 1366531494
+  1, 4, '1.0.1e-2', 1366531494
 );
 
 INSERT INTO versions (
   package, product, release, time
 ) VALUES (
-  2, 1, '1.0.1e-2', 1366531494
+  2, 4, '1.0.1e-2', 1366531494
 );
 
 INSERT INTO versions (
   package, product, release, time
 ) VALUES (
-  3, 1, '1.0.1e-2', 1366531494
+  3, 4, '1.0.1e-2', 1366531494
 );
 
 INSERT INTO versions (
   package, product, release, time
 ) VALUES (
-  4, 1, '1.0.1e-2', 1366531494
+  4, 4, '1.0.1e-2', 1366531494
 );
 
 /* Components */
@@ -699,7 +699,7 @@ INSERT INTO policies (			/*  2 */
 INSERT INTO policies (			/*  3 */
   type, name, rec_fail, rec_noresult
 ) VALUES (
-  3, 'IP Forwarding Enabled',  2, 2 
+  3, 'IP Forwarding Enabled',  1, 1
 );
 
 INSERT INTO policies (			/*  4 */
@@ -789,15 +789,15 @@ INSERT INTO enforcements (
 );
 
 INSERT INTO enforcements (
-  policy, group_id, max_age
+  policy, group_id, max_age, rec_fail, rec_noresult
 ) VALUES (
-  3, 2, 0
+  3, 2, 0, 2, 2
 );
 
 INSERT INTO enforcements (
-  policy, group_id, max_age
+  policy, group_id, max_age, rec_fail, rec_noresult
 ) VALUES (
-  3, 10, 0
+  3, 10, 0, 2, 2
 );
 
 INSERT INTO enforcements (
diff --git a/testing/tests/tnc/tnccs-20-os/hosts/moon/etc/pts/data.sql b/testing/tests/tnc/tnccs-20-os/hosts/moon/etc/pts/data.sql
index 1ce5d09489..d114233531 100644
--- a/testing/tests/tnc/tnccs-20-os/hosts/moon/etc/pts/data.sql
+++ b/testing/tests/tnc/tnccs-20-os/hosts/moon/etc/pts/data.sql
@@ -683,7 +683,7 @@ INSERT INTO policies (			/*  2 */
 INSERT INTO policies (			/*  3 */
   type, name, rec_fail, rec_noresult
 ) VALUES (
-  3, 'IP Forwarding Enabled',  2, 2 
+  3, 'IP Forwarding Enabled',  1, 1
 );
 
 INSERT INTO policies (			/*  4 */
@@ -779,9 +779,9 @@ INSERT INTO enforcements (
 );
 
 INSERT INTO enforcements (
-  policy, group_id, max_age
+  policy, group_id, max_age, rec_fail, rec_noresult
 ) VALUES (
-  3, 2, 0
+  3, 2, 0, 2, 2
 );
 
 INSERT INTO enforcements (
diff --git a/testing/tests/tnc/tnccs-20-pts/hosts/moon/etc/pts/data.sql b/testing/tests/tnc/tnccs-20-pts/hosts/moon/etc/pts/data.sql
index 920be0fe96..090eb47ff3 100644
--- a/testing/tests/tnc/tnccs-20-pts/hosts/moon/etc/pts/data.sql
+++ b/testing/tests/tnc/tnccs-20-pts/hosts/moon/etc/pts/data.sql
@@ -699,7 +699,7 @@ INSERT INTO policies (			/*  2 */
 INSERT INTO policies (			/*  3 */
   type, name, rec_fail, rec_noresult
 ) VALUES (
-  3, 'IP Forwarding Enabled',  2, 2 
+  3, 'IP Forwarding Enabled',  1, 1
 );
 
 INSERT INTO policies (			/*  4 */
@@ -789,15 +789,15 @@ INSERT INTO enforcements (
 );
 
 INSERT INTO enforcements (
-  policy, group_id, max_age
+  policy, group_id, max_age, rec_fail, rec_noresult
 ) VALUES (
-  3, 2, 0
+  3, 2, 0, 2, 2
 );
 
 INSERT INTO enforcements (
-  policy, group_id, max_age
+  policy, group_id, max_age, rec_fail, rec_noresult
 ) VALUES (
-  3, 10, 0
+  3, 10, 0, 2, 2
 );
 
 INSERT INTO enforcements (