Commit Graph

132 Commits

Author SHA1 Message Date
Darren Tucker 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
Darren Tucker 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
Darren Tucker 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
Darren Tucker 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
Darren Tucker 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
Darren Tucker 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
Darren Tucker 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
Damien Miller 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
Damien Miller 4da295c051 - (djm) [scp.c] Rename limitbw -> limit_rate to match upstreamed patch 2003-11-22 14:39:04 +11:00
Damien Miller 787b2ec18c more whitespace (tabs this time) 2003-11-21 23:56:47 +11:00
Damien Miller 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
Damien Miller 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
Darren Tucker 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
Darren Tucker 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
Damien Miller 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
Darren Tucker 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
Darren Tucker 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
Damien Miller b2cdcb50a2 - nino@cvs.openbsd.org 2003/06/12 15:34:09
[scp.c]
     Typo. Ok markus@.
2003-06-18 20:26:34 +10:00
Damien Miller 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
Damien Miller 65d1f5765f - djm@cvs.openbsd.org 2003/06/04 12:18:49
[scp.c]
     ansify; ok markus@
2003-06-04 22:51:08 +10:00
Damien Miller 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
Ben Lindstrom 0e7f4363f3 - (bal) [defines.h progressmeter.c scp.c] Some more culling of non 64bit
hacked code.
2003-04-28 23:30:43 +00:00
Ben Lindstrom d54d9382a4 - (bal) scp.c 'limit' conflicts with Cray. Rename to 'limitbw' 2003-03-21 00:55:32 +00:00
Damien Miller 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
Damien Miller 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
Damien Miller 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
Damien Miller 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
Damien Miller 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
Damien Miller 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
Tim Rice 13b2e55c36 [scp.c] make compilers without long long happy. 2003-01-08 20:09:30 -08:00
Ben Lindstrom 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
Ben Lindstrom 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
Ben Lindstrom 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
Ben Lindstrom 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
Ben Lindstrom 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
Ben Lindstrom 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
Ben Lindstrom 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
Ben Lindstrom af0c6d6a8c - markus@cvs.openbsd.org 2002/06/08 12:36:53
[scp.c]
     remove FallBackToRsh
2002-06-09 20:06:29 +00:00
Ben Lindstrom 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
Ben Lindstrom 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
Kevin Steves 399ec97bc2 whitespace sync 2002-03-05 18:59:45 +00:00
Ben Lindstrom 3c36bb29ca - itojun@cvs.openbsd.org 2001/12/05 03:56:39
[auth1.c auth2.c canohost.c channels.c deattack.c packet.c scp.c
      sshconnect2.c]
     make it compile with more strict prototype checking
2001-12-06 17:55:26 +00:00
Tim Rice 13aae5ee76 [configure.in] Clean up library testing.
Add optional PATH to --with-pcre, --with-zlib, --with-tcp-wrappers
based on patch by albert chin (china@thewrittenword.com)

Re-arange AC_CHECK_HEADERS and AC_CHECK_FUNCS for eaiser reading
of patches to configure.in

Replace obsolete AC_STRUCT_ST_BLKSIZE with AC_CHECK_MEMBERS

Add test for broken dirname() on Solaris 2.5.1 by
Dan Astoorian <djast@cs.toronto.edu>

[acconfig.h aclocal.m4 defines.h configure.in]
Better socklen_t patch by albert chin (china@thewrittenword.com)

[scp.c]
Replace obsolete HAVE_ST_BLKSIZE with HAVE_STRUCT_STAT_ST_BLKSIZE

[Makefile.in] When running make in top level, always do make in openbsd-compat
patch by Dave Dykstra <dwd@bell-labs.com>
2001-10-21 17:53:58 -07:00
Ben Lindstrom 3e45e4cd00 - markus@cvs.openbsd.org 2001/10/01 08:06:28
[scp.c]
     skip filenames containing \n; report jdamery@chiark.greenend.org.uk
     and matthew@debian.org
2001-10-03 17:30:58 +00:00
Ben Lindstrom 2b7a0e953e - stevesk@cvs.openbsd.org 2001/09/19 19:24:19
[readconf.c readconf.h scp.c sftp.c ssh.1]
     add ClearAllForwardings ssh option and set it in scp and sftp; ok
     markus@
2001-09-20 00:57:55 +00:00
Ben Lindstrom 1e24324164 - stevesk@cvs.openbsd.org 2001/09/17 17:57:57
[scp.1 scp.c sftp.1 sftp.c]
      add -Fssh_config option; ok markus@
2001-09-18 05:38:44 +00:00
Ben Lindstrom 4213c559ef - stevesk@cvs.openbsd.org 2001/09/12 18:18:25
[scp.c]
     don't forward agent for non third-party copies; ok markus@
2001-09-12 18:45:09 +00:00
Ben Lindstrom 5fccbc2339 - markus@cvs.openbsd.org 2001/08/29 20:44:03
[scp.c]
     clear the malloc'd buffer, otherwise source() will leak malloc'd
     memory; ok theo@
2001-09-12 17:49:48 +00:00
Ben Lindstrom 1fa90101f0 - stevesk@cvs.openbsd.org 2001/08/13 23:38:54
[scp.c]
     don't need main prototype (also sync with rcp); ok markus@
2001-08-15 23:21:01 +00:00
Ben Lindstrom 958d9f695b - stevesk@cvs.openbsd.org 2001/08/06 19:47:05
[scp.c]
     use alarm vs. setitimer for portable; ok markus@
2001-08-06 22:48:19 +00:00