diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2014-05-16 17:43:42 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2014-05-16 17:50:29 +0200 |
| commit | 7c888e0d23b98b00a11616364499f0f651f9c481 (patch) | |
| tree | 2306efc5cd53ebaf1a09e83ca9cfa515eaed9e2c /src | |
| parent | 2145f0c212d6e804125c615978fd22f3829e8839 (diff) | |
| download | strongswan-7c888e0d23b98b00a11616364499f0f651f9c481.tar.bz2 strongswan-7c888e0d23b98b00a11616364499f0f651f9c481.tar.xz | |
unit-tests: Don't assert failures for unreadable settings files as root
The file can still be read by root even if nobody has read privileges.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstrongswan/tests/suites/test_settings.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/libstrongswan/tests/suites/test_settings.c b/src/libstrongswan/tests/suites/test_settings.c index e504b95a1..97e45fc04 100644 --- a/src/libstrongswan/tests/suites/test_settings.c +++ b/src/libstrongswan/tests/suites/test_settings.c @@ -675,11 +675,14 @@ START_TEST(test_load_files_section) ck_assert(!settings->load_files_section(settings, include1".conf", TRUE, "")); verify_include(); - /* unreadable files are too */ - ck_assert(chunk_write(contents, include1".no", 0444, TRUE)); - ck_assert(!settings->load_files_section(settings, include1".no", TRUE, "")); - unlink(include1".no"); - verify_include(); + /* unreadable files are too (only fails when not running as root) */ + if (getuid() != 0) + { + ck_assert(chunk_write(contents, include1".no", 0444, TRUE)); + ck_assert(!settings->load_files_section(settings, include1".no", TRUE, "")); + unlink(include1".no"); + verify_include(); + } ck_assert(settings->load_files_section(settings, include2, FALSE, "main")); verify_null("main.key1"); |