diff options
author | David Zeuthen <davidz@redhat.com> | 2012-05-21 10:45:08 -0400 |
---|---|---|
committer | David Zeuthen <davidz@redhat.com> | 2012-05-21 10:45:08 -0400 |
commit | 89865529ec98067ba8eada3b59938204534de7b2 (patch) | |
tree | 97881ce93995c2f83f6292dd20e3dc063fa47a32 /test | |
parent | 55b3314cb1f4fd887f50b7a312efd8703dfa8889 (diff) | |
download | polkit-89865529ec98067ba8eada3b59938204534de7b2.tar.gz |
Also load rules from /usr/share/polkit/rules.d
... in addition to /etc/polkit/rules.d.
Signed-off-by: David Zeuthen <davidz@redhat.com>
Diffstat (limited to 'test')
-rw-r--r-- | test/data/etc/polkit-1/rules.d/10-testing.rules | 2 | ||||
-rw-r--r-- | test/data/usr/share/polkit-1/rules.d/10-testing.rules | 5 | ||||
-rw-r--r-- | test/polkitbackend/test-polkitbackendjsauthority.c | 14 |
3 files changed, 16 insertions, 5 deletions
diff --git a/test/data/etc/polkit-1/rules.d/10-testing.rules b/test/data/etc/polkit-1/rules.d/10-testing.rules index 9453c44..d4bb324 100644 --- a/test/data/etc/polkit-1/rules.d/10-testing.rules +++ b/test/data/etc/polkit-1/rules.d/10-testing.rules @@ -2,6 +2,8 @@ /* see test/polkitbackend/test-polkitbackendjsauthority.c */ +/* NOTE: this is the /etc/polkit-1/rules.d version of 10-testing.rules */ + polkit.addAdministratorRule(function(action, subject, details) { return ["unix-group:admin", "unix-user:root"]; }); diff --git a/test/data/usr/share/polkit-1/rules.d/10-testing.rules b/test/data/usr/share/polkit-1/rules.d/10-testing.rules new file mode 100644 index 0000000..ab2fd97 --- /dev/null +++ b/test/data/usr/share/polkit-1/rules.d/10-testing.rules @@ -0,0 +1,5 @@ +/* -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- */ + +/* see test/polkitbackend/test-polkitbackendjsauthority.c */ + +/* NOTE: this is the /usr/share/polkit-1/rules.d version of 10-testing.rules */ diff --git a/test/polkitbackend/test-polkitbackendjsauthority.c b/test/polkitbackend/test-polkitbackendjsauthority.c index bc1b242..67f5d8b 100644 --- a/test/polkitbackend/test-polkitbackendjsauthority.c +++ b/test/polkitbackend/test-polkitbackendjsauthority.c @@ -36,16 +36,20 @@ static PolkitBackendJsAuthority *get_authority (void); static PolkitBackendJsAuthority * get_authority (void) { - gchar *rules_dir; + gchar *rules_dirs[3] = {0}; PolkitBackendJsAuthority *authority; - rules_dir = polkit_test_get_data_path ("etc/polkit-1/rules.d"); - g_assert (rules_dir != NULL); + rules_dirs[0] = polkit_test_get_data_path ("etc/polkit-1/rules.d"); + rules_dirs[1] = polkit_test_get_data_path ("usr/share/polkit-1/rules.d"); + rules_dirs[2] = NULL; + g_assert (rules_dirs[0] != NULL); + g_assert (rules_dirs[1] != NULL); authority = g_object_new (POLKIT_BACKEND_TYPE_JS_AUTHORITY, - "rules-dir", rules_dir, + "rules-dirs", rules_dirs, NULL); - g_free (rules_dir); + g_free (rules_dirs[0]); + g_free (rules_dirs[1]); return authority; } |