On Apr 19, 5:17pm, herb...@mailbox.org ("Herbert J. Skuhra") wrote:
-- Subject: Re: CVS commit: src/crypto/external/bsd/openssh/dist
| I think something went wrong with merging
| crypto/external/bsd/openssh/dist/sshd_config.
|
| r1.20 contains weird lines:
|
| Index: sshd_config
| ===================================================================
| RCS file: /cvsroot/src/crypto/external/bsd/openssh/dist/sshd_config,v
| retrieving revision 1.19
| retrieving revision 1.20
| diff -u -r1.19 -r1.20
| --- sshd_config 1 Feb 2017 14:27:37 -0000 1.19
| +++ sshd_config 18 Apr 2017 18:41:46 -0000 1.20
| @@ -1,5 +1,5 @@
| -# $NetBSD: sshd_config,v 1.19 2017/02/01 14:27:37 christos Exp $
| -# $OpenBSD: sshd_config,v 1.100 2016/08/15 12:32:04 naddy Exp $
| +# $NetBSD: sshd_config,v 1.20 2017/04/18 18:41:46 christos Exp $
| +# $OpenBSD: sshd_config,v 1.101 2017/03/14 07:19:07 djm Exp $
|
| # This is the sshd server system-wide configuration file. See
| # sshd_config(5) for more information.
| @@ -74,8 +74,11 @@
| #PrintLastLog yes
| #TCPKeepAlive yes
| #UseLogin no
| +<<<<<<< sshd_config
| #UsePrivilegeSeparation sandbox
| UsePam yes
| +=======
| +>>>>>>> 1.1.1.15
| #PermitUserEnvironment no
| #Compression delayed
| #ClientAliveInterval 0
|
Thanks, I fixed that exact problem, so I don't know why it is still incorrect.
I will fix it again.
christos
