summaryrefslogtreecommitdiff
path: root/misc.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2013-05-07 11:47:26 +0100
committerColin Watson <cjwatson@debian.org>2013-05-07 11:47:26 +0100
commit2ea3f720daeb1ca9f765365fce3a9546961fe624 (patch)
treec4fb7d1f51fa51e7677232de806aae150e29e2ac /misc.c
parentf5efcd3450bbf8261915e0c4a6f851229dddaa79 (diff)
parentecebda56da46a03dafff923d91c382f31faa9eec (diff)
* New upstream release (http://www.openssh.com/txt/release-6.2).
- Add support for multiple required authentication in SSH protocol 2 via an AuthenticationMethods option (closes: #195716). - Fix Sophie Germain formula in moduli(5) (closes: #698612). - Update ssh-copy-id to Phil Hands' greatly revised version (closes: #99785, #322228, #620428; LP: #518883, #835901, #1074798).
Diffstat (limited to 'misc.c')
-rw-r--r--misc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/misc.c b/misc.c
index ddff00e52..3938d4053 100644
--- a/misc.c
+++ b/misc.c
@@ -645,7 +645,7 @@ read_keyfile_line(FILE *f, const char *filename, char *buf, size_t bufsz,
645int 645int
646secure_permissions(struct stat *st, uid_t uid) 646secure_permissions(struct stat *st, uid_t uid)
647{ 647{
648 if (st->st_uid != 0 && st->st_uid != uid) 648 if (!platform_sys_dir_uid(st->st_uid) && st->st_uid != uid)
649 return 0; 649 return 0;
650 if ((st->st_mode & 002) != 0) 650 if ((st->st_mode & 002) != 0)
651 return 0; 651 return 0;