diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-03-05 05:02:08 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-03-05 05:02:08 +0000 |
commit | 36592518dd0bd975de1534b0cdaee55597dcb3c8 (patch) | |
tree | 841bdb20bd0f95f128d7941ea9f6ebf8c95cedb2 | |
parent | b257cca7693dcb220e06dcab5c0f3fb458fb59d5 (diff) |
- deraadt@cvs.openbsd.org 2001/02/21 09:12:56
[sftp-server.c]
careful with & and &&; markus ok
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sftp-server.c | 6 |
2 files changed, 7 insertions, 4 deletions
@@ -10,6 +10,9 @@ | |||
10 | - deraadt@cvs.openbsd.org 2001/02/21 09:05:54 | 10 | - deraadt@cvs.openbsd.org 2001/02/21 09:05:54 |
11 | [authfile.c] | 11 | [authfile.c] |
12 | improve fd handling | 12 | improve fd handling |
13 | - deraadt@cvs.openbsd.org 2001/02/21 09:12:56 | ||
14 | [sftp-server.c] | ||
15 | careful with & and &&; markus ok | ||
13 | 16 | ||
14 | 20010304 | 17 | 20010304 |
15 | - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. | 18 | - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. |
@@ -4202,4 +4205,4 @@ | |||
4202 | - Wrote replacements for strlcpy and mkdtemp | 4205 | - Wrote replacements for strlcpy and mkdtemp |
4203 | - Released 1.0pre1 | 4206 | - Released 1.0pre1 |
4204 | 4207 | ||
4205 | $Id: ChangeLog,v 1.854 2001/03/05 04:59:27 mouring Exp $ | 4208 | $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 @@ | |||
22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
23 | */ | 23 | */ |
24 | #include "includes.h" | 24 | #include "includes.h" |
25 | RCSID("$OpenBSD: sftp-server.c,v 1.19 2001/02/07 18:01:18 itojun Exp $"); | 25 | RCSID("$OpenBSD: sftp-server.c,v 1.20 2001/02/21 09:12:56 deraadt Exp $"); |
26 | 26 | ||
27 | #include "buffer.h" | 27 | #include "buffer.h" |
28 | #include "bufaux.h" | 28 | #include "bufaux.h" |
@@ -93,8 +93,8 @@ int | |||
93 | flags_from_portable(int pflags) | 93 | flags_from_portable(int pflags) |
94 | { | 94 | { |
95 | int flags = 0; | 95 | int flags = 0; |
96 | if (pflags & SSH2_FXF_READ && | 96 | if ((pflags & SSH2_FXF_READ) && |
97 | pflags & SSH2_FXF_WRITE) { | 97 | (pflags & SSH2_FXF_WRITE)) { |
98 | flags = O_RDWR; | 98 | flags = O_RDWR; |
99 | } else if (pflags & SSH2_FXF_READ) { | 99 | } else if (pflags & SSH2_FXF_READ) { |
100 | flags = O_RDONLY; | 100 | flags = O_RDONLY; |