Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix conflict.

This commit is contained in:
christos 2017-04-19 15:34:25 +00:00
parent 4b6a251bc1
commit b397962d38
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crypto/external/bsd/openssh/dist/sshd_config vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: sshd_config,v 1.20 2017/04/18 18:41:46 christos Exp $
# $NetBSD: sshd_config,v 1.21 2017/04/19 15:34:25 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
@ -74,11 +74,8 @@ AuthorizedKeysFile .ssh/authorized_keys
#PrintLastLog yes
#TCPKeepAlive yes
#UseLogin no
<<<<<<< sshd_config
#UsePrivilegeSeparation sandbox
UsePam yes
=======
>>>>>>> 1.1.1.15
#PermitUserEnvironment no
#Compression delayed
#ClientAliveInterval 0