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>2017-10-04 13:54:48 +0100
commitb1033fed87fd9fa24dccab45f00cadcbc7144c47 (patch)
tree3f6838395acfa6e09710644c99bf003e2b8dcc23 /readconf.c
parent215bd91f12b0ddb9754483ee6e3c3b4751256dca (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 45caa0951..be3d58737 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1766,8 +1766,7 @@ read_config_file_depth(const char *filename, struct passwd *pw,
1766 1766
1767 if (fstat(fileno(f), &sb) == -1) 1767 if (fstat(fileno(f), &sb) == -1)
1768 fatal("fstat %s: %s", filename, strerror(errno)); 1768 fatal("fstat %s: %s", filename, strerror(errno));
1769 if (((sb.st_uid != 0 && sb.st_uid != getuid()) || 1769 if (!secure_permissions(&sb, getuid()))
1770 (sb.st_mode & 022) != 0))
1771 fatal("Bad owner or permissions on %s", filename); 1770 fatal("Bad owner or permissions on %s", filename);
1772 } 1771 }
1773 1772