diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | sftp.1 | 12 |
2 files changed, 12 insertions, 7 deletions
@@ -4,6 +4,11 @@ | |||
4 | [sftp-int.c sftp.1 sftp.c] | 4 | [sftp-int.c sftp.1 sftp.c] |
5 | Tidy sftp batchmode handling, eliminate junk to stderr (bugzilla #754) and | 5 | Tidy sftp batchmode handling, eliminate junk to stderr (bugzilla #754) and |
6 | enable use of "-b -" to accept batchfile from stdin; ok markus@ | 6 | enable use of "-b -" to accept batchfile from stdin; ok markus@ |
7 | - jmc@cvs.openbsd.org 2004/01/13 12:17:33 | ||
8 | [sftp.1] | ||
9 | remove unnecessary Ic's; | ||
10 | kill whitespace at EOL; | ||
11 | ok djm@ | ||
7 | 12 | ||
8 | 20040114 | 13 | 20040114 |
9 | - (dtucker) [auth-pam.c] Have monitor die if PAM authentication thread exits | 14 | - (dtucker) [auth-pam.c] Have monitor die if PAM authentication thread exits |
@@ -1673,4 +1678,4 @@ | |||
1673 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1678 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1674 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1679 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1675 | 1680 | ||
1676 | $Id: ChangeLog,v 1.3170 2004/01/20 23:58:47 djm Exp $ | 1681 | $Id: ChangeLog,v 1.3171 2004/01/21 00:00:04 djm Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: sftp.1,v 1.50 2004/01/13 09:25:05 djm Exp $ | 1 | .\" $OpenBSD: sftp.1,v 1.51 2004/01/13 12:17:33 jmc Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. | 3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. |
4 | .\" | 4 | .\" |
@@ -99,11 +99,11 @@ Batch mode reads a series of commands from an input | |||
99 | instead of | 99 | instead of |
100 | .Em stdin . | 100 | .Em stdin . |
101 | Since it lacks user interaction it should be used in conjunction with | 101 | Since it lacks user interaction it should be used in conjunction with |
102 | non-interactive authentication. | 102 | non-interactive authentication. |
103 | A | 103 | A |
104 | .Ar batchfile | 104 | .Ar batchfile |
105 | of | 105 | of |
106 | .Sq Ic \- | 106 | .Sq \- |
107 | may be used to indicate standard input. | 107 | may be used to indicate standard input. |
108 | .Nm | 108 | .Nm |
109 | will abort if any of the following | 109 | will abort if any of the following |
@@ -115,7 +115,7 @@ and | |||
115 | .Ic lmkdir . | 115 | .Ic lmkdir . |
116 | Termination on error can be suppressed on a command by command basis by | 116 | Termination on error can be suppressed on a command by command basis by |
117 | prefixing the command with a | 117 | prefixing the command with a |
118 | .Sq Ic \- | 118 | .Sq \- |
119 | character (for example, | 119 | character (for example, |
120 | .Ic -rm /tmp/blah* ) . | 120 | .Ic -rm /tmp/blah* ) . |
121 | .It Fl C | 121 | .It Fl C |