Commit Graph

64 Commits

Author SHA1 Message Date
Damien Miller 64e8d44fbd - djm@cvs.openbsd.org 2005/02/20 22:59:06
[sftp.c]
     turn on ssh batch mode when in sftp batch mode, patch from
     jdmossh AT nand.net;
     ok markus@
2005-03-01 21:16:47 +11:00
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 596dcfa21f - fgsch@cvs.openbsd.org 2004/12/10 03:10:42
[sftp.c]
     - fix globbed ls for paths the same lenght as the globbed path when
       we have a unique matching.
     - fix globbed ls in case of a directory when we have a unique matching.
     - as a side effect, if the path does not exist error (used to silently
       ignore).
     - don't do extra do_lstat() if we only have one matching file.
     djm@ ok
2004-12-11 13:37:22 +11:00
Darren Tucker e2f189a841 - djm@cvs.openbsd.org 2004/11/29 07:41:24
[sftp-client.h sftp.c]
     Some small fixes from moritz@jodeit.org. ok deraadt@
2004-12-06 22:45:53 +11:00
Darren Tucker cd516efea1 - (dtucker) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2004/11/25 22:22:14
     [sftp-client.c sftp.c]
     leak; from mpech
2004-12-06 22:43:43 +11:00
Darren Tucker 2d963d8721 - djm@cvs.openbsd.org 2004/11/05 12:19:56
[sftp.c]
     command editing and history support via libedit; ok markus@
     thanks to hshoexer@ and many testers on tech@ too
2004-11-07 20:04:10 +11:00
Darren Tucker fc9597034b - deraadt@cvs.openbsd.org 2004/07/11 17:48:47
[channels.c cipher.c clientloop.c clientloop.h compat.h moduli.c
     readconf.c nchan.c pathnames.h progressmeter.c readconf.h servconf.c
     session.c sftp-client.c sftp.c ssh-agent.1 ssh-keygen.c ssh.c ssh1.h
     sshd.c ttymodes.h]
     spaces
2004-07-17 16:12:08 +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
Damien Miller 96d6d7d9a0 - djm@cvs.openbsd.org 2004/06/25 23:21:38
[sftp.c]
     bz #875: fix bad escape char error message; reported by f_mohr AT yahoo.de
2004-06-26 09:21:06 +10:00
Darren Tucker 9a52645566 - djm@cvs.openbsd.org 2004/06/22 01:16:39
[sftp.c]
     don't show .files by default in ls, add -a option to turn them back on;
     ok markus
2004-06-22 13:09:55 +10:00
Darren Tucker a4e9ffa653 - djm@cvs.openbsd.org 2004/06/21 22:30:45
[sftp.c]
     prefix ls option flags with LS_
2004-06-22 13:07:58 +10:00
Darren Tucker b9123453d0 - djm@cvs.openbsd.org 2004/06/21 22:04:50
[sftp.c]
     introduce sorting for ls, same options as /bin/ls; ok markus@
2004-06-22 13:06:45 +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 b215c5d8fe - djm@cvs.openbsd.org 2004/06/20 18:53:39
[sftp.c]
     make "ls -l" listings print user/group names, add "ls -n" to show uid/gid
     (like /bin/ls); idea & ok markus@
2004-06-22 12:30:53 +10:00
Darren Tucker bd12f1741e - dtucker@cvs.openbsd.org 2004/06/18 06:13:25
[sftp.c]
     Use execvp instead of execv so sftp -S ssh works.  "makes sense" markus@
2004-06-18 16:23:43 +10:00
Damien Miller 7cf17eb78c - pedro@cvs.openbsd.org 2004/06/03 12:22:20
[sftp-client.c sftp.c]
     initialize pointers, ok markus@
2004-06-15 10:28:56 +10:00
Damien Miller 350327c042 - djm@cvs.openbsd.org 2004/05/26 08:59:57
[sftp.c]
     exit -> _exit in forked child on error; from andrushock AT korovino.net
2004-06-15 10:24:13 +10:00
Darren Tucker cdf547afe4 - djm@cvs.openbsd.org 2004/05/19 12:17:33
[sftp-client.c sftp.c]
     gracefully abort transfers on receipt of SIGINT, also ignore SIGINT while
     waiting for a command; ok markus@
