Merge conflicts

merge openssh-6.7

merge conflicts.

Don't forget to re-assign sock after dup2(); from Jarle Greipsland

Take better care of closing file descriptors in the agent child and dealing
with dup2 and std{in,out,err}.

Use __dead.

merge openssh-5.9

kill non-literal format strings or document them.

- Merge conflicts
- WARNS=5

Resolve conflicts

merge changes.

Preserve the existing value of an extern variable across the call to
process_sign_request2().

Merge in our changes:
- conditionalize login_cap
- conditionalize bsd_auth
- bring in pam from portable
- restore krb5, krb4, afs, skey
- bring in hpn patches, disable mt aes cipher, keep speedups an

Merge in our changes:
- conditionalize login_cap
- conditionalize bsd_auth
- bring in pam from portable
- restore krb5, krb4, afs, skey
- bring in hpn patches, disable mt aes cipher, keep speedups and cipher none
- add ignore root rhosts option
- fix ctype macro arguments
- umac is broken, disable it
- better ~homedir handling
- netbsd style tunnels
- urandom, xhome, chrootdir, rescuedir NetBSD handling
- utmp/utmpx handling
- handle tty posix_vdisable properly
- handle setuid and unsetuid the posix way instead of setresuid()
- add all missing functions
- add new moduli
- add build glue

show more ...

import 5.2 from ftp.openbsd.org