From 36592518dd0bd975de1534b0cdaee55597dcb3c8 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Mon, 5 Mar 2001 05:02:08 +0000 Subject: - deraadt@cvs.openbsd.org 2001/02/21 09:12:56 [sftp-server.c] careful with & and &&; markus ok --- ChangeLog | 5 ++++- sftp-server.c | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index dba7423d6..150be56d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,9 @@ - deraadt@cvs.openbsd.org 2001/02/21 09:05:54 [authfile.c] improve fd handling + - deraadt@cvs.openbsd.org 2001/02/21 09:12:56 + [sftp-server.c] + careful with & and &&; markus ok 20010304 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. @@ -4202,4 +4205,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.854 2001/03/05 04:59:27 mouring Exp $ +$Id: ChangeLog,v 1.855 2001/03/05 05:02:08 mouring Exp $ diff --git a/sftp-server.c b/sftp-server.c index e959a5515..c8daeea1e 100644 --- a/sftp-server.c +++ b/sftp-server.c @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "includes.h" -RCSID("$OpenBSD: sftp-server.c,v 1.19 2001/02/07 18:01:18 itojun Exp $"); +RCSID("$OpenBSD: sftp-server.c,v 1.20 2001/02/21 09:12:56 deraadt Exp $"); #include "buffer.h" #include "bufaux.h" @@ -93,8 +93,8 @@ int flags_from_portable(int pflags) { int flags = 0; - if (pflags & SSH2_FXF_READ && - pflags & SSH2_FXF_WRITE) { + if ((pflags & SSH2_FXF_READ) && + (pflags & SSH2_FXF_WRITE)) { flags = O_RDWR; } else if (pflags & SSH2_FXF_READ) { flags = O_RDONLY; -- cgit v1.2.3