upstream commit

Make manual reflect reality: sftp-server's -d option
 accepts a "%d" option, not a "%h" one.

bz#2316; reported by Kirk Wolf
upstream commit

show in debug output which hostkeys are being tried when
 attempting hostbased auth; patch from Iain Morgan
upstream commit

mention AuthorizedKeysCommandUser must be set for
 AuthorizedKeysCommand to be run; bz#2287
upstream commit

explicitly include sys/param.h in files that use the
 howmany() macro; from portable
include CFLAGS in gnome askpass targets

from Fedora
upstream libc change

revision 1.2
date: 2014/12/08 03:45:00;  author: bcook;  state: Exp;  lines: +2 -2;  commitid: 7zWEBgJJOCZ2hvTV;
avoid left shift overflow in reallocarray.

Some 64-bit platforms (e.g. Windows 64) have a 32-bit long. So, shifting
1UL 32-bits to the left causes an overflow. This replaces the constant 1UL with
(size_t)1 so that we get the correct constant size for the platform.

discussed with tedu@ & deraadt@
upstream commit

revert chunk I didn't mean to commit yet; via jmc@