From 64e8d44fbd556c7a78bba1d8ff3bee5b07b2440d Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 1 Mar 2005 21:16:47 +1100 Subject: - djm@cvs.openbsd.org 2005/02/20 22:59:06 [sftp.c] turn on ssh batch mode when in sftp batch mode, patch from jdmossh AT nand.net; ok markus@ --- ChangeLog | 7 ++++++- sftp.c | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 06b5d755b..67c993667 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,11 @@ - djm@cvs.openbsd.org 2005/02/18 03:05:53 [canohost.c] better error messages for getnameinfo failures; ok dtucker@ + - djm@cvs.openbsd.org 2005/02/20 22:59:06 + [sftp.c] + turn on ssh batch mode when in sftp batch mode, patch from + jdmossh AT nand.net; + ok markus@ 20050226 - (dtucker) [openbsd-compat/bsd-openpty.c openbsd-compat/inet_ntop.c] @@ -2182,4 +2187,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3668 2005/03/01 10:16:18 djm Exp $ +$Id: ChangeLog,v 1.3669 2005/03/01 10:16:47 djm Exp $ diff --git a/sftp.c b/sftp.c index 31c634994..f8553ed82 100644 --- a/sftp.c +++ b/sftp.c @@ -16,7 +16,7 @@ #include "includes.h" -RCSID("$OpenBSD: sftp.c,v 1.61 2005/01/24 10:22:06 dtucker Exp $"); +RCSID("$OpenBSD: sftp.c,v 1.62 2005/02/20 22:59:06 djm Exp $"); #ifdef USE_LIBEDIT #include @@ -1479,6 +1479,7 @@ main(int argc, char **argv) fatal("%s (%s).", strerror(errno), optarg); showprogress = 0; batchmode = 1; + addargs(&args, "-obatchmode yes"); break; case 'P': sftp_direct = optarg; -- cgit v1.2.3