diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2018-05-06 12:24:45 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2018-05-06 12:24:45 +0000 |
| commit | 20adc8f2a99cd37b64a80ef63dfc5ba6627d4dfb (patch) | |
| tree | ad57ce9ac9538c780c802adbdfc4c581f9100310 /sftp-server.c | |
| parent | 343d57711556d429eda777ab259ff924acbd6b34 (diff) | |
| download | src-20adc8f2a99cd37b64a80ef63dfc5ba6627d4dfb.tar.gz src-20adc8f2a99cd37b64a80ef63dfc5ba6627d4dfb.zip | |
Vendor import of OpenSSH 7.6p1.vendor/openssh/7.6p1
Notes
Notes:
svn path=/vendor-crypto/openssh/dist/; revision=333296
svn path=/vendor-crypto/openssh/7.6p1/; revision=333297; tag=vendor/openssh/7.6p1
Diffstat (limited to 'sftp-server.c')
| -rw-r--r-- | sftp-server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sftp-server.c b/sftp-server.c index 3619cdfc0ffe..df0fb50680fe 100644 --- a/sftp-server.c +++ b/sftp-server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-server.c,v 1.110 2016/09/12 01:22:38 deraadt Exp $ */ +/* $OpenBSD: sftp-server.c,v 1.111 2017/04/04 00:24:56 djm Exp $ */ /* * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. * @@ -691,8 +691,8 @@ process_open(u_int32_t id) logit("open \"%s\" flags %s mode 0%o", name, string_from_portable(pflags), mode); if (readonly && - ((flags & O_ACCMODE) == O_WRONLY || - (flags & O_ACCMODE) == O_RDWR)) { + ((flags & O_ACCMODE) != O_RDONLY || + (flags & (O_CREAT|O_TRUNC)) != 0)) { verbose("Refusing open request in read-only mode"); status = SSH2_FX_PERMISSION_DENIED; } else { |