summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-07-10 21:31:27 +1000
committerDamien Miller <djm@mindrot.org>2006-07-10 21:31:27 +1000
commit6444fe996b2789327e28057e69bd3ece371f784d (patch)
treec0cf1529762fae090f51fea2b27f7e56c5041a78
parentc718c743c1b64ba20b009f2dfe6cad465a7a4a78 (diff)
- djm@cvs.openbsd.org 2006/07/10 11:25:53
[sftp-server.c] don't log variables that aren't yet set
-rw-r--r--ChangeLog5
-rw-r--r--sftp-server.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 74f07f35..9646e8c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -80,6 +80,9 @@
- djm@cvs.openbsd.org 2006/07/10 11:24:54
[sftp-server.c]
remove optind - it isn't used here
+ - djm@cvs.openbsd.org 2006/07/10 11:25:53
+ [sftp-server.c]
+ don't log variables that aren't yet set
20060706
- (dtucker) [configure.ac] Try AIX blibpath test in different order when
@@ -4813,4 +4816,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4379 2006/07/10 11:31:00 djm Exp $
+$Id: ChangeLog,v 1.4380 2006/07/10 11:31:27 djm Exp $
diff --git a/sftp-server.c b/sftp-server.c
index 31be27b4..e7193859 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.60 2006/07/10 11:24:54 djm Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.61 2006/07/10 11:25:53 djm Exp $ */
/*
* Copyright (c) 2000-2004 Markus Friedl. All rights reserved.
*
@@ -480,9 +480,9 @@ process_open(void)
int handle, fd, flags, mode, status = SSH2_FX_FAILURE;
id = get_int();
- debug3("request %u: open flags %d", id, pflags);
name = get_string(NULL);
pflags = get_int(); /* portable flags */
+ debug3("request %u: open flags %d", id, pflags);
a = get_attrib();
flags = flags_from_portable(pflags);
mode = (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) ? a->perm : 0666;