summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sftp-client.c4
-rw-r--r--sftp.c4
3 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index ae236a9f7..3fb1d4664 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
12 - dtucker@cvs.openbsd.org 2004/06/01 14:20:45 12 - dtucker@cvs.openbsd.org 2004/06/01 14:20:45
13 [auth2-chall.c] 13 [auth2-chall.c]
14 Remove redundant #include; ok markus@ 14 Remove redundant #include; ok markus@
15 - pedro@cvs.openbsd.org 2004/06/03 12:22:20
16 [sftp-client.c sftp.c]
17 initialize pointers, ok markus@
15 18
1620040603 1920040603
17 - (dtucker) [auth-pam.c] Don't use pam_* namespace for sshd's PAM functions. 20 - (dtucker) [auth-pam.c] Don't use pam_* namespace for sshd's PAM functions.
@@ -1196,4 +1199,4 @@
1196 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1199 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1197 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1200 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1198 1201
1199$Id: ChangeLog,v 1.3378 2004/06/15 00:28:24 djm Exp $ 1202$Id: ChangeLog,v 1.3379 2004/06/15 00:28:56 djm Exp $
diff --git a/sftp-client.c b/sftp-client.c
index 6dcd5de74..88276cd4a 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -20,7 +20,7 @@
20/* XXX: copy between two remote sites */ 20/* XXX: copy between two remote sites */
21 21
22#include "includes.h" 22#include "includes.h"
23RCSID("$OpenBSD: sftp-client.c,v 1.49 2004/05/19 12:17:33 djm Exp $"); 23RCSID("$OpenBSD: sftp-client.c,v 1.50 2004/06/03 12:22:20 pedro Exp $");
24 24
25#include "openbsd-compat/sys-queue.h" 25#include "openbsd-compat/sys-queue.h"
26 26
@@ -992,7 +992,7 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path,
992 TAILQ_ENTRY(outstanding_ack) tq; 992 TAILQ_ENTRY(outstanding_ack) tq;
993 }; 993 };
994 TAILQ_HEAD(ackhead, outstanding_ack) acks; 994 TAILQ_HEAD(ackhead, outstanding_ack) acks;
995 struct outstanding_ack *ack; 995 struct outstanding_ack *ack = NULL;
996 996
997 TAILQ_INIT(&acks); 997 TAILQ_INIT(&acks);
998 998
diff --git a/sftp.c b/sftp.c
index eef9f1185..dca5505d0 100644
--- a/sftp.c
+++ b/sftp.c
@@ -16,7 +16,7 @@
16 16
17#include "includes.h" 17#include "includes.h"
18 18
19RCSID("$OpenBSD: sftp.c,v 1.47 2004/05/26 08:59:57 djm Exp $"); 19RCSID("$OpenBSD: sftp.c,v 1.48 2004/06/03 12:22:20 pedro Exp $");
20 20
21#include "buffer.h" 21#include "buffer.h"
22#include "xmalloc.h" 22#include "xmalloc.h"
@@ -1310,7 +1310,7 @@ int
1310main(int argc, char **argv) 1310main(int argc, char **argv)
1311{ 1311{
1312 int in, out, ch, err; 1312 int in, out, ch, err;
1313 char *host, *userhost, *cp, *file2; 1313 char *host, *userhost, *cp, *file2 = NULL;
1314 int debug_level = 0, sshver = 2; 1314 int debug_level = 0, sshver = 2;
1315 char *file1 = NULL, *sftp_server = NULL; 1315 char *file1 = NULL, *sftp_server = NULL;
1316 char *ssh_program = _PATH_SSH_PROGRAM, *sftp_direct = NULL; 1316 char *ssh_program = _PATH_SSH_PROGRAM, *sftp_direct = NULL;