summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--sftp-int.c4
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 36d5d2ca0..63979507f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120030116
2 - (djm) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2003/01/16 03:41:55
4 [sftp-int.c]
5 explicitly use first glob result
6
120030114 720030114
2 - (djm) OpenBSD CVS Sync 8 - (djm) OpenBSD CVS Sync
3 - fgsch@cvs.openbsd.org 2003/01/10 23:23:24 9 - fgsch@cvs.openbsd.org 2003/01/10 23:23:24
@@ -1021,4 +1027,4 @@
1021 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1027 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1022 ok provos@ 1028 ok provos@
1023 1029
1024$Id: ChangeLog,v 1.2572 2003/01/14 11:24:47 djm Exp $ 1030$Id: ChangeLog,v 1.2573 2003/01/16 04:39:13 djm Exp $
diff --git a/sftp-int.c b/sftp-int.c
index 42040f5bd..013ea84e0 100644
--- a/sftp-int.c
+++ b/sftp-int.c
@@ -25,7 +25,7 @@
25/* XXX: recursive operations */ 25/* XXX: recursive operations */
26 26
27#include "includes.h" 27#include "includes.h"
28RCSID("$OpenBSD: sftp-int.c,v 1.55 2003/01/14 10:58:00 djm Exp $"); 28RCSID("$OpenBSD: sftp-int.c,v 1.56 2003/01/16 03:41:55 djm Exp $");
29 29
30#include "buffer.h" 30#include "buffer.h"
31#include "xmalloc.h" 31#include "xmalloc.h"
@@ -505,7 +505,7 @@ process_put(struct sftp_conn *conn, char *src, char *dst, char *pwd, int pflag)
505 505
506 /* Only one match, dst may be file, directory or unspecified */ 506 /* Only one match, dst may be file, directory or unspecified */
507 if (g.gl_pathv[0] && g.gl_matchc == 1) { 507 if (g.gl_pathv[0] && g.gl_matchc == 1) {
508 if (!is_reg(g.gl_pathv[i])) { 508 if (!is_reg(g.gl_pathv[0])) {
509 error("Can't upload %s: not a regular file", 509 error("Can't upload %s: not a regular file",
510 g.gl_pathv[0]); 510 g.gl_pathv[0]);
511 err = 1; 511 err = 1;