diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sftp-server.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -80,6 +80,9 @@ | |||
80 | - djm@cvs.openbsd.org 2006/07/10 11:24:54 | 80 | - djm@cvs.openbsd.org 2006/07/10 11:24:54 |
81 | [sftp-server.c] | 81 | [sftp-server.c] |
82 | remove optind - it isn't used here | 82 | remove optind - it isn't used here |
83 | - djm@cvs.openbsd.org 2006/07/10 11:25:53 | ||
84 | [sftp-server.c] | ||
85 | don't log variables that aren't yet set | ||
83 | 86 | ||
84 | 20060706 | 87 | 20060706 |
85 | - (dtucker) [configure.ac] Try AIX blibpath test in different order when | 88 | - (dtucker) [configure.ac] Try AIX blibpath test in different order when |
@@ -4813,4 +4816,4 @@ | |||
4813 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4816 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4814 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4817 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4815 | 4818 | ||
4816 | $Id: ChangeLog,v 1.4379 2006/07/10 11:31:00 djm Exp $ | 4819 | $Id: ChangeLog,v 1.4380 2006/07/10 11:31:27 djm Exp $ |
diff --git a/sftp-server.c b/sftp-server.c index 31be27b4f..e7193859e 100644 --- a/sftp-server.c +++ b/sftp-server.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp-server.c,v 1.60 2006/07/10 11:24:54 djm Exp $ */ | 1 | /* $OpenBSD: sftp-server.c,v 1.61 2006/07/10 11:25:53 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -480,9 +480,9 @@ process_open(void) | |||
480 | int handle, fd, flags, mode, status = SSH2_FX_FAILURE; | 480 | int handle, fd, flags, mode, status = SSH2_FX_FAILURE; |
481 | 481 | ||
482 | id = get_int(); | 482 | id = get_int(); |
483 | debug3("request %u: open flags %d", id, pflags); | ||
484 | name = get_string(NULL); | 483 | name = get_string(NULL); |
485 | pflags = get_int(); /* portable flags */ | 484 | pflags = get_int(); /* portable flags */ |
485 | debug3("request %u: open flags %d", id, pflags); | ||
486 | a = get_attrib(); | 486 | a = get_attrib(); |
487 | flags = flags_from_portable(pflags); | 487 | flags = flags_from_portable(pflags); |
488 | mode = (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) ? a->perm : 0666; | 488 | mode = (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) ? a->perm : 0666; |