summaryrefslogtreecommitdiff
path: root/scp.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-04-16 11:18:38 +1000
committerDamien Miller <djm@mindrot.org>2000-04-16 11:18:38 +1000
commit4af51306d9a51459a5bef922df1037f876ae51fe (patch)
tree09ecfc215fce82345a3259f8a0f384b9a67906f0 /scp.c
parent5d1705ecf9bd3216dc99a84242bcdf2e7297d307 (diff)
- OpenBSD CVS updates.
[ssh.1 ssh.c] - ssh -2 [auth.c channels.c clientloop.c packet.c packet.h serverloop.c] [session.c sshconnect.c] - check payload for (illegal) extra data [ALL] - whitespace cleanup
Diffstat (limited to 'scp.c')
-rw-r--r--scp.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/scp.c b/scp.c
index 9f1015249..2bd3ed2bd 100644
--- a/scp.c
+++ b/scp.c
@@ -1,13 +1,13 @@
1/* 1/*
2 * 2 *
3 * scp - secure remote copy. This is basically patched BSD rcp which uses ssh 3 * scp - secure remote copy. This is basically patched BSD rcp which uses ssh
4 * to do the data transfer (instead of using rcmd). 4 * to do the data transfer (instead of using rcmd).
5 * 5 *
6 * NOTE: This version should NOT be suid root. (This uses ssh to do the transfer 6 * NOTE: This version should NOT be suid root. (This uses ssh to do the transfer
7 * and ssh has the necessary privileges.) 7 * and ssh has the necessary privileges.)
8 * 8 *
9 * 1995 Timo Rinne <tri@iki.fi>, Tatu Ylonen <ylo@cs.hut.fi> 9 * 1995 Timo Rinne <tri@iki.fi>, Tatu Ylonen <ylo@cs.hut.fi>
10 * 10 *
11*/ 11*/
12 12
13/* 13/*
@@ -45,7 +45,7 @@
45 */ 45 */
46 46
47#include "includes.h" 47#include "includes.h"
48RCSID("$Id: scp.c,v 1.18 2000/03/17 12:40:16 damien Exp $"); 48RCSID("$Id: scp.c,v 1.19 2000/04/16 01:18:45 damien Exp $");
49 49
50#include "ssh.h" 50#include "ssh.h"
51#include "xmalloc.h" 51#include "xmalloc.h"
@@ -109,7 +109,7 @@ char *port = NULL;
109 * assigns the input and output file descriptors on success. 109 * assigns the input and output file descriptors on success.
110 */ 110 */
111 111
112int 112int
113do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout) 113do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout)
114{ 114{
115 int pin[2], pout[2], reserved[2]; 115 int pin[2], pout[2], reserved[2];
@@ -194,7 +194,7 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout)
194 return 0; 194 return 0;
195} 195}
196 196
197void 197void
198fatal(const char *fmt,...) 198fatal(const char *fmt,...)
199{ 199{
200 va_list ap; 200 va_list ap;
@@ -257,10 +257,10 @@ main(argc, argv)
257 switch (ch) { 257 switch (ch) {
258 /* User-visible flags. */ 258 /* User-visible flags. */
259 case '4': 259 case '4':
260 IPv4 = 1; 260 IPv4 = 1;
261 break; 261 break;
262 case '6': 262 case '6':
263 IPv6 = 1; 263 IPv6 = 1;
264 break; 264 break;
265 case 'p': 265 case 'p':
266 pflag = 1; 266 pflag = 1;
@@ -1008,7 +1008,7 @@ run_err(const char *fmt,...)
1008 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 1008 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
1009 * SUCH DAMAGE. 1009 * SUCH DAMAGE.
1010 * 1010 *
1011 * $Id: scp.c,v 1.18 2000/03/17 12:40:16 damien Exp $ 1011 * $Id: scp.c,v 1.19 2000/04/16 01:18:45 damien Exp $
1012 */ 1012 */
1013 1013
1014char * 1014char *