summaryrefslogtreecommitdiff
path: root/readconf.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2014-02-09 16:09:58 +0000
committerColin Watson <cjwatson@debian.org>2018-10-20 22:54:09 +0100
commit7b931d36ad36a93d2b1811858ca29408ec44ecae (patch)
tree169969b1dbe936bf31ea64d4335152968d56f8d5 /readconf.c
parente755ec70d62bfb9b02159123f4e870b00010be77 (diff)
Allow harmless group-writability
Allow secure files (~/.ssh/config, ~/.ssh/authorized_keys, etc.) to be group-writable, provided that the group in question contains only the file's owner. Rejected upstream for IMO incorrect reasons (e.g. a misunderstanding about the contents of gr->gr_mem). Given that per-user groups and umask 002 are the default setup in Debian (for good reasons - this makes operating in setgid directories with other groups much easier), we need to permit this by default. Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1060 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=314347 Last-Update: 2017-10-04 Patch-Name: user-group-modes.patch
Diffstat (limited to 'readconf.c')
-rw-r--r--readconf.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/readconf.c b/readconf.c
index 052d4b1ac..6b01f20d2 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1820,8 +1820,7 @@ read_config_file_depth(const char *filename, struct passwd *pw,
1820 1820
1821 if (fstat(fileno(f), &sb) == -1) 1821 if (fstat(fileno(f), &sb) == -1)
1822 fatal("fstat %s: %s", filename, strerror(errno)); 1822 fatal("fstat %s: %s", filename, strerror(errno));
1823 if (((sb.st_uid != 0 && sb.st_uid != getuid()) || 1823 if (!secure_permissions(&sb, getuid()))
1824 (sb.st_mode & 022) != 0))
1825 fatal("Bad owner or permissions on %s", filename); 1824 fatal("Bad owner or permissions on %s", filename);
1826 } 1825 }
1827 1826