summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-10-15 15:58:18 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-10-15 15:58:18 +1000
commitf132c67e8e6d6025e1b23a4c55123f062c11f03d (patch)
tree08687095dda36c5973e64c8433b42ff3fb7f21f9
parent7eb3de0dfbec68b1ae187c7896f6539679231092 (diff)
- jmc@cvs.openbsd.org 2003/10/12 13:12:13
[ssh_config.5] note that EnableSSHKeySign should be in the non-hostspecific section; remove unnecessary .Pp; ok markus@
-rw-r--r--ChangeLog7
-rw-r--r--ssh_config.54
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f54616ea6..439a5b4bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,11 @@
22 - markus@cvs.openbsd.org 2003/10/11 11:36:23 22 - markus@cvs.openbsd.org 2003/10/11 11:36:23
23 [monitor_wrap.c] 23 [monitor_wrap.c]
24 return NULL for missing banner; ok djm@ 24 return NULL for missing banner; ok djm@
25 - jmc@cvs.openbsd.org 2003/10/12 13:12:13
26 [ssh_config.5]
27 note that EnableSSHKeySign should be in the non-hostspecific section;
28 remove unnecessary .Pp;
29 ok markus@
25 30
2620031009 3120031009
27 - (dtucker) [sshd_config.5] UsePAM defaults to "no". ok djm@ 32 - (dtucker) [sshd_config.5] UsePAM defaults to "no". ok djm@
@@ -1339,4 +1344,4 @@
1339 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1344 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1340 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1345 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1341 1346
1342$Id: ChangeLog,v 1.3074 2003/10/15 05:56:58 dtucker Exp $ 1347$Id: ChangeLog,v 1.3075 2003/10/15 05:58:18 dtucker Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 7f3c7064a..9073ce51f 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh_config.5,v 1.22 2003/10/11 08:24:08 markus Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.23 2003/10/12 13:12:13 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
@@ -186,7 +186,6 @@ Specifies the ciphers allowed for protocol version 2
186in order of preference. 186in order of preference.
187Multiple ciphers must be comma-separated. 187Multiple ciphers must be comma-separated.
188The default is 188The default is
189.Pp
190.Bd -literal 189.Bd -literal
191 ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour, 190 ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,
192 aes192-cbc,aes256-cbc'' 191 aes192-cbc,aes256-cbc''
@@ -260,6 +259,7 @@ or
260.Dq no . 259.Dq no .
261The default is 260The default is
262.Dq no . 261.Dq no .
262This option should be placed in the non-hostspecific section.
263See 263See
264.Xr ssh-keysign 8 264.Xr ssh-keysign 8
265for more information. 265for more information.