diff --git a/ChangeLog b/ChangeLog index f54616ea6..439a5b4bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,11 @@ - markus@cvs.openbsd.org 2003/10/11 11:36:23 [monitor_wrap.c] return NULL for missing banner; ok djm@ + - 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@ 20031009 - (dtucker) [sshd_config.5] UsePAM defaults to "no". ok djm@ @@ -1339,4 +1344,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.3074 2003/10/15 05:56:58 dtucker Exp $ +$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 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.22 2003/10/11 08:24:08 markus Exp $ +.\" $OpenBSD: ssh_config.5,v 1.23 2003/10/12 13:12:13 jmc Exp $ .Dd September 25, 1999 .Dt SSH_CONFIG 5 .Os @@ -186,7 +186,6 @@ Specifies the ciphers allowed for protocol version 2 in order of preference. Multiple ciphers must be comma-separated. The default is -.Pp .Bd -literal ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour, aes192-cbc,aes256-cbc'' @@ -260,6 +259,7 @@ or .Dq no . The default is .Dq no . +This option should be placed in the non-hostspecific section. See .Xr ssh-keysign 8 for more information.