diff options
author | Colin Watson <cjwatson@debian.org> | 2014-02-09 16:09:58 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2016-01-04 13:43:53 +0000 |
commit | 628e08e8a589dff2178a6725d32c5699f11b2405 (patch) | |
tree | f5671f678916fbcc6ef00b452cad1a80f7aeac43 /readconf.c | |
parent | 0488e67b6971cf1ee55a27b03d85864b744b69de (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: 2013-09-14
Patch-Name: user-group-modes.patch
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/readconf.c b/readconf.c index 46c343f30..c0ba5a72c 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -39,6 +39,8 @@ | |||
39 | #include <stdio.h> | 39 | #include <stdio.h> |
40 | #include <string.h> | 40 | #include <string.h> |
41 | #include <unistd.h> | 41 | #include <unistd.h> |
42 | #include <pwd.h> | ||
43 | #include <grp.h> | ||
42 | #ifdef HAVE_UTIL_H | 44 | #ifdef HAVE_UTIL_H |
43 | #include <util.h> | 45 | #include <util.h> |
44 | #endif | 46 | #endif |
@@ -1579,8 +1581,7 @@ read_config_file(const char *filename, struct passwd *pw, const char *host, | |||
1579 | 1581 | ||
1580 | if (fstat(fileno(f), &sb) == -1) | 1582 | if (fstat(fileno(f), &sb) == -1) |
1581 | fatal("fstat %s: %s", filename, strerror(errno)); | 1583 | fatal("fstat %s: %s", filename, strerror(errno)); |
1582 | if (((sb.st_uid != 0 && sb.st_uid != getuid()) || | 1584 | if (!secure_permissions(&sb, getuid())) |
1583 | (sb.st_mode & 022) != 0)) | ||
1584 | fatal("Bad owner or permissions on %s", filename); | 1585 | fatal("Bad owner or permissions on %s", filename); |
1585 | } | 1586 | } |
1586 | 1587 | ||