- deraadt@cvs.openbsd.org 2001/02/21 09:12:56

     [sftp-server.c]
     careful with & and &&; markus ok

diff --git a/ChangeLog b/ChangeLog
index 0e919a00179441642e433a0df55334d8f546c8f7..5abe3a8a09b29b1a24184a9705e6d4e870de6b57 100644 (file)
--- 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.

diff --git a/sftp-server.c b/sftp-server.c
index e959a5515f34c58550ea26883914ed4e00b9c368..c8daeea1e700587933b55817333b7134735ab30a 100644 (file)
--- 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;