RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

[sftp-server.c]
     careful with & and &&; markus ok
This commit is contained in:
Ben Lindstrom 2001-03-05 05:02:08 +00:00
parent b257cca769
commit 36592518dd
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -10,6 +10,9 @@
- deraadt@cvs.openbsd.org 2001/02/21 09:05:54 - deraadt@cvs.openbsd.org 2001/02/21 09:05:54
[authfile.c] [authfile.c]
improve fd handling improve fd handling
- deraadt@cvs.openbsd.org 2001/02/21 09:12:56
[sftp-server.c]
careful with & and &&; markus ok
20010304 20010304
- (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@ -4202,4 +4205,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - 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 $

6
sftp-server.c
View File

@ -22,7 +22,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "includes.h" #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 "buffer.h"
#include "bufaux.h" #include "bufaux.h"
@ -93,8 +93,8 @@ int
flags_from_portable(int pflags) flags_from_portable(int pflags)
{ {
int flags = 0; int flags = 0;
if (pflags & SSH2_FXF_READ && if ((pflags & SSH2_FXF_READ) &&
pflags & SSH2_FXF_WRITE) { (pflags & SSH2_FXF_WRITE)) {
flags = O_RDWR; flags = O_RDWR;
} else if (pflags & SSH2_FXF_READ) { } else if (pflags & SSH2_FXF_READ) {
flags = O_RDONLY; flags = O_RDONLY;