diff options
| author | des <des@FreeBSD.org> | 2005-06-05 15:41:57 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2005-06-05 15:41:57 +0000 |
| commit | c4dfc1ed3bdacd05d73791b2c8f8b580511a939f (patch) | |
| tree | 08ccf47ce923e292d8f5057f36d34f042b7a5e6d /crypto/openssh/sftp-client.c | |
| parent | 11a09ab416e21c995885dc0e5847151627094217 (diff) | |
| download | FreeBSD-src-c4dfc1ed3bdacd05d73791b2c8f8b580511a939f.zip FreeBSD-src-c4dfc1ed3bdacd05d73791b2c8f8b580511a939f.tar.gz | |
Vendor import of OpenSSH 4.1p1.
Diffstat (limited to 'crypto/openssh/sftp-client.c')
| -rw-r--r-- | crypto/openssh/sftp-client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssh/sftp-client.c b/crypto/openssh/sftp-client.c index d894a11..92df427 100644 --- a/crypto/openssh/sftp-client.c +++ b/crypto/openssh/sftp-client.c @@ -20,7 +20,7 @@ /* XXX: copy between two remote sites */ #include "includes.h" -RCSID("$OpenBSD: sftp-client.c,v 1.52 2004/11/25 22:22:14 markus Exp $"); +RCSID("$OpenBSD: sftp-client.c,v 1.53 2005/03/10 22:01:05 deraadt Exp $"); #include "openbsd-compat/sys-queue.h" @@ -856,7 +856,7 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path, debug3("Received reply T:%u I:%u R:%d", type, id, max_req); /* Find the request in our queue */ - for(req = TAILQ_FIRST(&requests); + for (req = TAILQ_FIRST(&requests); req != NULL && req->id != id; req = TAILQ_NEXT(req, tq)) ; @@ -1109,7 +1109,7 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path, debug3("SSH2_FXP_STATUS %d", status); /* Find the request in our queue */ - for(ack = TAILQ_FIRST(&acks); + for (ack = TAILQ_FIRST(&acks); ack != NULL && ack->id != r_id; ack = TAILQ_NEXT(ack, tq)) ; |
