Merge branch 'vendor/OPENSSH'
authorPeter Avalos <pavalos@theshell.com>
Sat, 9 Jan 2010 22:17:04 +0000 (12:17 -1000)
committerPeter Avalos <pavalos@theshell.com>
Sat, 9 Jan 2010 22:39:43 +0000 (12:39 -1000)
commitc36bd8130d0f62a8100ba285df15fa44fc0c7e86
tree7a295474035828ac19b1b11eedab9fb054aeca82
parentca4be72f67ccf3d94662ed2661e3e55aa159f642
parent40c002af48fe12a59703b95d8d40ed8111fa7f98
Merge branch 'vendor/OPENSSH'
15 files changed:
crypto/openssh/auth2-pubkey.c
crypto/openssh/auth2.c
crypto/openssh/readconf.c
crypto/openssh/servconf.c
crypto/openssh/session.c
crypto/openssh/ssh-agent.c
crypto/openssh/ssh.1
crypto/openssh/ssh.c
crypto/openssh/sshd.8
crypto/openssh/sshd.c
crypto/openssh/sshd_config.5
secure/lib/libssh/config.h
secure/lib/libssh/version.h
secure/usr.bin/ssh/Makefile
secure/usr.sbin/sshd/Makefile