summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--sftp.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e8237d69b..684609459 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,10 @@
27 - djm@cvs.openbsd.org 2010/05/01 02:50:50 27 - djm@cvs.openbsd.org 2010/05/01 02:50:50
28 [PROTOCOL.certkeys] 28 [PROTOCOL.certkeys]
29 typo; jmeltzer@ 29 typo; jmeltzer@
30 - dtucker@cvs.openbsd.org 2010/05/05 04:22:09
31 [sftp.c]
32 restore mput and mget which got lost in the tab-completion changes.
33 found by Kenneth Whitaker, ok djm@
30 34
3120100423 3520100423
32 - (dtucker) [configure.ac] Bug #1756: Check for the existence of a lib64 dir 36 - (dtucker) [configure.ac] Bug #1756: Check for the existence of a lib64 dir
diff --git a/sftp.c b/sftp.c
index d65d4ec62..5366c075f 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp.c,v 1.123 2010/01/27 19:21:39 djm Exp $ */ 1/* $OpenBSD: sftp.c,v 1.124 2010/05/05 04:22:09 dtucker 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 *
@@ -181,6 +181,8 @@ static const struct CMD cmds[] = {
181 { "ls", I_LS, REMOTE }, 181 { "ls", I_LS, REMOTE },
182 { "lumask", I_LUMASK, NOARGS }, 182 { "lumask", I_LUMASK, NOARGS },
183 { "mkdir", I_MKDIR, REMOTE }, 183 { "mkdir", I_MKDIR, REMOTE },
184 { "mget", I_GET, REMOTE },
185 { "mput", I_PUT, LOCAL },
184 { "progress", I_PROGRESS, NOARGS }, 186 { "progress", I_PROGRESS, NOARGS },
185 { "put", I_PUT, LOCAL }, 187 { "put", I_PUT, LOCAL },
186 { "pwd", I_PWD, REMOTE }, 188 { "pwd", I_PWD, REMOTE },