Christos Zoulas skrev: > > Module Name: src > Committed By: christos > Date: Tue Apr 18 18:41:46 UTC 2017 > > Modified Files: > src/crypto/external/bsd/openssh/dist: addrmatch.c atomicio.c atomicio.h > auth-bsdauth.c auth-krb5.c auth-options.c auth-options.h auth-pam.c > auth-pam.h auth-passwd.c auth-rhosts.c auth-skey.c auth.c auth.h > auth2-chall.c auth2-gss.c auth2-hostbased.c auth2-kbdint.c > auth2-krb5.c auth2-none.c auth2-passwd.c auth2-pubkey.c auth2.c > authfd.c authfd.h authfile.c authfile.h bcrypt_pbkdf.c bitmap.c > bitmap.h blocks.c blowfish.c bufaux.c bufbn.c bufec.c buffer.c > buffer.h canohost.c canohost.h chacha.c channels.c channels.h > cipher-3des1.c cipher-bf1.c cipher-chachapoly.c cipher-ctr-mt.c > cipher.c cipher.h cleanup.c clientloop.c clientloop.h compat.c > compat.h crc32.c crc32.h deattack.c deattack.h dh.c dh.h > digest-libc.c digest-openssl.c dispatch.c dispatch.h dns.c dns.h > ed25519.c fatal.c fe25519.c fmt_scaled.c fmt_scaled.h ge25519.c > getpeereid.c getpeereid.h getrrsetbyname.c getrrsetbyname.h > groupaccess.c groupaccess.h gss-genr.c gss-serv-krb5.c gss-serv.c > hash.c hmac.c hostfile.c hostfile.h includes.h kex.c kex.h > kexc25519.c kexc25519c.c kexc25519s.c kexdh.c kexdhc.c kexdhs.c > kexecdh.c kexecdhc.c kexecdhs.c kexgex.c kexgexc.c kexgexs.c key.c > key.h krl.c ldapauth.c ldapauth.h log.c log.h mac.c mac.h match.c > match.h md-sha256.c misc.c misc.h moduli.5 moduli.c monitor.c > monitor.h monitor_fdpass.c monitor_fdpass.h monitor_wrap.c > monitor_wrap.h msg.c msg.h mux.c myproposal.h namespace.h nchan.c > opacket.c opacket.h packet.c packet.h pathnames.h pkcs11.h > poly1305.c progressmeter.c progressmeter.h random.h readconf.c > readconf.h readpass.c readpassphrase.3 readpassphrase.c > readpassphrase.h rsa.c rsa.h sandbox-rlimit.c sc25519.c scp.1 scp.c > servconf.c servconf.h serverloop.c serverloop.h session.c session.h > sftp-client.c sftp-client.h sftp-common.c sftp-common.h sftp-glob.c > sftp-server-main.c sftp-server.8 sftp-server.c sftp.1 sftp.c sftp.h > smult_curve25519_ref.c ssh-add.1 ssh-add.c ssh-agent.1 ssh-agent.c > ssh-dss.c ssh-ecdsa.c ssh-ed25519.c ssh-gss.h ssh-keygen.1 > ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c ssh-keysign.8 > ssh-keysign.c ssh-pkcs11-client.c ssh-pkcs11-helper.8 > ssh-pkcs11-helper.c ssh-pkcs11.c ssh-pkcs11.h ssh-rsa.c ssh.1 ssh.c > ssh.h ssh1.h ssh2.h ssh_api.c ssh_api.h ssh_config.5 > sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c > sshconnect.c sshconnect.h sshconnect1.c sshconnect2.c sshd.8 sshd.c > sshd_config sshd_config.5 ssherr.c sshkey.c sshkey.h sshlogin.c > sshlogin.h sshpty.c sshpty.h sshtty.c ttymodes.c ttymodes.h > uidswap.c uidswap.h umac.c umac.h utf8.c uuencode.c uuencode.h > verify.c version.h xmalloc.c xmalloc.h > > Log Message: > merge conflicts
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. -- Herbert
