diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-03-16 14:06:03 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2017-04-03 10:59:00 -0400 |
| commit | edd502f82ad8d6fdc95cb0e0b508c2bf09ecd837 (patch) | |
| tree | 1924559e4d29068bba444a1099cec8b298457617 | |
| parent | cd57de636f9b1c12153ab3ba44a6da77900ad895 (diff) | |
| download | sway-edd502f82ad8d6fdc95cb0e0b508c2bf09ecd837.zip sway-edd502f82ad8d6fdc95cb0e0b508c2bf09ecd837.tar.gz sway-edd502f82ad8d6fdc95cb0e0b508c2bf09ecd837.tar.bz2 | |
Merge pull request #1117 from jnsaff/master
Allow also 444 for security file mode
| -rw-r--r-- | sway/config.c | 4 | ||||
| -rw-r--r-- | sway/sway-security.7.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sway/config.c b/sway/config.c index 88e6fad..92d971d 100644 --- a/sway/config.c +++ b/sway/config.c @@ -543,8 +543,8 @@ bool load_main_config(const char *file, bool is_active) { for (int i = 0; i < secconfigs->length; ++i) { char *_path = secconfigs->items[i]; struct stat s; - if (stat(_path, &s) || s.st_uid != 0 || s.st_gid != 0 || (s.st_mode & 0777) != 0644) { - sway_log(L_ERROR, "Refusing to load %s - it must be owned by root and mode 644", _path); + if (stat(_path, &s) || s.st_uid != 0 || s.st_gid != 0 || (((s.st_mode & 0777) != 0644) && (s.st_mode & 0777) != 0444)) { + sway_log(L_ERROR, "Refusing to load %s - it must be owned by root and mode 644 or 444", _path); success = false; } else { success = success && load_config(_path, config); diff --git a/sway/sway-security.7.txt b/sway/sway-security.7.txt index fb47ffc..ec6df1f 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. Configuration of security features is limited to files in the security directory (this is likely /etc/sway/security.d/*, but depends on your installation prefix). -Files in this directory must be owned by root:root and chmod 644. The default +Files in this directory must be owned by root:root and chmod 644 or 444. The default security configuration is installed to /etc/sway/security.d/00-defaults, and should not be modified - it will be updated with the latest recommended security defaults between releases. To override the defaults, you should add more files to |