aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Jaanus Torp <jaanus@saun.ee>2017-03-16 15:12:22 +0000
committerLibravatar Jaanus Torp <jaanus@saun.ee>2017-03-16 15:12:22 +0000
commit8306b886e9d24a5bbeafedf315724f97b3ae86d4 (patch)
treea00b20bface88b4ac872df001c4cc6946b657663
parentMerge pull request #1115 from snoack/missing-includes (diff)
downloadsway-8306b886e9d24a5bbeafedf315724f97b3ae86d4.tar.gz
sway-8306b886e9d24a5bbeafedf315724f97b3ae86d4.tar.zst
sway-8306b886e9d24a5bbeafedf315724f97b3ae86d4.zip
Allow also 444 for security file mode
-rw-r--r--sway/config.c4
-rw-r--r--sway/sway-security.7.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/sway/config.c b/sway/config.c
index f46ce882..46faf643 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -547,8 +547,8 @@ bool load_main_config(const char *file, bool is_active) {
547 list_qsort(secconfigs, qstrcmp); 547 list_qsort(secconfigs, qstrcmp);
548 for (int i = 0; i < secconfigs->length; ++i) { 548 for (int i = 0; i < secconfigs->length; ++i) {
549 char *_path = secconfigs->items[i]; 549 char *_path = secconfigs->items[i];
550 if (stat(_path, &s) || s.st_uid != 0 || s.st_gid != 0 || (s.st_mode & 0777) != 0644) { 550 if (stat(_path, &s) || s.st_uid != 0 || s.st_gid != 0 || (((s.st_mode & 0777) != 0644) && (s.st_mode & 0777) != 0444)) {
551 sway_log(L_ERROR, "Refusing to load %s - it must be owned by root and mode 644", _path); 551 sway_log(L_ERROR, "Refusing to load %s - it must be owned by root and mode 644 or 444", _path);
552 success = false; 552 success = false;
553 } else { 553 } else {
554 success = success && load_config(_path, config); 554 success = success && load_config(_path, config);
diff --git a/sway/sway-security.7.txt b/sway/sway-security.7.txt
index fb47ffcf..ec6df1f3 100644
--- a/sway/sway-security.7.txt
+++ b/sway/sway-security.7.txt
@@ -21,7 +21,7 @@ you must make a few changes external to sway first.
21 21
22Configuration of security features is limited to files in the security directory 22Configuration of security features is limited to files in the security directory
23(this is likely /etc/sway/security.d/*, but depends on your installation prefix). 23(this is likely /etc/sway/security.d/*, but depends on your installation prefix).
24Files in this directory must be owned by root:root and chmod 644. The default 24Files in this directory must be owned by root:root and chmod 644 or 444. The default
25security configuration is installed to /etc/sway/security.d/00-defaults, and 25security configuration is installed to /etc/sway/security.d/00-defaults, and
26should not be modified - it will be updated with the latest recommended security 26should not be modified - it will be updated with the latest recommended security
27defaults between releases. To override the defaults, you should add more files to 27defaults between releases. To override the defaults, you should add more files to