d27b947178
- reyk@cvs.openbsd.org 2005/12/06 22:38:28
...
[auth-options.c auth-options.h channels.c channels.h clientloop.c]
[misc.c misc.h readconf.c readconf.h scp.c servconf.c servconf.h]
[serverloop.c sftp.c ssh.1 ssh.c ssh_config ssh_config.5 sshconnect.c]
[sshconnect.h sshd.8 sshd_config sshd_config.5]
Add support for tun(4) forwarding over OpenSSH, based on an idea and
initial channel code bits by markus@. This is a simple and easy way to
use OpenSSH for ad hoc virtual private network connections, e.g.
administrative tunnels or secure wireless access. It's based on a new
ssh channel and works similar to the existing TCP forwarding support,
except that it depends on the tun(4) network interface on both ends of
the connection for layer 2 or layer 3 tunneling. This diff also adds
support for LocalCommand in the ssh(1) client.
ok djm@, markus@, jmc@ (manpages), tested and discussed with others
2005-12-13 19:29:02 +11:00
e0be30426a
- (dtucker) [progressmeter.c scp.c sftp-server.c] Use correct casts for
...
snprintf formats, fixes warnings on some 64 bit platforms. Patch from
shaw at vranix.com, ok djm@
2005-11-25 14:44:55 +11:00
33f86bc284
- deraadt@cvs.openbsd.org 2005/11/12 18:38:15
...
[scp.c]
avoid close(-1), as in rcp; ok cloder
2005-11-22 19:38:06 +11:00
ce321d8a30
- djm@cvs.openbsd.org 2005/09/13 23:40:07
...
[sshd.c ssh.c misc.h sftp.c ssh-keygen.c ssh-keysign.c sftp-server.c
scp.c misc.c ssh-keyscan.c ssh-add.c ssh-agent.c]
ensure that stdio fds are attached; ok deraadt@
2005-10-03 18:11:24 +10:00
4085853915
- dtucker@cvs.openbsd.org 2005/07/27 10:39:03
...
[scp.c hostfile.c sftp-client.c]
Silence bogus -Wuninitialized warnings; ok djm@
2005-08-02 17:07:07 +10:00
eccb9de72a
- djm@cvs.openbsd.org 2005/06/17 02:44:33
...
[auth-rsa.c auth.c auth1.c auth2-chall.c auth2-gss.c authfd.c authfile.c]
[bufaux.c canohost.c channels.c cipher.c clientloop.c dns.c gss-serv.c]
[kex.c kex.h key.c mac.c match.c misc.c packet.c packet.h scp.c]
[servconf.c session.c session.h sftp-client.c sftp-server.c sftp.c]
[ssh-keyscan.c ssh-rsa.c sshconnect.c sshconnect1.c sshconnect2.c sshd.c]
make this -Wsign-compare clean; ok avsm@ markus@
NB. auth1.c changes not committed yet (conflicts with uncommitted sync)
NB2. more work may be needed to make portable Wsign-compare clean
2005-06-17 12:59:34 +10:00
fc4f2dd347
- avsm@cvs.openbsd.org 2005/05/26 02:08:05
...
[scp.c]
If copying multiple files to a target file (which normally fails, as it
must be a target directory), kill the spawned ssh child before exiting.
This stops it trying to authenticate and spewing lots of output.
deraadt@ ok
2005-06-01 23:01:12 +10:00
b253cc4213
- avsm@cvs.openbsd.org 2005/05/24 17:32:44
...
[atomicio.c atomicio.h authfd.c monitor_wrap.c msg.c scp.c sftp-client.c]
[ssh-keyscan.c sshconnect.c]
Switch atomicio to use a simpler interface; it now returns a size_t
(containing number of bytes read/written), and indicates error by
returning 0. EOF is signalled by errno==EPIPE.
Typical use now becomes:
if (atomicio(read, ..., len) != len)
err(1,"read");
ok deraadt@, cloder@, djm@
2005-05-26 12:23:44 +10:00
4942de5719
- djm@cvs.openbsd.org 2005/04/02 12:41:16
...
[scp.c]
since ssh has xstrdup, use it instead of strdup+test. unbreaks -Werror
build
2005-04-03 10:16:39 +10:00
3dae15c611
- deraadt@cvs.openbsd.org 2005/03/31 18:39:21
...
[scp.c]
copy argv[] element instead of smashing the one that ps will see; ok otto
2005-04-03 10:16:11 +10:00
ba66df81a3
- dtucker@cvs.openbsd.org 2005/01/24 10:22:06
...
[scp.c sftp.c]
Have scp and sftp wait for the spawned ssh to exit before they exit
themselves. This prevents ssh from being unable to restore terminal
modes (not normally a problem on OpenBSD but common with -Portable
on POSIX platforms). From peak at argo.troja.mff.cuni.cz (bz#950);
ok djm@ markus@
2005-01-24 21:57:40 +11:00
f30e1acc62
- deraadt@cvs.openbsd.org 2004/09/15 18:46:04
...
[scp.c]
scratch that do { } while (0) wrapper in this case
2004-11-05 20:10:02 +11:00
fe6649da0c
- avsm@cvs.openbsd.org 2004/08/11 21:44:32
...
[authfd.c scp.c ssh-keyscan.c]
use atomicio instead of homegrown equivalents or read/write.
markus@ ok
2004-08-13 21:19:37 +10:00
ba6de952a0
- (dtucker) [logintest.c scp.c sftp-server.c sftp.c ssh-add.c ssh-agent.c
...
ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rand-helper.c ssh.c sshd.c
openbsd-compat/bsd-misc.c] Move "char *__progname" to bsd-misc.c. Reduces
diff vs OpenBSD; ok mouring@, tested by tim@ too.
2004-07-17 14:07:42 +10:00
e1f17055ed
- dtucker@cvs.openbsd.org 2004/07/08 12:47:21
...
[scp.c]
Prevent scp from skipping the file following a double-error.
bz #863 , ok markus@
2004-07-08 23:11:44 +10:00
3f9fdc7121
- avsm@cvs.openbsd.org 2004/06/21 17:36:31
...
[auth-rsa.c auth2-gss.c auth2-pubkey.c authfile.c canohost.c channels.c
cipher.c dns.c kex.c monitor.c monitor_fdpass.c monitor_wrap.c
monitor_wrap.h nchan.c packet.c progressmeter.c scp.c sftp-server.c sftp.c
ssh-gss.h ssh-keygen.c ssh.c sshconnect.c sshconnect1.c sshlogin.c
sshpty.c]
make ssh -Wshadow clean, no functional changes
markus@ ok
There are also some portable-specific -Wshadow warnings to be fixed in
monitor.c and montior_wrap.c.
2004-06-22 12:56:01 +10:00
bddc2b0179
- markus@cvs.openbsd.org 2004/04/01 12:19:57
...
[scp.c]
limit trust between local and remote rcp/scp process,
noticed by lcamtuf; ok deraadt@, djm@
2004-04-19 23:50:16 +10:00
a4b33dfb6d
- djm@cvs.openbsd.org 2003/11/23 23:18:45
...
[ssh-keygen.c]
consistency PATH_MAX -> MAXPATHLEN; ok markus@
(RCS ID sync only)
- djm@cvs.openbsd.org 2003/11/23 23:21:21
[scp.c]
from portable: rename clashing variable limit-> limit_rate; ok markus@
(RCS ID sync only)
2003-11-24 13:09:27 +11:00
4da295c051
- (djm) [scp.c] Rename limitbw -> limit_rate to match upstreamed patch
2003-11-22 14:39:04 +11:00
787b2ec18c
more whitespace (tabs this time)
2003-11-21 23:56:47 +11:00
a8e06cef35
- djm@cvs.openbsd.org 2003/11/21 11:57:03
...
[everything]
unexpand and delete whitespace at EOL; ok markus@
(done locally and RCS IDs synced)
2003-11-21 23:48:55 +11:00
c1f2792bd0
- dtucker@cvs.openbsd.org 2003/11/12 10:12:15
...
[scp.c]
When called with -q, pass -q to ssh; suppresses SSH2 banner. ok markus@
2003-11-17 21:19:05 +11:00
1f20394e92
- jmc@cvs.openbsd.org 2003/10/08 08:27:36
...
[scp.1 scp.c sftp-server.8 sftp.1 sftp.c ssh.1 sshd.8]
scp and sftp: add options list and sort options. options list requested
by deraadt@
sshd: use same format as ssh
ssh: remove wrong option from list
sftp-server: Subsystem is documented in ssh_config(5), not sshd(8)
ok deraadt@ markus@
2003-10-15 15:50:42 +10:00
8654d16f0f
- markus@cvs.openbsd.org 2003/09/19 17:40:20
...
[scp.c]
error handling for remote-remote copy; #638 ; report Harald Koenig;
ok millert, fgs, henning, deraadt
2003-09-22 21:14:55 +10:00
59d3d5b8b4
- (djm) s/get_progname/ssh_get_progname/g to avoid conflict with Heimdal
...
-lbroken; ok dtucker
2003-08-22 09:34:41 +10:00
03a29baf35
- deraadt@cvs.openbsd.org 2003/07/18 01:54:25
...
[scp.c]
userid is unsigned, but well, force it anyways; andrushock@korovino.net
2003-07-19 20:07:45 +10:00
9f63f22aa0
- deraadt@cvs.openbsd.org 2003/06/28 16:23:06
...
[atomicio.c atomicio.h authfd.c clientloop.c monitor_wrap.c msg.c
progressmeter.c scp.c sftp-client.c ssh-keyscan.c ssh.h sshconnect.c
sshd.c]
deal with typing of write vs read in atomicio
2003-07-03 13:46:56 +10:00
b2cdcb50a2
- nino@cvs.openbsd.org 2003/06/12 15:34:09
...
[scp.c]
Typo. Ok markus@.
2003-06-18 20:26:34 +10:00
b69aaa8db7
- djm@cvs.openbsd.org 2003/06/04 12:40:39
...
[scp.c]
kill ssh process upon receipt of signal, bz #241 .
based on patch from esb AT hawaii.edu; ok markus@
2003-06-04 22:51:24 +10:00
65d1f5765f
- djm@cvs.openbsd.org 2003/06/04 12:18:49
...
[scp.c]
ansify; ok markus@
2003-06-04 22:51:08 +10:00
dafb12ed28
a - millert@cvs.openbsd.org 2003/06/03 02:56:16
...
[scp.c]
Remove the advertising clause in the UCB license which Berkeley
rescinded 22 July 1999. Proofed by myself and Theo.
2003-06-03 13:06:18 +10:00
0e7f4363f3
- (bal) [defines.h progressmeter.c scp.c] Some more culling of non 64bit
...
hacked code.
2003-04-28 23:30:43 +00:00
d54d9382a4
- (bal) scp.c 'limit' conflicts with Cray. Rename to 'limitbw'
2003-03-21 00:55:32 +00:00
0011138d47
- (djm) OpenBSD CVS Sync
...
- markus@cvs.openbsd.org 2003/03/05 22:33:43
[channels.c monitor.c scp.c session.c sftp-client.c sftp-int.c]
[sftp-server.c ssh-add.c sshconnect2.c]
fix memory leaks; from dlheine@suif.Stanford.EDU/CLOUSEAU; ok djm@
2003-03-10 11:21:17 +11:00
eeeeb3517e
- markus@cvs.openbsd.org 2003/02/02 10:51:13
...
[scp.c]
call okname() only when using system(3) for remote-remote copy;
fixes bugs #483 , #472 ; ok deraadt@, mouring@
2003-02-24 11:52:58 +11:00
8e12147df5
- markus@cvs.openbsd.org 2003/01/23 14:06:15
...
[scp.1 scp.c]
scp -12; Sam Smith and others; ok provos@, deraadt@
2003-01-24 11:37:38 +11:00
ff74d748e9
- markus@cvs.openbsd.org 2003/01/23 14:01:53
...
[scp.c]
bandwidth limitation patch (scp -l) from niels@; ok todd@, deraadt@
2003-01-24 11:36:58 +11:00
86b781c179
- djm@cvs.openbsd.org 2003/01/10 10:29:35
...
[scp.c]
Don't ftruncate after write error, creating sparse files of
incorrect length
mindrot bug #403 , reported by rusr@cup.hp.com ; ok markus@
2003-01-10 21:44:48 +11:00
62d57f605a
- fgsch@cvs.openbsd.org 2003/01/10 08:19:07
...
[scp.c sftp.1 sftp.c sftp-client.c sftp-int.c]
sftp progress meter support.
original diffs by Nils Nordman <nino at nforced dot com> via
markus@, merged to -current by me, djm@ ok.
2003-01-10 21:43:24 +11:00
13b2e55c36
[scp.c] make compilers without long long happy.
2003-01-08 20:09:30 -08:00
40b9503563
- markus@cvs.openbsd.org 2002/12/13 15:20:52
...
[scp.c]
1) include stalling time in total time
2) truncate filenames to 45 instead of 20 characters
3) print rate instead of progress bar, no more stars
4) scale output to tty width
based on a patch from Niels; ok fries@ lebel@ fgs@ millert@
2002-12-23 02:53:08 +00:00
418e078378
- markus@cvs.openbsd.org 2002/12/05 11:08:35
...
[scp.c]
use roundup() similar to rcp/util.c and avoid problems with strange
filesystem block sizes, noted by tjr@freebsd.org ; ok djm@
2002-12-23 02:22:09 +00:00
c276c1208e
- markus@cvs.openbsd.org 2002/11/27 17:53:35
...
[scp.c sftp.c ssh.c]
allow usernames with embedded '@', e.g. scp user@vhost@realhost:file /tmp;
http://bugzilla.mindrot.org/show_bug.cgi?id=447 ; ok mouring@, millert@
2002-12-23 02:14:51 +00:00
e7ee7fe602
- wcobb@cvs.openbsd.org 2002/11/26 00:45:03
...
[scp.c ssh-keygen.c]
Remove unnecessary fflush(stderr) calls, stderr is unbuffered by default.
ok markus@
2002-12-23 02:11:02 +00:00
007eb912ea
- markus@cvs.openbsd.org 2002/11/07 22:35:38
...
[scp.c]
check exit status from ssh, and exit(1) if ssh fails; bug#369;
binder@arago.de
2002-11-09 15:54:08 +00:00
cb72e4f6d2
- deraadt@cvs.openbsd.org 2002/06/19 00:27:55
...
[auth-bsdauth.c auth-skey.c auth1.c auth2-chall.c auth2-none.c authfd.c
authfd.h monitor_wrap.c msg.c nchan.c radix.c readconf.c scp.c sftp.1
ssh-add.1 ssh-add.c ssh-agent.1 ssh-agent.c ssh-keygen.1 ssh-keygen.c
ssh-keysign.c ssh.1 sshconnect.c sshconnect.h sshconnect2.c ttymodes.c
xmalloc.h]
KNF done automatically while reading....
2002-06-21 00:41:51 +00:00
45933dd9aa
- deraadt@cvs.openbsd.org 2002/06/17 06:05:56
...
[scp.c]
make usage like man page
2002-06-21 00:10:58 +00:00
af0c6d6a8c
- markus@cvs.openbsd.org 2002/06/08 12:36:53
...
[scp.c]
remove FallBackToRsh
2002-06-09 20:06:29 +00:00
de3895d580
- mouring@cvs.openbsd.org 2002/04/06 18:24:09
...
[scp.c]
Fixes potental double // within path.
http://bugzilla.mindrot.org/show_bug.cgi?id=76
2002-04-06 18:29:59 +00:00
cdb66e0e82
- (bal) Hand Sync of scp.c (reverted to upstream code)
...
- deraadt@cvs.openbsd.org 2002/03/30 17:45:46
[scp.c]
stretch banners
2002-04-02 20:17:43 +00:00
Damien Miller
Darren Tucker
Ben Lindstrom
Tim Rice