diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | sftp.1 | 18 |
2 files changed, 15 insertions, 10 deletions
@@ -67,6 +67,11 @@ | |||
67 | [auth2.c monitor.c sshconnect2.c auth2-krb5.c] | 67 | [auth2.c monitor.c sshconnect2.c auth2-krb5.c] |
68 | implement kerberos over ssh2 ("kerberos-2@ssh.com"); tested with jakob@ | 68 | implement kerberos over ssh2 ("kerberos-2@ssh.com"); tested with jakob@ |
69 | server interops with commercial client; ok jakob@ djm@ | 69 | server interops with commercial client; ok jakob@ djm@ |
70 | - jmc@cvs.openbsd.org 2003/05/14 08:25:39 | ||
71 | [sftp.1] | ||
72 | - better formatting in SYNOPSIS | ||
73 | - whitespace at EOL | ||
74 | ok djm@ | ||
70 | - (djm) Make portable build with MIT krb5 (some issues remain) | 75 | - (djm) Make portable build with MIT krb5 (some issues remain) |
71 | - (djm) Add new UsePAM configuration directive to allow runtime control | 76 | - (djm) Add new UsePAM configuration directive to allow runtime control |
72 | over usage of PAM. This allows non-root use of sshd when built with | 77 | over usage of PAM. This allows non-root use of sshd when built with |
@@ -1460,4 +1465,4 @@ | |||
1460 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 1465 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
1461 | ok provos@ | 1466 | ok provos@ |
1462 | 1467 | ||
1463 | $Id: ChangeLog,v 1.2696 2003/05/14 09:23:56 djm Exp $ | 1468 | $Id: ChangeLog,v 1.2697 2003/05/14 09:30:38 djm Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: sftp.1,v 1.42 2003/05/14 01:00:44 djm Exp $ | 1 | .\" $OpenBSD: sftp.1,v 1.43 2003/05/14 08:25:39 jmc Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. | 3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. |
4 | .\" | 4 | .\" |
@@ -29,7 +29,7 @@ | |||
29 | .Nm sftp | 29 | .Nm sftp |
30 | .Nd Secure file transfer program | 30 | .Nd Secure file transfer program |
31 | .Sh SYNOPSIS | 31 | .Sh SYNOPSIS |
32 | .Nm | 32 | .Nm sftp |
33 | .Bk -words | 33 | .Bk -words |
34 | .Op Fl vC1 | 34 | .Op Fl vC1 |
35 | .Op Fl b Ar batchfile | 35 | .Op Fl b Ar batchfile |
@@ -42,15 +42,15 @@ | |||
42 | .Op Fl S Ar program | 42 | .Op Fl S Ar program |
43 | .Ar host | 43 | .Ar host |
44 | .Ek | 44 | .Ek |
45 | .Nm | 45 | .Nm sftp |
46 | .Oo Oo Ar user Ns No @ Oc Ns | 46 | .Oo Oo Ar user Ns No @ Oc Ns |
47 | .Ar host Ns Oo : Ns Ar file Oo | 47 | .Ar host Ns Oo : Ns Ar file Oo |
48 | .Ar file Oc Oc Oc | 48 | .Ar file Oc Oc Oc |
49 | .Nm | 49 | .Nm sftp |
50 | .Oo Oo Ar user Ns No @ Oc Ns | 50 | .Oo Oo Ar user Ns No @ Oc Ns |
51 | .Ar host Ns Oo : Ns Ar dir Ns | 51 | .Ar host Ns Oo : Ns Ar dir Ns |
52 | .Oo Ar / Oc Oc Oc | 52 | .Oo Ar / Oc Oc Oc |
53 | .Nm | 53 | .Nm sftp |
54 | .Fl b Ar batchfile | 54 | .Fl b Ar batchfile |
55 | .Oo Ar user Ns No @ Oc Ns Ar host Ns | 55 | .Oo Ar user Ns No @ Oc Ns Ar host Ns |
56 | .Sh DESCRIPTION | 56 | .Sh DESCRIPTION |
@@ -73,13 +73,13 @@ successful interactive authentication. | |||
73 | .Pp | 73 | .Pp |
74 | The third usage format allows the sftp client to start in a remote directory. | 74 | The third usage format allows the sftp client to start in a remote directory. |
75 | .Pp | 75 | .Pp |
76 | The final usage form allows for automated sessions using the | 76 | The final usage form allows for automated sessions using the |
77 | .Fl b | 77 | .Fl b |
78 | option. In such cases, it is usually necessary to configure public key | 78 | option. In such cases, it is usually necessary to configure public key |
79 | authentication to obviate the need to enter a password at connection | 79 | authentication to obviate the need to enter a password at connection |
80 | time (see | 80 | time (see |
81 | .Xr sshd 8 | 81 | .Xr sshd 8 |
82 | and | 82 | and |
83 | .Xr ssh-keygen 1 | 83 | .Xr ssh-keygen 1 |
84 | for details.) | 84 | for details.) |
85 | The options are as follows: | 85 | The options are as follows: |