summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sftp.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6cfa9b84f..e3894ffc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
7 - deraadt@cvs.openbsd.org 2006/03/27 13:03:54 7 - deraadt@cvs.openbsd.org 2006/03/27 13:03:54
8 [dh.c] 8 [dh.c]
9 use strtonum() instead of atoi(), limit dhg size to 64k; ok djm 9 use strtonum() instead of atoi(), limit dhg size to 64k; ok djm
10 - djm@cvs.openbsd.org 2006/03/27 23:15:46
11 [sftp.c]
12 always use a format string for addargs; spotted by mouring@
10 13
1120060326 1420060326
12 - OpenBSD CVS Sync 15 - OpenBSD CVS Sync
@@ -4456,4 +4459,4 @@
4456 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4459 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4457 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4460 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4458 4461
4459$Id: ChangeLog,v 1.4289 2006/03/31 12:09:41 djm Exp $ 4462$Id: ChangeLog,v 1.4290 2006/03/31 12:10:31 djm Exp $
diff --git a/sftp.c b/sftp.c
index f5212ed4f..31b71db2b 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp.c,v 1.79 2006/03/25 13:17:02 djm Exp $ */ 1/* $OpenBSD: sftp.c,v 1.80 2006/03/27 23:15:46 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -1468,7 +1468,7 @@ main(int argc, char **argv)
1468 __progname = ssh_get_progname(argv[0]); 1468 __progname = ssh_get_progname(argv[0]);
1469 memset(&args, '\0', sizeof(args)); 1469 memset(&args, '\0', sizeof(args));
1470 args.list = NULL; 1470 args.list = NULL;
1471 addargs(&args, ssh_program); 1471 addargs(&args, "%s", ssh_program);
1472 addargs(&args, "-oForwardX11 no"); 1472 addargs(&args, "-oForwardX11 no");
1473 addargs(&args, "-oForwardAgent no"); 1473 addargs(&args, "-oForwardAgent no");
1474 addargs(&args, "-oPermitLocalCommand no"); 1474 addargs(&args, "-oPermitLocalCommand no");