diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | sftp.c | 3 |
2 files changed, 8 insertions, 2 deletions
@@ -6,6 +6,11 @@ | |||
6 | - djm@cvs.openbsd.org 2005/02/18 03:05:53 | 6 | - djm@cvs.openbsd.org 2005/02/18 03:05:53 |
7 | [canohost.c] | 7 | [canohost.c] |
8 | better error messages for getnameinfo failures; ok dtucker@ | 8 | better error messages for getnameinfo failures; ok dtucker@ |
9 | - djm@cvs.openbsd.org 2005/02/20 22:59:06 | ||
10 | [sftp.c] | ||
11 | turn on ssh batch mode when in sftp batch mode, patch from | ||
12 | jdmossh AT nand.net; | ||
13 | ok markus@ | ||
9 | 14 | ||
10 | 20050226 | 15 | 20050226 |
11 | - (dtucker) [openbsd-compat/bsd-openpty.c openbsd-compat/inet_ntop.c] | 16 | - (dtucker) [openbsd-compat/bsd-openpty.c openbsd-compat/inet_ntop.c] |
@@ -2182,4 +2187,4 @@ | |||
2182 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2187 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2183 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2188 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2184 | 2189 | ||
2185 | $Id: ChangeLog,v 1.3668 2005/03/01 10:16:18 djm Exp $ | 2190 | $Id: ChangeLog,v 1.3669 2005/03/01 10:16:47 djm Exp $ |
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | #include "includes.h" | 17 | #include "includes.h" |
18 | 18 | ||
19 | RCSID("$OpenBSD: sftp.c,v 1.61 2005/01/24 10:22:06 dtucker Exp $"); | 19 | RCSID("$OpenBSD: sftp.c,v 1.62 2005/02/20 22:59:06 djm Exp $"); |
20 | 20 | ||
21 | #ifdef USE_LIBEDIT | 21 | #ifdef USE_LIBEDIT |
22 | #include <histedit.h> | 22 | #include <histedit.h> |
@@ -1479,6 +1479,7 @@ main(int argc, char **argv) | |||
1479 | fatal("%s (%s).", strerror(errno), optarg); | 1479 | fatal("%s (%s).", strerror(errno), optarg); |
1480 | showprogress = 0; | 1480 | showprogress = 0; |
1481 | batchmode = 1; | 1481 | batchmode = 1; |
1482 | addargs(&args, "-obatchmode yes"); | ||
1482 | break; | 1483 | break; |
1483 | case 'P': | 1484 | case 'P': |
1484 | sftp_direct = optarg; | 1485 | sftp_direct = optarg; |