From 8fd55c8089c90b52f00e4ffad572d1b9da72e6ba Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Thu, 7 Mar 2013 18:53:50 +0100 Subject: p11-kit: New priority option and change trust-policy option * Sort loaded modules appropriately using the 'priority' option. This allows us to have a predictable order for callers, when callers iterate through modules. * Modules default to having an 'priority' option of '0'. * If modules have the same order value, then sort by name. * The above assumes the role of ordering trust-policy sources. * Change the trust-policy option to a boolean * Some of this code will be rearranged when the managed branch is merged. https://bugs.freedesktop.org/show_bug.cgi?id=61978 --- p11-kit/tests/files/package-modules/four.module | 1 + p11-kit/tests/files/package-modules/win32/four.module | 1 + p11-kit/tests/files/system-modules/two-duplicate.module | 1 + p11-kit/tests/files/system-modules/two.badname | 1 + p11-kit/tests/files/system-modules/win32/one.module | 3 ++- p11-kit/tests/files/system-modules/win32/two-duplicate.module | 1 + p11-kit/tests/files/system-modules/win32/two.badname | 1 + p11-kit/tests/files/user-modules/three.module | 3 ++- p11-kit/tests/files/user-modules/win32/three.module | 3 ++- 9 files changed, 12 insertions(+), 3 deletions(-) (limited to 'p11-kit/tests/files') diff --git a/p11-kit/tests/files/package-modules/four.module b/p11-kit/tests/files/package-modules/four.module index 6eace3c..545c285 100644 --- a/p11-kit/tests/files/package-modules/four.module +++ b/p11-kit/tests/files/package-modules/four.module @@ -1,3 +1,4 @@ module: mock-four.so disable-in: test-disable, test-other +priority: 4 \ No newline at end of file diff --git a/p11-kit/tests/files/package-modules/win32/four.module b/p11-kit/tests/files/package-modules/win32/four.module index 7fd1540..6dc87c9 100644 --- a/p11-kit/tests/files/package-modules/win32/four.module +++ b/p11-kit/tests/files/package-modules/win32/four.module @@ -1,3 +1,4 @@ module: mock-four.dll disable-in: test-disable, test-other +priority: 4 \ No newline at end of file diff --git a/p11-kit/tests/files/system-modules/two-duplicate.module b/p11-kit/tests/files/system-modules/two-duplicate.module index 907aa75..756af69 100644 --- a/p11-kit/tests/files/system-modules/two-duplicate.module +++ b/p11-kit/tests/files/system-modules/two-duplicate.module @@ -1,3 +1,4 @@ # This is a duplicate of the 'two' module module: mock-two.so +# no priority, use name \ No newline at end of file diff --git a/p11-kit/tests/files/system-modules/two.badname b/p11-kit/tests/files/system-modules/two.badname index 0d41cac..eec3af0 100644 --- a/p11-kit/tests/files/system-modules/two.badname +++ b/p11-kit/tests/files/system-modules/two.badname @@ -3,3 +3,4 @@ module: mock-two.so setting: system2 +# no priority, use name \ No newline at end of file diff --git a/p11-kit/tests/files/system-modules/win32/one.module b/p11-kit/tests/files/system-modules/win32/one.module index 5f80304..d153ce5 100644 --- a/p11-kit/tests/files/system-modules/win32/one.module +++ b/p11-kit/tests/files/system-modules/win32/one.module @@ -1,3 +1,4 @@ module: mock-one.dll -setting: system1 \ No newline at end of file +setting: system1 +# no order, use name \ No newline at end of file diff --git a/p11-kit/tests/files/system-modules/win32/two-duplicate.module b/p11-kit/tests/files/system-modules/win32/two-duplicate.module index e80c9e8..54ef1cc 100644 --- a/p11-kit/tests/files/system-modules/win32/two-duplicate.module +++ b/p11-kit/tests/files/system-modules/win32/two-duplicate.module @@ -1,3 +1,4 @@ # This is a duplicate of the 'two' module module: mock-two.dll +# no order, use name \ No newline at end of file diff --git a/p11-kit/tests/files/system-modules/win32/two.badname b/p11-kit/tests/files/system-modules/win32/two.badname index ae44b83..af63cf9 100644 --- a/p11-kit/tests/files/system-modules/win32/two.badname +++ b/p11-kit/tests/files/system-modules/win32/two.badname @@ -3,3 +3,4 @@ module: mock-two.dll setting: system2 +# no order, use name \ No newline at end of file diff --git a/p11-kit/tests/files/user-modules/three.module b/p11-kit/tests/files/user-modules/three.module index 00caab5..3a2366d 100644 --- a/p11-kit/tests/files/user-modules/three.module +++ b/p11-kit/tests/files/user-modules/three.module @@ -2,4 +2,5 @@ module: mock-three.so setting: user3 -enable-in: test-enable \ No newline at end of file +enable-in: test-enable +priority: 3 \ No newline at end of file diff --git a/p11-kit/tests/files/user-modules/win32/three.module b/p11-kit/tests/files/user-modules/win32/three.module index 58f883d..30a3b63 100644 --- a/p11-kit/tests/files/user-modules/win32/three.module +++ b/p11-kit/tests/files/user-modules/win32/three.module @@ -2,4 +2,5 @@ module: mock-three.dll setting: user3 -enable-in: test-enable \ No newline at end of file +enable-in: test-enable +priority: 3 \ No newline at end of file -- cgit v1.1