summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--sftp.c6
2 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 124924b71..cdcd1aced 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
120090205 120090214
2 - (djm) OpenBSD CVS Sync
3 - dtucker@cvs.openbsd.org 2009/02/02 11:15:14
4 [sftp.c]
5 Initialize a few variables to prevent spurious "may be used
6 uninitialized" warnings from newer gcc's. ok djm@
7
820090212
2 - (djm) [sshpty.c] bz#1419: OSX uses cloning ptys that automagically 9 - (djm) [sshpty.c] bz#1419: OSX uses cloning ptys that automagically
3 set ownership and modes, so avoid explicitly setting them 10 set ownership and modes, so avoid explicitly setting them
4 - (djm) [configure.ac loginrec.c] bz#1421: fix lastlog support for OSX. 11 - (djm) [configure.ac loginrec.c] bz#1421: fix lastlog support for OSX.
@@ -5123,5 +5130,5 @@
5123 OpenServer 6 and add osr5bigcrypt support so when someone migrates 5130 OpenServer 6 and add osr5bigcrypt support so when someone migrates
5124 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 5131 passwords between UnixWare and OpenServer they will still work. OK dtucker@
5125 5132
5126$Id: ChangeLog,v 1.5185 2009/02/12 02:12:21 djm Exp $ 5133$Id: ChangeLog,v 1.5186 2009/02/14 05:26:19 djm Exp $
5127 5134
diff --git a/sftp.c b/sftp.c
index 01077a7a7..66bd111b1 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp.c,v 1.106 2008/12/09 15:35:00 sobrado Exp $ */ 1/* $OpenBSD: sftp.c,v 1.107 2009/02/02 11:15:14 dtucker Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -1235,8 +1235,8 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd,
1235 int err_abort) 1235 int err_abort)
1236{ 1236{
1237 char *path1, *path2, *tmp; 1237 char *path1, *path2, *tmp;
1238 int pflag, lflag, iflag, hflag, cmdnum, i; 1238 int pflag = 0, lflag = 0, iflag = 0, hflag = 0, cmdnum, i;
1239 unsigned long n_arg; 1239 unsigned long n_arg = 0;
1240 Attrib a, *aa; 1240 Attrib a, *aa;
1241 char path_buf[MAXPATHLEN]; 1241 char path_buf[MAXPATHLEN];
1242 int err = 0; 1242 int err = 0;