2004-05-24 10:12:19 +10:00
Damien Miller c0f27d8782 - djm@cvs.openbsd.org 2004/03/03 09:31:20
[sftp.c]
     Fix initialisation of progress meter; ok markus@
2004-03-08 23:12:19 +11:00
Damien Miller 20e1fabace - djm@cvs.openbsd.org 2004/02/17 11:03:08
[sftp.c]
     sftp.c and sftp-int.c, together at last; ok markus@
2004-02-18 14:30:55 +11:00
Damien Miller d7d46bb606 - (djm) OpenBSD CVS Sync
- djm@cvs.openbsd.org 2004/02/17 07:17:29
     [sftp-glob.c sftp.c]
     Remove useless headers; ok deraadt@
2004-02-18 14:11:13 +11:00
Damien Miller 4e60ed74a6 - djm@cvs.openbsd.org 2004/02/17 05:39:51
[sftp-client.c sftp-client.h sftp-glob.c sftp-glob.h sftp-int.c]
     [sftp-int.h sftp.c]
     switch to license.template for code written by me (belated, I know...)
2004-02-17 17:07:59 +11:00
Damien Miller ec69203e45 - djm@cvs.openbsd.org 2004/01/27 10:08:10
[sftp.c]
     reorder parsing so user:skey@host:file works (bugzilla #777)
     patch from admorten AT umich.edu; ok markus@
2004-01-27 21:22:00 +11:00
Damien Miller e4f5a82d6e - djm@cvs.openbsd.org 2004/01/21 03:07:59
[sftp.c]
     initialise infile in main, rather than statically - from portable
2004-01-21 14:11:05 +11:00
Damien Miller 44f75c14f6 - djm@cvs.openbsd.org 2004/01/13 09:25:05
[sftp-int.c sftp.1 sftp.c]
     Tidy sftp batchmode handling, eliminate junk to stderr (bugzilla #754) and
     enable use of "-b -" to accept batchfile from stdin; ok markus@
2004-01-21 10:58:47 +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
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 1a721156b0 - markus@cvs.openbsd.org 2003/07/10 20:05:55
[sftp.c]
     sync usage with manpage, add missing -R
2003-07-14 17:32:29 +10:00
Damien Miller cc685c1cbe - djm@cvs.openbsd.org 2003/06/04 12:41:22
[sftp.c]
     kill ssh process on receipt of signal; ok markus@
2003-06-04 22:51:38 +10:00
Damien Miller 34bb56743a - mouring@cvs.openbsd.org 2003/05/15 03:43:59
[sftp-int.c sftp.c]
     Teach ls how to display multiple column display and allow users
     to return to single column format via 'ls -1'.  OK @djm
2003-05-15 13:49:58 +10: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
Damien Miller 956f3fb28b - (djm) OpenBSD CVS Sync
- djm@cvs.openbsd.org 2003/01/08 23:53:26
     [sftp.1 sftp.c sftp-int.c sftp-int.h]
     Cleanup error handling for batchmode
     Allow blank lines and comments in input
     Ability to suppress abort on error in batchmode ("-put blah")
     Fixes mindrot bug #452; markus@ ok
2003-01-10 21:40:00 +11: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 8d631e8515 - mouring@cvs.openbsd.org 2002/07/25 01:16:59
[sftp.c]
     FallBackToRsh does not exist anywhere else.  Remove it from here.
     OK deraadt.
2002-08-01 01:25:00 +00:00
Ben Lindstrom b1f483f472 - deraadt@cvs.openbsd.org 2002/06/23 09:30:14
[sftp-client.c sftp-client.h sftp-common.c sftp-int.c sftp-server.c
      sftp.c]
     bunch of u_int vs int stuff
2002-06-23 21:27:18 +00:00
Ben Lindstrom 5a6abdae0f unexpand 2002-06-09 19:41:48 +00:00
Ben Lindstrom 2f3d52a2d6 - markus@cvs.openbsd.org 2002/04/02 17:37:48
[sftp.c]
     always call log_init()
2002-04-02 21:06:18 +00:00
Ben Lindstrom 47fd8112b5 - markus@cvs.openbsd.org 2002/03/30 18:51:15
[monitor.c serverloop.c sftp-int.c sftp.c sshd.c]
     check waitpid for EINTR; based on patch from peter@ifm.liu.se
2002-04-02 20:48:19 +00:00
Ben Lindstrom 6328ab3989 - markus@cvs.openbsd.org 2002/03/19 10:49:35
[auth-krb5.c auth-rh-rsa.c auth.c cipher.c key.c misc.h packet.c session.c
      sftp-client.c sftp-glob.h sftp.c ssh-add.c ssh.c sshconnect2.c sshd.c
      ttymodes.c]
     KNF whitespace
2002-03-22 02:54:23 +00:00
Damien Miller 16a133339a - djm@cvs.openbsd.org 2002/02/12 12:32:27
[sftp.1 sftp.c sftp-client.c sftp-client.h sftp-int.c]
     Perform multiple overlapping read/write requests in file transfer. Mostly
     done by Tobias Ringstrom <tori@ringstrom.mine.nu>; ok markus@
2002-02-13 14:03:56 +11:00
Damien Miller 025e01c7f0 - mpech@cvs.openbsd.org 2002/02/06 14:27:23
[sftp.c]
     sync usage() with manual.
2002-02-08 22:06:29 +11:00
Damien Miller 8829d3669d - djm@cvs.openbsd.org 2002/02/05 00:00:46
[sftp.1 sftp.c sftp-client.c sftp-client.h sftp-int.c]
     Add "-B" option to specify copy buffer length (default 32k); ok markus@
2002-02-08 22:04:05 +11:00
Damien Miller d14ee1e29c - djm@cvs.openbsd.org 2002/02/04 21:53:12
[sftp.1 sftp.c]
     Add "-P" option to directly connect to a local sftp-server. Should be useful
     for regression testing; ok markus@
2002-02-05 12:27:31 +11:00
Damien Miller 9f0f5c64bc - deraadt@cvs.openbsd.org 2001/12/19 07:18:56
[auth1.c auth2.c auth2-chall.c auth-bsdauth.c auth.c authfile.c auth.h]
     [auth-krb4.c auth-rhosts.c auth-skey.c bufaux.c canohost.c channels.c]
     [cipher.c clientloop.c compat.c compress.c deattack.c key.c log.c mac.c]
     [match.c misc.c nchan.c packet.c readconf.c rijndael.c rijndael.h scard.c]
     [servconf.c servconf.h serverloop.c session.c sftp.c sftp-client.c]
     [sftp-glob.c sftp-int.c sftp-server.c ssh-add.c ssh-agent.c ssh.c]
     [sshconnect1.c sshconnect2.c sshconnect.c sshd.8 sshd.c sshd_config]
     [ssh-keygen.c sshlogin.c sshpty.c sshtty.c ttymodes.c uidswap.c]
     basic KNF done while i was looking for something else
2001-12-21 14:45:46 +11: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 6a33763332 - stevesk@cvs.openbsd.org 2001/09/17 20:38:09
[sftp.1 sftp.c]
     cleanup and document -1, -s and -S; ok markus@
2001-09-18 05:47:32 +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 bba81213b9 - itojun@cvs.openbsd.org 2001/06/23 15:12:20
[auth1.c auth2.c auth2-chall.c authfd.c authfile.c auth-rhosts.c
      canohost.c channels.c cipher.c clientloop.c deattack.c dh.c
      hostfile.c kex.c kexdh.c kexgex.c key.c nchan.c packet.c radix.c
      readpass.c scp.c servconf.c serverloop.c session.c sftp.c
      sftp-client.c sftp-glob.c sftp-int.c sftp-server.c ssh-add.c
      ssh-agent.c ssh.c sshconnect1.c sshconnect2.c sshconnect.c sshd.c
      ssh-keygen.c ssh-keyscan.c]
     more strict prototypes.  raise warning level in Makefile.inc.
     markus ok'ed
     TODO; cleanup headers
2001-06-25 05:01:22 +00:00
Ben Lindstrom 387c472660 - mouring@cvs.openbsd.org 2001/05/08 19:45:25
[misc.c misc.h scp.c sftp.c]
     Use addargs() in sftp plus some clean up of addargs().  OK Markus
2001-05-08 20:27:25 +00:00
Ben Lindstrom 4529b70b4c - mouring@cvs.openbsd.org 2001/05/03 23:09:53
[misc.c misc.h scp.c sftp.c]
     Move colon() and cleanhost() to misc.c where I should I have put it in
     the first place
2001-05-03 23:39:53 +00:00