18 files changed, 42002 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 000000000..fbbbca0ed
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,12663 @@
+commit 8aa3455b16fddea4c0144a7c4a1edb10ec67dcc8
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Feb 14 00:39:20 2020 +0000
+
+    upstream: openssh-8.2
+    
+    OpenBSD-Commit-ID: 0a1340ff65fad0d84b997ac58dd1b393dec7c19b
+
+commit 72f0ce33f0d5a37f31bad5800d1eb2fbdb732de6
+Author: Damien Miller <djm@mindrot.org>
+Date:   Wed Feb 12 09:28:35 2020 +1100
+
+    crank version numbers
+
+commit b763ed05bd1f1f15ae1727c86a4498546bc36ca8
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Feb 11 12:51:24 2020 +1100
+
+    Minor documentation update:
+    
+     - remove duplication of dependency information (it's all in INSTALL).
+     - SSHFP is now an RFC.
+
+commit 14ccfdb7248e33b1dc8bbac1425ace4598e094cb
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sun Feb 9 11:23:35 2020 +1100
+
+    Check if UINT32_MAX is defined before redefining.
+
+commit be075110c735a451fd9d79a864e01e2e0d9f19d2
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Feb 7 15:07:27 2020 +1100
+
+    typo; reported by Phil Pennock
+
+commit 963d71851e727ffdd2a97fe0898fad61d4a70ba1
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Feb 7 03:57:31 2020 +0000
+
+    upstream: sync the description of the $SSH_SK_PROVIDER environment
+    
+    variable with that of the SecurityKeyProvider ssh/sshd_config(5) directive,
+    as the latter was more descriptive.
+    
+    OpenBSD-Commit-ID: 0488f09530524a7e53afca6b6e1780598022552f
+
+commit d4d9e1d40514e2746f9e05335d646512ea1020c6
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Feb 7 03:54:44 2020 +0000
+
+    upstream: Add ssh -Q key-sig for all key and signature types.
+    
+    Teach ssh -Q to accept ssh_config(5) and sshd_config(5) algorithm keywords as
+    an alias for the corresponding query.  Man page help jmc@, ok djm@.
+    
+    OpenBSD-Commit-ID: 1e110aee3db2fc4bc5bee2d893b7128fd622e0f8
+
+commit fd68dc27864b099b552a6d9d507ca4b83afd6a76
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Feb 7 03:27:54 2020 +0000
+
+    upstream: fix two PIN entry bugs on FIDO keygen: 1) it would allow more
+    
+    than the intended number of prompts (3) and 2) it would SEGV too many
+    incorrect PINs were entered; based on patch by Gabriel Kihlman
+    
+    OpenBSD-Commit-ID: 9c0011f28ba8bd8adf2014424b64960333da1718
+
+commit 96bd895a0a0b3a36f81c14db8c91513578fc5563
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Feb 6 22:48:23 2020 +0000
+
+    upstream: When using HostkeyAlgorithms to merely append or remove
+    
+    algorithms from the default set (i.e. HostkeyAlgorithms=+/-...), retain the
+    default behaviour of preferring those algorithms that have existing keys in
+    known_hosts; ok markus
+    
+    OpenBSD-Commit-ID: 040e7fcc38ea00146b5d224ce31ce7a1795ee6ed
+
+commit c7288486731734a864b58d024b1395029b55bbc5
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Feb 6 22:46:31 2020 +0000
+
+    upstream: expand HostkeyAlgorithms prior to config dump, matching
+    
+    other algorithm lists; ok markus@
+    
+    OpenBSD-Commit-ID: a66f0fca8cc5ce30405a2867bc115fff600671d0
+
+commit a6ac5d36efc072b15690c65039754f8e44247bdf
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date:   Thu Feb 6 22:34:58 2020 +0000
+
+    upstream: Add Include to the list of permitted keywords after a
+    
+    Match keyword. ok markus@
+    
+    OpenBSD-Commit-ID: 342e940538b13dd41e0fa167dc9ab192b9f6e2eb
+
+commit a47f6a6c0e06628eed0c2a08dc31a8923bcc37ba
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date:   Thu Feb 6 22:30:54 2020 +0000
+
+    upstream: Replace "security key" with "authenticator" in program
+    
+    messages.
+    
+    This replaces "security key" in error/usage/verbose messages and
+    distinguishes between "authenticator" and "authenticator-hosted key".
+    
+    ok djm@
+    
+    OpenBSD-Commit-ID: 7c63800e9c340c59440a054cde9790a78f18592e
+
+commit 849a9b87144f8a5b1771de6c85e44bfeb86be9a9
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Feb 6 11:28:14 2020 +1100
+
+    Don't look for UINT32_MAX in inttypes.h
+    
+    ... unless we are actually going to use it.  Fixes build on HP-UX
+    without the potential impact to other platforms of a header change
+    shortly before release.
+
+commit a2437f8ed0c3be54ddd21630a93c68ebd168286f
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Feb 6 12:02:22 2020 +1100
+
+    depend
+
+commit 9716e8c4956acdd7b223d1642bfa376e07e7503d
+Author: Michael Forney <mforney@mforney.org>
+Date:   Wed Nov 27 19:17:26 2019 -0800
+
+    Fix sha2 MAKE_CLONE no-op definition
+    
+    The point of the dummy declaration is so that MAKE_CLONE(...) can have
+    a trailing semicolon without introducing an empty declaration. So,
+    the macro replacement text should *not* have a trailing semicolon,
+    just like DEF_WEAK.
+
+commit d596b1d30dc158915a3979fa409d21ff2465b6ee
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Feb 4 09:58:04 2020 +0000
+
+    upstream: require FIDO application strings to start with "ssh:"; ok
+    
+    markus@
+    
+    OpenBSD-Commit-ID: 94e9c1c066d42b76f035a3d58250a32b14000afb
+
+commit 501f3582438cb2cb1cb92be0f17be490ae96fb23
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Feb 3 23:47:57 2020 +0000
+
+    upstream: revert enabling UpdateHostKeys by default - there are still
+    
+    corner cases we need to address; ok markus
+    
+    OpenBSD-Commit-ID: ff7ad941bfdc49fb1d8baa95fd0717a61adcad57
+
+commit 072f3b832d2a4db8d9880effcb6c4d0dad676504
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Mon Feb 3 08:15:37 2020 +0000
+
+    upstream: use better markup for challenge and write-attestation, and
+    
+    rejig the challenge text a little;
+    
+    ok djm
+    
+    OpenBSD-Commit-ID: 9f351e6da9edfdc907d5c3fdaf2e9ff3ab0a7a6f
+
+commit 262eb05a22cb1fabc3bc1746c220566490b80229
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Feb 3 21:22:15 2020 +1100
+
+    mention libfido2 in dependencies section
+
+commit ccd3b247d59d3bde16c3bef0ea888213fbd6da86
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Feb 3 19:40:12 2020 +1100
+
+    add clock_gettime64(2) to sandbox allowed syscalls
+    
+    bz3093
+
+commit adffbe1c645ad2887ba0b6d24c194aa7a40c5735
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Sun Feb 2 09:45:34 2020 +0000
+
+    upstream: Output (none) in debug in the case in the CheckHostIP=no case
+    
+    as suggested by markus@
+    
+    OpenBSD-Commit-ID: 4ab9117ee5261cbbd1868717fcc3142eea6385cf
+
+commit 58c819096a2167983e55ae686486ce317b69b2d1
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Sun Feb 2 09:22:22 2020 +0000
+
+    upstream: Prevent possible null pointer deref of ip_str in debug.
+    
+    OpenBSD-Commit-ID: 37b252e2e6f690efed6682437ef75734dbc8addf
+
+commit 0facae7bc8d3f8f9d02d0f6bed3d163ff7f39806
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Sun Feb 2 07:36:50 2020 +0000
+
+    upstream: shuffle the challenge keyword to keep the -O list sorted;
+    
+    OpenBSD-Commit-ID: 08efad608b790949a9a048d65578fae9ed5845fe
+
+commit 6fb3dd0ccda1c26b06223b87bcd1cab9ec8ec3cc
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Sat Feb 1 06:53:12 2020 +0000
+
+    upstream: tweak previous;
+    
+    OpenBSD-Commit-ID: 0c42851cdc88583402b4ab2b110a6348563626d3
+
+commit 92725d4d3fde675acc0ca040b48f3d0c7be73b7f
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Feb 1 17:25:09 2020 +1100
+
+    Use sys-queue.h from compat library.
+    
+    Fixes build on platforms that don't have sys/queue.h (eg MUSL).
+
+commit 677d0ece67634262b3b96c3cd6410b19f3a603b7
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jan 31 23:25:08 2020 +0000
+
+    upstream: regress test for sshd_config Include directive; from Jakub
+    
+    Jelen
+    
+    OpenBSD-Regress-ID: 0d9224de3297c7a5f51ba68d6e3725a2a9345fa4
+
+commit d4f4cdd681ab6408a98419f398b75a55497ed324
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jan 31 23:13:04 2020 +0000
+
+    upstream: whitespace
+    
+    OpenBSD-Commit-ID: 564cf7a5407ecf5da2d94ec15474e07427986772
+
+commit 245399dfb3ecebc6abfc2ef4ee2e650fa9f6942b
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jan 31 23:11:25 2020 +0000
+
+    upstream: force early logging to stderr if debug_flag (-d) is set;
+    
+    avoids missing messages from re-exec config passing
+    
+    OpenBSD-Commit-ID: 02484b8241c1f49010e7a543a7098e6910a8c9ff
+
+commit 7365f28a66d1c443723fbe6f4a2612ea6002901e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jan 31 23:08:08 2020 +0000
+
+    upstream: mistake in previous: filling the incorrect buffer
+    
+    OpenBSD-Commit-ID: 862ee84bd4b97b529f64aec5d800c3dcde952e3a
+
+commit c2bd7f74b0e0f3a3ee9d19ac549e6ba89013abaf
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jan 31 22:42:45 2020 +0000
+
+    upstream: Add a sshd_config "Include" directive to allow inclusion
+    
+    of files. This has sensible semantics wrt Match blocks and accepts glob(3)
+    patterns to specify the included files. Based on patch by Jakub Jelen in
+    bz2468; feedback and ok markus@
+    
+    OpenBSD-Commit-ID: 36ed0e845b872e33f03355b936a4fff02d5794ff
+
+commit ba261a1dd33266168ead4f8f40446dcece4d1600
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Fri Jan 31 22:25:59 2020 +0000
+
+    upstream: spelling fix;
+    
+    OpenBSD-Commit-ID: 3c079523c4b161725a4b15dd06348186da912402
+
+commit 771891a044f763be0711493eca14b6b0082e030f
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Jan 30 22:25:34 2020 +0000
+
+    upstream: document changed default for UpdateHostKeys
+    
+    OpenBSD-Commit-ID: 25c390b21d142f78ac0106241d13441c4265fd2c
+
+commit d53a518536c552672c00e8892e2aea28f664148c
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Jan 30 22:19:32 2020 +0000
+
+    upstream: enable UpdateKnownHosts=yes if the configuration
+    
+    specifies only the default known_hosts files, otherwise select
+    UpdateKnownHosts=ask; ok markus@
+    
+    OpenBSD-Commit-ID: ab401a5ec4a33d2e1a9449eae6202e4b6d427df7
+
+commit bb63ff844e818d188da4fed3c016e0a4eecbbf25
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Jan 30 18:54:42 2020 +1100
+
+    Look in inttypes.h for UINT32_MAX.
+    
+    Should prevent warnings on at least some AIX versions.
+
+commit afeb6a960da23f0a5cbc4b80cca107c7504e932a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Jan 30 07:21:38 2020 +0000
+
+    upstream: use sshpkt_fatal() instead of plain fatal() for
+    
+    ssh_packet_write_poll() failures here too as the former yields better error
+    messages; ok dtucker@
+    
+    OpenBSD-Commit-ID: 1f7a6ca95bc2b716c2e948fc1370753be772d8e3
+
+commit 65d6fd0a8a6f31c3ddf0c1192429a176575cf701
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Jan 30 07:20:57 2020 +0000
+
+    upstream: check the return value of ssh_packet_write_poll() and
+    
+    call sshpkt_fatal() if it fails; avoid potential busy-loop under some
+    circumstances. Based on patch by Mike Frysinger; ok dtucker@
+    
+    OpenBSD-Commit-ID: c79fe5cf4f0cd8074cb6db257c1394d5139408ec
+
+commit dce74eab0c0f9010dc84c62500a17771d0131ff3
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Jan 30 07:20:05 2020 +0000
+
+    upstream: have sshpkt_fatal() save/restore errno before we
+    
+    potentially call strerror() (via ssh_err()); ok dtucker
+    
+    OpenBSD-Commit-ID: 5590df31d21405498c848245b85c24acb84ad787
+
+commit 14ef4efe2bf4180e085ea6738fdbebc199458b0c
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Jan 29 08:17:49 2020 +0000
+
+    upstream: markus suggests a simplification to previous
+    
+    OpenBSD-Commit-ID: 10bbfb6607ebbb9a018dcd163f0964941adf58de
+
+commit 101ebc3a8cfa78d2e615afffbef9861bbbabf1ff
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Jan 29 07:51:30 2020 +0000
+
+    upstream: give more context to UpdateHostKeys messages, mentioning
+    
+    that the changes are validated by the existing trusted host key. Prompted by
+    espie@ feedback and ok markus@
+    
+    OpenBSD-Commit-ID: b3d95f4a45f2692f4143b9e77bb241184dbb8dc5
+
+commit 24c0f752adf9021277a7b0a84931bb5fe48ea379
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jan 28 08:01:34 2020 +0000
+
+    upstream: changes to support FIDO attestation
+    
+    Allow writing to disk the attestation certificate that is generated by
+    the FIDO token at key enrollment time. These certificates may be used
+    by an out-of-band workflow to prove that a particular key is held in
+    trustworthy hardware.
+    
+    Allow passing in a challenge that will be sent to the card during
+    key enrollment. These are needed to build an attestation workflow
+    that resists replay attacks.
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: 457dc3c3d689ba39eed328f0817ed9b91a5f78f6
+
+commit 156bef36f93a48212383235bb8e3d71eaf2b2777
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jan 28 07:24:15 2020 +0000
+
+    upstream: disable UpdateHostKeys=ask when in quiet mode; "work for
+    
+    me" matthieu@
+    
+    OpenBSD-Commit-ID: 60d7b5eb91accf935ed9852650a826d86db2ddc7
+
+commit ec8a759b4045e54d6b38e690ffee4cbffc53c7b7
+Author: Damien Miller <djm@mindrot.org>
+Date:   Tue Jan 28 12:57:25 2020 +1100
+
+    compat for missing IPTOS_DSCP_LE in system headers
+
+commit 4594c7627680c4f41c2ad5fe412e55b7cc79b10c
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jan 28 01:49:36 2020 +0000
+
+    upstream: make IPTOS_DSCP_LE available via IPQoS directive; bz2986,
+    
+    based on patch by veegish AT cyberstorm.mu
+    
+    OpenBSD-Commit-ID: 9902bf4fbb4ea51de2193ac2b1d965bc5d99c425
+
+commit da22216b5db3613325aa7b639f40dc017e4c6f69
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Mon Jan 27 20:51:32 2020 +0000
+
+    upstream: disable UpdateHostKeys=ask if command is specified; ok
+    
+    djm@ sthen@
+    
+    OpenBSD-Commit-ID: e5bcc45eadb78896637d4143d289f1e42c2ef5d7
+
+commit 1e1db0544fdd788e2e3fc21d972a7ccb7de6b4ae
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Jan 26 00:09:50 2020 +0000
+
+    upstream: unbreak unittests for recent API / source file changes
+    
+    OpenBSD-Regress-ID: 075a899a01bbf7781d38bf0b33d8366faaf6d3c0
+
+commit 0d1144769151edf65f74aee9a4c8545c37861695
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sun Jan 26 15:09:15 2020 +1100
+
+    Move definition of UINT32_MAX.
+    
+    This allows us to always define it if needed not just if we also
+    define the type ourself.
+
+commit f73ab8a811bc874c2fb403012aa8e4bfdcaf5ec7
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Jan 26 00:09:50 2020 +0000
+
+    upstream: unbreak unittests for recent API / source file changes
+    
+    OpenBSD-Regress-ID: 075a899a01bbf7781d38bf0b33d8366faaf6d3c0
+
+commit 0373f9eba2b63455dceedbd3ac3d5dca306789ff
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sun Jan 26 14:09:17 2020 +1100
+
+    Include signal.h to prevent redefintion of _NSIG.
+
+commit 638a45b5c1e20a8539100ca44166caad8abf26f8
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sun Jan 26 13:40:51 2020 +1100
+
+    Wrap stdint.h in tests inside HAVE_STDINT_H.
+
+commit 74dfc2c859c906eaab1f88a27fd883115ffb928f
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Jan 26 00:14:45 2020 +0000
+
+    upstream: for UpdateHostKeys, don't report errors for unsupported
+    
+    key types - just ignore them. spotted by and ok dtucker@
+    
+    OpenBSD-Commit-ID: 91769e443f6197c983932fc8ae9d39948727d473
+
+commit b59618246c332e251160be0f1e0e88a7d4e2b0ae
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Jan 26 00:13:20 2020 +0000
+
+    upstream: downgrade error() for missing subsequent known_hosts
+    
+    files to debug() as it was intended to be; spotted by dtucker@
+    
+    OpenBSD-Commit-ID: 18cfea382cb52f2da761be524e309cc3d5354ef9
+
+commit 469df611f778eec5950d556aabfe1d4efc227915
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 25 23:33:27 2020 +0000
+
+    upstream: clarify that BatchMode applies to all interactive prompts
+    
+    (e.g. host key confirmation) and not just password prompts.
+    
+    OpenBSD-Commit-ID: 97b001883d89d3fb1620d2e6b747c14a26aa9818
+
+commit de40876c4a5d7c519d3d7253557572fdfc13db76
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 25 23:28:06 2020 +0000
+
+    upstream: tidy headers; some junk snuck into sshbuf-misc.c and
+    
+    sshbuf-io.c doesn't need SSHBUF_INTERNAL set
+    
+    OpenBSD-Commit-ID: 27a724d2e0b2619c1a1490f44093bbd73580d9e6
+
+commit 6a107606355fa9547884cad6740e6144a7a7955b
+Author: Damien Miller <djm@mindrot.org>
+Date:   Sun Jan 26 10:28:21 2020 +1100
+
+    depend
+
+commit 59d01f1d720ebede4da42882f592d1093dac7adc
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 25 23:13:09 2020 +0000
+
+    upstream: improve the error message for u2f enrollment errors by
+    
+    making ssh-keygen be solely responsible for printing the error message and
+    convertint some more common error responses from the middleware to a useful
+    ssherr.h status code. more detail remains visible via -v of course.
+    
+    also remove indepedent copy of sk-api.h declarations in sk-usbhid.c
+    and just include it.
+    
+    feedback & ok markus@
+    
+    OpenBSD-Commit-ID: a4a8ffa870d9a3e0cfd76544bcdeef5c9fb1f1bb
+
+commit 99aa8035554ddb976348d2a9253ab3653019728d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 25 23:02:13 2020 +0000
+
+    upstream: factor out reading/writing sshbufs to dedicated
+    
+    functions; feedback and ok markus@
+    
+    OpenBSD-Commit-ID: dc09e5f1950b7acc91b8fdf8015347782d2ecd3d
+
+commit 065064fcf455778b0918f783033b374d4ba37a92
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 25 22:49:38 2020 +0000
+
+    upstream: add a comment describing the ranges of channel IDs that
+    
+    we use; requested by markus@
+    
+    OpenBSD-Commit-ID: 83a1f09810ffa3a96a55fbe32675b34ba739e56b
+
+commit 69334996ae203c51c70bf01d414c918a44618f8e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 25 22:41:01 2020 +0000
+
+    upstream: make sshd_config:ClientAliveCountMax=0 disable the
+    
+    connection killing behaviour, rather than killing the connection after
+    sending the first liveness test probe (regardless of whether the client was
+    responsive) bz2627; ok markus
+    
+    OpenBSD-Commit-ID: 5af79c35f4c9fa280643b6852f524bfcd9bccdaf
+
+commit bf986a9e2792555e0879a3145fa18d2b49436c74
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 25 22:36:22 2020 +0000
+
+    upstream: clarify order of AllowUsers/DenyUsers vs
+    
+    AllowGroups/DenyGroups; bz1690, ok markus@
+    
+    OpenBSD-Commit-ID: 5637584ec30db9cf64822460f41b3e42c8f9facd
+
+commit 022ce92fa0daa9d78830baeb2bd2dc3f83c724ba
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 25 07:17:18 2020 +0000
+
+    upstream: when AddKeysToAgent=yes is set and the key contains no
+    
+    comment, add the key to the agent with the key's path as the comment. bz2564
+    
+    OpenBSD-Commit-ID: 8dd8ca9340d7017631a27f4ed5358a4cfddec16f
+
+commit 0b813436bbf6546638b10c1fa71f54691bcf5e63
+Author: tedu@openbsd.org <tedu@openbsd.org>
+Date:   Sat Jan 25 07:09:14 2020 +0000
+
+    upstream: group14-sha1 is no longer a default algorithm
+    
+    OpenBSD-Commit-ID: a96f04d5e9c2ff760c6799579dc44f69b4ff431d
+
+commit 3432b6e05d5c583c91c566c5708fed487cec79ac
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 25 07:02:51 2020 +0000
+
+    upstream: reword HashKnownHosts description a little more; some
+    
+    people found the wording confusing (bz#2560)
+    
+    OpenBSD-Commit-ID: ac30896598694f07d498828690aecd424c496988
+
+commit f80d7d6aa98d6eddc5df02412efee6db75673d4c
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 25 07:01:00 2020 +0000
+
+    upstream: weaken the language for what HashKnownHosts provides with
+    
+    regards to known_hosts name privacy, it's not practical for this option to
+    offer any guarantee that hostnames cannot be recovered from a disclosed
+    known_hosts file (e.g. by brute force).
+    
+    OpenBSD-Commit-ID: 13f1e3285f8acf7244e9770074296bcf446c6972
+
+commit 846446bf3e7421e6671a4afd074bdf15eecd7832
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 25 06:40:20 2020 +0000
+
+    upstream: the GatewayPorts vs -R listen address selection logic is
+    
+    still confusing people, so add another comment explaining the special
+    handling of "localhost"; bz#3258
+    
+    OpenBSD-Commit-ID: e6bf0f0fbf1c7092bf0dbd9c6eab105970b5b53a
+
+commit 734f2f83f5ff86f2967a99d67be9ce22dd0394dd
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 25 06:03:10 2020 +0000
+
+    upstream: mention that permitopen=/PermitOpen do no name to address
+    
+    translation; prompted by bz3099
+    
+    OpenBSD-Commit-ID: 0dda8e54d566b29855e76bebf9cfecce573f5c23
+
+commit e1e97cae19ff07b7a7f7e82556bc048c3c54af63
+Author: Damien Miller <djm@mindrot.org>
+Date:   Sat Jan 25 16:30:22 2020 +1100
+
+    include tunnel device path in error message
+
+commit 0ecd20bc9f0b9c7c697c9eb014613516c8f65834
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 25 04:48:26 2020 +0000
+
+    upstream: unrevert this:
+    
+    > revision 1.217
+    > date: 2019/11/27 03:34:04;  author: dtucker;  state: Exp;  lines: +5 -7;  commitid: wkiMn49XJyjzoJIs;
+    > Make channel_id u_int32_t and remove unnecessary check and cast that were
+    > left over from the type conversion.  Noted by t-hashida@amiya.co.jp in
+    > bz#3098, ok markus@ djm@
+    
+    Darren was right the first time; ok dtucker@ "agreed" markus@
+    
+    OpenBSD-Commit-ID: 641dd1b99a6bbd85b7160da462ae1be83432c7c8
+
+commit a0c81d2402eedc514b9c9f25ef9604eb0576b86a
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Sat Jan 25 02:57:53 2020 +0000
+
+    upstream: Move setting $NC into test-exec since it's now used by
+    
+    multiple tests, and in -portable we use our own local copy to avoid
+    portability problems.
+    
+    OpenBSD-Regress-ID: ceb78445fcaac317bec2fc51b3f0d9589048c114
+
+commit e16dfa94f86358033531c4a97dcb51508ef84d49
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Jan 25 13:05:42 2020 +1100
+
+    Put EC key export inside OPENSSL_HAS_ECC.
+    
+    Fixes link error when building against an OpenSSL that does not have
+    ECC.
+
+commit 94a2e5951b374e1a89761ceaff72e66eb1946807
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Sat Jan 25 00:27:56 2020 +0000
+
+    upstream: Wait a bit longer for the multiplex master to become ready
+    
+    since on very slow hosts the current delay is not sufficient and the test
+    will fail.
+    
+    OpenBSD-Regress-ID: 6d90c7475d67ac3a95610b64af700629ece51a48
+
+commit b2df804f571d77b07059f087b90955ffbc2f67d4
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Jan 24 10:08:17 2020 +0000
+
+    upstream: Add a connection test for proxycommand. This would have
+    
+    caught the problem caused by ssh.c rev 1.507 wherein Host and Hostname were
+    swapped.  Prompted by beck@
+    
+    OpenBSD-Regress-ID: d218500ae6aca4c479c27318fb5b09ebc00f7aae
+
+commit c6f06fd38a257b9fcc7d6760f8fb6d505dccb628
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 25 00:22:31 2020 +0000
+
+    upstream: set UpdateKnownHosts=ask by default; bz#2894; ok
+    
+    markus@
+    
+    OpenBSD-Commit-ID: f09cb3177f3a14c96428e14f347e976a8a531fee
+
+commit 7955633a554397bc24913cec9fd7285002935f7e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 25 00:21:08 2020 +0000
+
+    upstream: allow UpdateKnownHosts=yes to function when multiple
+    
+    known_hosts files are in use. When updating host keys, ssh will now search
+    subsequent known_hosts files, but will add new/changed host keys to the first
+    specified file only. bz#2738
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: 6ded6d878a03e57d5aa20bab9c31f92e929dbc6c
+
+commit e5a278a62ab49dffe96929fa8d8506c6928dba90
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 25 00:06:48 2020 +0000
+
+    upstream: process security key provider via realpath() in agent,
+    
+    avoids malicious client from being able to cause agent to load arbitrary
+    libraries into ssh-sk-helper.
+    
+    reported by puck AT puckipedia.com; ok markus
+    
+    OpenBSD-Commit-ID: 1086643df1b7eee4870825c687cf0c26a6145d1c
+
+commit 89a8d4525e8edd9958ed3df60cf683551142eae0
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 25 00:03:36 2020 +0000
+
+    upstream: expose PKCS#11 key labels/X.509 subjects as comments
+    
+    Extract the key label or X.509 subject string when PKCS#11 keys
+    are retrieved from the token and plumb this through to places where
+    it may be used as a comment.
+    
+    based on https://github.com/openssh/openssh-portable/pull/138
+    by Danielle Church
+    
+    feedback and ok markus@
+    
+    OpenBSD-Commit-ID: cae1fda10d9e10971dea29520916e27cfec7ca35
+
+commit a8c05c640873621681ab64d2e47a314592d5efa2
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jan 24 23:56:01 2020 +0000
+
+    upstream: tweak proctitle to include sshd arguments, as these are
+    
+    frequently used to distinguish between multiple independent instances of the
+    server. New proctitle looks like this:
+    
+    $ pgrep -lf sshd
+    12844 sshd: /usr/sbin/sshd -f /etc/ssh/sshd_config [listener] 0 of 10-100 startups
+    
+    requested by sthen@ and aja@; ok aja@
+    
+    OpenBSD-Commit-ID: cf235a561c655a3524a82003cf7244ecb48ccc1e
+
+commit 8075fccbd4f70a4371acabcfb47562471ff0de6f
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jan 24 23:54:40 2020 +0000
+
+    upstream: add xextendf() to extend a string with a format
+    
+    (reallocating as necessary). ok aja@ as part of a larger diff
+    
+    OpenBSD-Commit-ID: 30796b50d330b3e0e201747fe40cdf9aa70a77f9
+
+commit d15c8adf2c6f1a6b4845131074383eb9c3d05c3d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jan 24 05:33:01 2020 +0000
+
+    upstream: minor tweaks to ssh-keygen -Y find-principals:
+    
+    emit matched principals one per line to stdout rather than as comma-
+    separated and with a free-text preamble (easy confusion opportunity)
+    
+    emit "not found" error to stderr
+    
+    fix up argument testing for -Y operations and improve error message for
+    unsupported operations
+    
+    OpenBSD-Commit-ID: 3d9c9a671ab07fc04a48f543edfa85eae77da69c
+
+commit c3368a5d5ec368ef6bdf9971d6330ca0e3bdca06
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jan 24 00:28:57 2020 +0000
+
+    upstream: remove ssh-rsa (SHA1) from the list of allowed CA
+    
+    signature algorithms ok markus
+    
+    OpenBSD-Commit-ID: da3481fca8c81e6951f319a86b7be67502237f57
+
+commit 4a41d245d6b13bd3882c8dc058dbd2e2b39a9f67
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jan 24 00:27:04 2020 +0000
+
+    upstream: when signing a certificate with an RSA key, default to
+    
+    a safe signature algorithm (rsa-sha-512) if not is explicitly specified by
+    the user; ok markus@
+    
+    OpenBSD-Commit-ID: e05f638f0be6c0266e1d3d799716b461011e83a9
+
+commit 8dfb6a202c96cdf037c8ce05e53e32e0e0b7b454
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jan 24 00:00:31 2020 +0000
+
+    upstream: allow PEM export of DSA and ECDSA keys; bz3091, patch
+    
+    from Jakub Jelen ok markus@
+    
+    OpenBSD-Commit-ID: a58edec8b9f07acab4b962a71a5125830d321b51
+
+commit 72a8bea2d748c8bd7f076a8b39a52082c79ae95f
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Jan 23 23:31:52 2020 +0000
+
+    upstream: ssh-keygen -Y find-principals fixes based on feedback
+    
+    from Markus:
+    
+    use "principals" instead of principal, as allowed_signers lines may list
+    multiple.
+    
+    When the signing key is a certificate, emit only principals that match
+    the certificate principal list.
+    
+    NB. the command -Y name changes: "find-principal" => "find-principals"
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: ab575946ff9a55624cd4e811bfd338bf3b1d0faf
+
+commit 0585b5697201f5d8b32e6f1b0fee7e188268d30d
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Jan 24 01:29:23 2020 +0000
+
+    upstream: Do not warn about permissions on symlinks.
+    
+    OpenBSD-Regress-ID: 339d4cbae224bd8743ffad9c3afb0cf3cb66c357
+
+commit 415192348a5737a960f6d1b292a17b64d55b542c
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Jan 23 11:19:12 2020 +0000
+
+    upstream: Handle zlib compression being disabled now that it's
+    
+    optional.
+    
+    OpenBSD-Regress-ID: 0af4fbc5168e62f89d0350de524bff1cb00e707a
+
+commit fbce7c1a898ae75286349822950682cf46346121
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Jan 23 10:53:04 2020 +0000
+
+    upstream: Fix typo in comment.
+    
+    OpenBSD-Commit-ID: d1d7a6553208bf439378fd1cf686a828aceb353a
+
+commit ba247af8e9e302910e22881ef9d307a8afeef036
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Jan 23 10:19:59 2020 +0000
+
+    upstream: When checking for unsafe directories, ignore non-directories
+    
+    (ie symlinks, where permissions are not relevant).
+    
+    OpenBSD-Regress-ID: fb6cfc8b022becb62b2dcb99ed3f072b3326e501
+
+commit 74deb7029be4c00810443114aac9308875a81dae
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Jan 23 22:17:24 2020 +1100
+
+    zlib is now optional.
+
+commit 633a2af47ee90291aaf93969aeee1e5046074c7c
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Jan 23 22:16:51 2020 +1100
+
+    Plumb WITH_ZLIB into configure.
+    
+    This allows zlib support to be disabled by ./configure --without-zlib.
+
+commit 7f8e66fea8c4e2a910df9067cb7638999b7764d5
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Jan 23 10:24:29 2020 +0000
+
+    upstream: Make zlib optional. This adds a "ZLIB" build time option
+    
+    that allows building without zlib compression and associated options.  With
+    feedback from markus@, ok djm@
+    
+    OpenBSD-Commit-ID: 44c6e1133a90fd15a3aa865bdedc53bab28b7910
+
+commit 69ac4e33023b379e9a8e9b4b6aeeffa6d1fcf6fa
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Jan 23 07:54:04 2020 +0000
+
+    upstream: remove trailing period characters from pub/priv key
+    
+    pathnames - they make them needlessly more difficult to cut and paste without
+    error; ok markus@ & dtucker@
+    
+    OpenBSD-Commit-ID: abdcfd1a5723fcac0711feee7665edc66ae2335a
+
+commit 945bf52c3c815d95b1e842ebf6c910c3524bd5bb
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Jan 23 21:06:45 2020 +1100
+
+    Fix a couple of mysig_t leftovers.
+
+commit 84226b447d45fe4542613de68c2ca59a890d7c01
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Jan 23 18:55:24 2020 +1100
+
+    Remove mysignal wrapper.
+    
+    We switched the main code to use sigaction(), so the wrapper is no
+    longer used.
+
+commit 5533c2fb7ef21172fa3708d66b03faa2c6b3d93f
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Thu Jan 23 07:16:38 2020 +0000
+
+    upstream: new sentence, new line;
+    
+    OpenBSD-Commit-ID: b6c3f2f36ec77e99198619b38a9f146655281925
+
+commit 3bf2a6ac791d64046a537335a0f1d5e43579c5ad
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Jan 23 07:10:22 2020 +0000
+
+    upstream: Replace all calls to signal(2) with a wrapper around
+    
+    sigaction(2). This wrapper blocks all other signals during the handler
+    preventing races between handlers, and sets SA_RESTART which should reduce
+    the potential for short read/write operations.
+    
+    OpenBSD-Commit-ID: 5e047663fd77a40d7b07bdabe68529df51fd2519
+
+commit e027c044c796f3a01081a91bee55741204283f28
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Jan 23 04:54:34 2020 +0000
+
+    upstream: missing header change from previous; spotted by dtucker@
+    
+    OpenBSD-Commit-ID: 321ce74c0a5bbd0f02fa3f20cb5cf2a952c6b96f
+
+commit 7e1323102b1b04eef391b01e180710a2d408a7ab
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Jan 23 03:42:41 2020 +0000
+
+    upstream: Check for and warn about StrictModes permission problems. ok tb@
+    
+    OpenBSD-Regress-ID: 4841704ccdee50ee7efc6035bc686695c6ac2991
+
+commit 84de1c27f845d15c859db44e7070a46f45504b66
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Jan 23 03:35:07 2020 +0000
+
+    upstream: Also test PuTTY chacha20.
+    
+    OpenBSD-Regress-ID: 7af6a0e8763b05f1f8eee6bca5f31fcb16151040
+
+commit c7ed15a39695ecd5f1f21842d8d9cd22246d4ee2
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Jan 23 03:24:38 2020 +0000
+
+    upstream: Also test PuTTY ecdh kex methods.
+    
+    OpenBSD-Regress-ID: ec4017dce612131842398a03e93007a869c2c133
+
+commit c4b3a128954ee1b7fbcbda167baf8aca1a3d1c84
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Jan 23 02:46:49 2020 +0000
+
+    upstream: Remove unsupported algorithms from list of defaults at run
+    
+    time and remove ifdef and distinct settings for OPENSSL=no case.
+    
+    This will make things much simpler for -portable where the exact set
+    of algos depends on the configuration of both OpenSSH and the libcrypto
+    it's linked against (if any).  ok djm@
+    
+    OpenBSD-Commit-ID: e0116d0183dcafc7a9c40ba5fe9127805c5dfdd2
+
+commit 56cffcc09f8a2e661d2ba02e61364ae6f998b2b1
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Jan 23 02:43:48 2020 +0000
+
+    upstream: add a new signature operations "find-principal" to look
+    
+    up the principal associated with a signature from an allowed-signers file.
+    Work by Sebastian Kinne; ok dtucker@
+    
+    OpenBSD-Commit-ID: 6f782cc7e18e38fcfafa62af53246a1dcfe74e5d
+
+commit 65cf8730de6876a56595eef296e07a86c52534a6
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Wed Jan 22 07:38:30 2020 +0000
+
+    upstream: Ignore whitespace when checking explict fingerprint.
+    
+    When confirming a host key using the fingerprint itself, ignore leading and
+    trailing whitespace. ok deraadt@ djm@
+    
+    OpenBSD-Commit-ID: cafd7f803bbdcd40c3a8f8f1a77747e6b6d8c011
+
+commit 8d3af6ebdf524b34087a0a3ae415b5141ba10572
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Wed Jan 22 07:31:27 2020 +0000
+
+    upstream: Increase keyscan timeout from default. On slow hosts 3
+    
+    concurrent keyscans can hit the default 5 second timeout, so increase to 15
+    seconds.
+    
+    OpenBSD-Regress-ID: 16383dec166af369b7fb9948572856f5d544c93f
+
+commit 6c30c9adbeeed09a8a9e7a69974cfa1f1ddd1e9e
+Author: tedu@openbsd.org <tedu@openbsd.org>
+Date:   Wed Jan 22 04:58:23 2020 +0000
+
+    upstream: remove diffie-hellman-group14-sha1 from default kex to
+    
+    see what happens. general mostly ok
+    
+    OpenBSD-Commit-ID: 216b7b8462d2ef5f4531f26cb2cb839b2153dad9
+
+commit 4a32c0ca44a2dc2a358f69b5d43c08e528b44b39
+Author: claudio@openbsd.org <claudio@openbsd.org>
+Date:   Wed Jan 22 04:51:51 2020 +0000
+
+    upstream: For ssh-keygen -lF only add a space after key fingerprint
+    
+    when there is a comment. This makes copy-paste of fingerprints into ssh
+    easier. OK djm@
+    
+    OpenBSD-Commit-ID: fa01d95624f65c1eb4dc7c575d20d77c78010dfd
+
+commit 37d3b736506760e4ebc7fe56255f7b8ea823a00c
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Jan 22 04:49:16 2020 +0000
+
+    upstream: some __func__ and strerror(errno) here; no functional
+    
+    change
+    
+    OpenBSD-Commit-ID: 6c3ddd5f848b99ea560b31d3fba99ceed66cef37
+
+commit e2031b05c74c98b141179ceab13a323cf17d01e5
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Jan 22 02:25:21 2020 +0000
+
+    upstream: factor out parsing of allowed-signers lines
+    
+    OpenBSD-Commit-ID: 85ee6aeff608371826019ea85e55bfa87f79d06e
+
+commit 47160e1de8c2f638f0ef41cef42c976417b61778
+Author: Damien Miller <djm@mindrot.org>
+Date:   Wed Jan 22 10:30:13 2020 +1100
+
+    unbreak fuzzer support for recent ssh-sk.h changes
+
+commit 70d38c3cfd4550e8ee66cc3bf1b91aa339c91df5
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jan 21 22:39:57 2020 +0000
+
+    upstream: expose the number of currently-authenticating connections
+    
+    along with the MaxStartups limit in the proctitle; suggestion from Philipp
+    Marek, w/ feedback from Craig Miskell ok dtucker@
+    
+    OpenBSD-Commit-ID: a4a6db2dc1641a5df8eddf7d6652176e359dffb3
+
+commit a78c66d5d2144bd49779bc80a647346bd3d7233d
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date:   Tue Jan 21 12:40:04 2020 +0000
+
+    upstream: document the default value of the ControlPersist option;
+    
+    ok dtucker@ djm@
+    
+    OpenBSD-Commit-ID: 0788e7f2b5a9d4e36d3d2ab378f73329320fef66
+
+commit b46a6325849e40aa2e4b0d962a6f00f708f6576a
+Author: Damien Miller <djm@mindrot.org>
+Date:   Wed Jan 22 09:28:32 2020 +1100
+
+    remove accidental change in f8c11461
+
+commit 80d3bebcab96fe1d177e45906e10db16895da01d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jan 21 11:06:09 2020 +0000
+
+    upstream: don't #ifdef out the KRL code when compiling without
+    
+    libcrypto support; it works just fine and disabling it breaks a few tests. ok
+    dtucker@
+    
+    OpenBSD-Commit-ID: 65f6272c4241eb4b04de78b012fe98b2b555ad44
+
+commit f8c11461aa6db168fc5e7eeae448b4cbbf59642a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jan 21 08:06:27 2020 +0000
+
+    upstream: pass SSH_SK_HELPER explicitly past $SUDO to avoid it getting
+    
+    cleared; with dtucker@
+    
+    OpenBSD-Regress-ID: 03178a0580324bf0dff28f7eac6c3edbc5407f8e
+
+commit b5fcb0ac1cc0ef01aeec1c089146298654ab3ae0
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jan 21 07:07:31 2020 +0000
+
+    upstream: check access(ssh-sk-helper, X_OK) to provide friendly
+    
+    error message for misconfigured helper paths
+    
+    OpenBSD-Commit-ID: 061bcc262155d12e726305c91394ac0aaf1f8341
+
+commit 56bced43c14dc6fa2bfa1816007e441644105609
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Tue Jan 21 06:09:56 2020 +0000
+
+    upstream: Document sntrup4591761x25519-sha512@tinyssh.org. Patch
+    
+    from jtesta@positronsecurity.com via github PR#151.
+    
+    OpenBSD-Commit-ID: f3d48168623045c258245c340a5a2af7dbb74edc
+
+commit 4a05d789b86314fef7303824f69defbc6b96ed60
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jan 21 05:56:56 2020 +0000
+
+    upstream: fix ssh-keygen not displaying authenticator touch
+    
+    prompt; reported by jmc@
+    
+    OpenBSD-Commit-ID: 04d4f582fc194eb3897ebcbfe286c49958ba2859
+
+commit 881aded0389d999375f926051491a944c6d8752b
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jan 21 05:56:27 2020 +0000
+
+    upstream: a little more verbosity in sign_and_send_pubkey() debug
+    
+    messages
+    
+    OpenBSD-Commit-ID: 6da47a0e6373f6683006f49bc2a516d197655508
+
+commit b715fdc71bbd009d0caff691ab3fc04903c4aee8
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date:   Sat Jan 18 21:16:43 2020 +0000
+
+    upstream: one more replacement "(security) key" -> "(FIDO)
+    
+    authenticator"
+    
+    OpenBSD-Commit-ID: 031bca03c1d1f878ab929facd561911f1bc68dfd
+
+commit 84911da1beeb6ed258a43468efb316cd39fb6855
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date:   Sat Jan 18 15:45:41 2020 +0000
+
+    upstream: undo merge error and replace the term "security key"
+    
+    again
+    
+    OpenBSD-Commit-ID: 341749062c089cc360a7877e9ee3a887aecde395
+
+commit e8c06c4ee708720efec12cd1a6f78a3c6d76b7f0
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date:   Fri Jan 17 20:13:47 2020 +0000
+
+    upstream: Document loading of resident keys from a FIDO
+    
+    authenticator.
+    
+    * Rename -O to -K to keep "-O option" available.
+    * Document -K.
+    * Trim usage() message down to synopsis, like all other commands.
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: 015c2c4b28f8e19107adc80351b44b23bca4c78a
+
+commit 0d005d6372a067b59123dec8fc6dc905f2c09e1e
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date:   Tue Jan 14 15:07:30 2020 +0000
+
+    upstream: sync ssh-keygen.1 and ssh-keygen's usage() with each
+    
+    other and reality ok markus@
+    
+    OpenBSD-Commit-ID: cdf64454f2c3604c25977c944e5b6262a3bcce92
+
+commit b8a4ca2ebfddab862f7eb1ea2a07fb9f70330429
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date:   Sat Jan 11 16:23:10 2020 +0000
+
+    upstream: revise the fix for reversed arguments on
+    
+    expand_proxy_command()
+    
+    Always put 'host' before 'host_arg' for consistency.  ok markus@ djm@
+    
+    OpenBSD-Commit-ID: 1ba5b25472779f1b1957295fcc6907bb961472a3
+
+commit 57b181eaf2d34fd0a1b51ab30cb6983df784de5a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jan 10 23:43:26 2020 +0000
+
+    upstream: pass the log-on-stderr flag and log level through to
+    
+    ssh-sk-helper, making debugging a bit easier. ok markus@
+    
+    OpenBSD-Commit-ID: 2e7aea6bf5770d3f38b7c7bba891069256c5a49a
+
+commit a8bd5fdbdb7581afc7123a042a7cd6ca25357388
+Author: Damien Miller <djm@mindrot.org>
+Date:   Tue Jan 21 12:32:16 2020 +1100
+
+    Wrap copy_environment_blacklist() in #ifdef
+    
+    It's only needed for USE_PAM or HAVE_CYGWIN cases and will cause compiler
+    warnings otherwise.
+
+commit 10ecc647fc1db8d2dde9f6b9b826b201dfc48b62
+Author: Damien Miller <djm@mindrot.org>
+Date:   Tue Jan 21 12:20:05 2020 +1100
+
+    depend
+
+commit b3f7009c9ffa5891283ed96e043001e09934a8d4
+Author: Ruben Kerkhof <ruben@rubenkerkhof.com>
+Date:   Mon Jan 20 11:56:48 2020 +0100
+
+    Fix missing prototype warning for copy_environment
+    
+    This function is only used in this file, and only on Cygwin, so make
+    it static and hide it behind HAVE_CYGWIN.  Prevents missing prototype
+    warning.
+
+commit 0c428c0e991e2c4fabc48cf5d9b8f84c9412e0c3
+Author: Ruben Kerkhof <ruben@rubenkerkhof.com>
+Date:   Mon Jan 20 13:58:11 2020 +0100
+
+    configure.ac: fix ldns test
+    
+    When running ./configure --with-ldns, if ldns-config cannot be found, we
+    add -Iyes/include to CPPFLAGS and -Lyes/lib to LDFLAGS. Fix that.
+
+commit 6089abf715e2784751c9f62697e09bb103295b93
+Author: Ruben Kerkhof <ruben@rubenkerkhof.com>
+Date:   Mon Jan 20 12:13:26 2020 +0100
+
+    Make sshpam_password_change_required static.
+    
+    sshpam_password_change_required is only used in auth-pam.c, so make it
+    static to prevent a mising prototype warning.
+
+commit 5a9b9c82851b7bc219dc3a65962a80803c76c102
+Author: Ruben Kerkhof <ruben@rubenkerkhof.com>
+Date:   Mon Jan 20 12:24:51 2020 +0100
+
+    sandbox-darwin.c: fix missing prototypes.
+    
+    Include the right header just like the other sandbox files.
+    Fixes missing prototype warnings for ssh_sandbox_* functions.
+
+commit 335dc93526942a650f6c69666b3f6ca44d0a2910
+Author: Ruben Kerkhof <ruben@rubenkerkhof.com>
+Date:   Mon Jan 20 11:09:27 2020 +0100
+
+    Fix a few warnings when on Mac OS X.
+    
+    Include stdlib.h for calloc, malloc, free and setenv.
+
+commit 0488dc2d3050ea1a99ef5cf44afc50ffbf3f1315
+Author: Ruben Kerkhof <ruben@rubenkerkhof.com>
+Date:   Mon Jan 20 10:32:23 2020 +0100
+
+    Fix building without openssl.
+    
+    This fixes the following when there are no openssl headers on the system:
+    ssh-ecdsa-sk.c:34:10: fatal error: 'openssl/bn.h' file not found
+
+commit e6b7157b4ef29c83ec3a2d1d7c927e4b8898f9bb
+Author: Ruben Kerkhof <ruben@rubenkerkhof.com>
+Date:   Wed Jan 15 16:08:55 2020 +0100
+
+    Add config.log to .gitignore
+
+commit 515e10ddf9644010b88cfd7ecf601f4306d42232
+Author: Ruben Kerkhof <ruben@rubenkerkhof.com>
+Date:   Wed Jan 15 16:16:31 2020 +0100
+
+    Fix typo in README.md, s/crytpo/crypto/
+
+commit 1af3354aea3c4bfa5b5ecfb5d1ff3ad231c2073c
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Jan 15 16:22:36 2020 +1100
+
+    Wrap stdint.h in ifdef HAVE_STDINT_H.
+
+commit 429170f273ce1b0140f8111a45ba69390d98de3a
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Jan 14 14:41:47 2020 +1100
+
+    Wrap stdint.h inside HAVE_STDINT_H.
+
+commit a0989b60211b6f1c2313e1397c526d883a23a075
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Jan 14 14:26:41 2020 +1100
+
+    Include compat header for definitions.
+
+commit e0cedcad51fe02683943bf4f1ad2961aa3f35313
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Jan 14 09:42:52 2020 +1100
+
+    Improve search for 'struct timespec'.
+    
+    Make struct timespec test consistent with existing timeval test.
+    Include time.h for timespec in compat header where required.
+
+commit acaf9e058594310001ce64468ed2923dc6323e81
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Jan 14 12:43:03 2020 +1100
+
+    Update depend to remove rmd160.h.
+
+commit 26b2675b0c3e3efea11a52609073aec01736ec84
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Jan 14 07:24:46 2020 +1100
+
+    Remove configure test & compat code for ripemd160.
+    
+    RIPEMD160 support was removed upstream in 2017, however we still had
+    a configure test and compat code for it, so clean those up now.
+
+commit ed3ad71b17adcd1fb4431d145f53cee1c6a1135e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Jan 9 03:28:38 2020 +0000
+
+    upstream: fix reversed arguments on expand_proxy_command(); spotted
+    
+    by anton@
+    
+    OpenBSD-Commit-ID: db1c32478a01dfbc9c4db171de0f25907bea5775
+
+commit cd53476383f0cf475f40ba8ac8deb6b76dd5ce4e
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Mon Jan 6 07:43:28 2020 +0000
+
+    upstream: put the fido options in a list, and tidy up the text a
+    
+    little; ok djm
+    
+    OpenBSD-Commit-ID: 491ce15ae52a88b7a6a2b3b6708a14b4aacdeebb
+
+commit 30f704ebc0e9e32b3d12f5d9e8c1b705fdde2c89
+Author: Jeremy Drake <github@jdrake.com>
+Date:   Fri Oct 11 18:31:05 2019 -0700
+
+    Deny (non-fatal) ipc in preauth privsep child.
+    
+    As noted in openssh/openssh-portable#149, i386 does not have have
+    _NR_shmget etc.  Instead, it has a single ipc syscall (see man 2 ipc,
+    https://linux.die.net/man/2/ipc).  Add this syscall, if present, to the
+    list of syscalls that seccomp will deny non-fatally.
+
+commit b110cefdfbf5a20f49b774a55062d6ded2fb6e22
+Author: Khem Raj <raj.khem@gmail.com>
+Date:   Tue Jan 7 16:26:45 2020 -0800
+
+    seccomp: Allow clock_gettime64() in sandbox.
+    
+    This helps sshd accept connections on mips platforms with
+    upcoming glibc ( 2.31 )
+
+commit 3cc60c899a92a469e5118310ba6b74cb57215618
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 6 02:39:30 2020 +0000
+
+    upstream: missing else in check_enroll_options()
+    
+    OpenBSD-Commit-ID: e058fb918fda56ddbbf0bee910101004cec421d4
+
+commit ff5784e2698d6c41e9f39ce4df24968c1beeb2bb
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 6 02:24:28 2020 +0000
+
+    upstream: fix error message
+    
+    OpenBSD-Commit-ID: 1eb52025658eb78ea6223181e552862198d3d505
+
+commit dd2acc8b862c09751621995fba2d5fa6f4e24cc9
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 6 02:07:50 2020 +0000
+
+    upstream: adapt sk-dummy to SK API changes
+    
+    also, make it pull prototypes directly from sk-api.c and #error
+    if the expected version changes. This will make any future regress
+    test breakage because of SK API changes much more apparent
+    
+    OpenBSD-Regress-ID: 79b07055de4feb988e31da71a89051ad5969829d
+
+commit c312ca077cd2a6c15545cd6b4d34ee2f69289174
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 6 02:00:46 2020 +0000
+
+    upstream: Extends the SK API to accept a set of key/value options
+    
+    for all operations. These are intended to future-proof the API a little by
+    making it easier to specify additional fields for without having to change
+    the API version for each.
+    
+    At present, only two options are defined: one to explicitly specify
+    the device for an operation (rather than accepting the middleware's
+    autoselection) and another to specify the FIDO2 username that may
+    be used when generating a resident key. These new options may be
+    invoked at key generation time via ssh-keygen -O
+    
+    This also implements a suggestion from Markus to avoid "int" in favour
+    of uint32_t for the algorithm argument in the API, to make implementation
+    of ssh-sk-client/helper a little easier.
+    
+    feedback, fixes and ok markus@
+    
+    OpenBSD-Commit-ID: 973ce11704609022ab36abbdeb6bc23c8001eabc
+
+commit 2ab335712d084d9ccaf3f53afc3fa9535329da87
+Author: beck@openbsd.org <beck@openbsd.org>
+Date:   Sun Jan 5 16:28:22 2020 +0000
+
+    upstream: fix CanonicalizeHostname, broken by rev 1.507
+    
+    Issue noticed and reported by Pierre-Olivier Martel <pom@apple.com>
+    ok dtucker@ markus@ djm@
+    
+    OpenBSD-Commit-ID: 749f3168ec520609c35b0c4e1984e5fa47f16094
+
+commit 69e44ba701b90b0f530d64c3fe4363ea86e50cd3
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Jan 6 09:02:53 2020 +1100
+
+    Fix typo: 'you' -> 'your'.
+    
+    bz#3108 from jmckitrick@gmail.com.
+
+commit 7652a57662969bd5c61448b3843ec6d407ad12be
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Jan 6 08:56:46 2020 +1100
+
+    Remove auth-skey.c.
+    
+    S/Key support was removed in OpenSSH 7.8 but this file was missed.
+
+commit c593cc5e826c9f4ec506e22b629d37cabfaacff9
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Fri Jan 3 07:33:33 2020 +0000
+
+    upstream: the download resident keys option is -K (upper) not -k
+    
+    (lower); ok djm
+    
+    OpenBSD-Commit-ID: 71dc28a3e1fa7c553844abc508845bcf5766e091
+
+commit ff31f15773ee173502eec4d7861ec56f26bba381
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jan 3 03:02:26 2020 +0000
+
+    upstream: what bozo decided to use 2020 as a future date in a regress
+    
+    test?
+    
+    OpenBSD-Regress-ID: 3b953df5a7e14081ff6cf495d4e8d40e153cbc3a
+
+commit 680eb7749a39d0e4d046e66cac4e51e8e3640b75
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jan 3 02:46:19 2020 +0000
+
+    upstream: implement recent SK API change to support resident keys
+    
+    and PIN prompting in the dummy middleware that we use for the tests. Should
+    fix breakage spotted by dtucker@
+    
+    OpenBSD-Regress-ID: 379cf9eabfea57aaf7f3f59dafde59889566c484
+
+commit 86834fe6b54ac57b8528c30cf0b27e5cac5b7af7
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Jan 2 13:25:38 2020 +0000
+
+    upstream: Update keygen moduli screen test to match recent command
+    
+    line option change to ssh-keygen(1).
+    
+    OpenBSD-Regress-ID: 744a72755004377e9669b662c13c6aa9ead8a0c3
+
+commit 9039971887cccd95b209c479296f772a3a93e8e7
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Jan 2 22:40:09 2020 +0000
+
+    upstream: ability to download FIDO2 resident keys from a token via
+    
+    "ssh-keygen -K". This will save public/private keys into the current
+    directory.
+    
+    This is handy if you move a token between hosts.
+    
+    feedback & ok markus@
+    
+    OpenBSD-Commit-ID: d57c1f9802f7850f00a117a1d36682a6c6d10da6
+
+commit 878ba4350d57e905d6bb1865d8ff31bdfe5deab4
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Jan 2 22:38:33 2020 +0000
+
+    upstream: add sshkey_save_public(), to save a public key; ok
+    
+    markus@
+    
+    OpenBSD-Commit-ID: 5d6f96a966d10d7fa689ff9aa9e1d6767ad5a076
+
+commit 3b1382ffd5e71eff78db8cef0f3cada22ff29409
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Mon Dec 30 16:10:00 2019 +0000
+
+    upstream: simplify the list for moduli options - no need for
+    
+    -compact;
+    
+    OpenBSD-Commit-ID: 6492c72280482c6d072be46236b365cb359fc280
+
+commit 0248ec7c763dee9ff730a589e3d166eac5c74d7c
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Jan 2 13:41:31 2020 +1100
+
+    ssh-sk-null.cc needs extern "C" {}
+
+commit 5ca4b414effe4b56f0cfe3058c92391aa8a43871
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Jan 2 10:56:29 2020 +1100
+
+    add dummy ssh-sk API for linking with fuzzers
+
+commit c4b2664be7ba25e4c233315b25212dec29b727ab
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Dec 30 21:04:09 2019 +1100
+
+    refresh depend
+
+commit 3093d12ff80927cf45da08d9f262a26680fb14ee
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Dec 30 09:49:52 2019 +0000
+
+    upstream: Remove the -x option currently used for
+    
+    FIDO/U2F-specific key flags. Instead these flags may be specified via -O.
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: f23ebde2a8a7e1bf860a51055a711cffb8c328c1
+
+commit ef65e7dbaa8fac3245aa2bfc9f7e09be7cba0d9d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Dec 30 09:25:29 2019 +0000
+
+    upstream: document SK API changes in PROTOCOL.u2f
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: 52622363c103a3c4d3d546050480ffe978a32186
+
+commit 43ce96427b76c4918e39af654e2fc9ee18d5d478
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Dec 30 09:24:45 2019 +0000
+
+    upstream: translate and return error codes; retry on bad PIN
+    
+    Define some well-known error codes in the SK API and pass
+    them back via ssh-sk-helper.
+    
+    Use the new "wrong PIN" error code to retry PIN prompting during
+    ssh-keygen of resident keys.
+    
+    feedback and ok markus@
+    
+    OpenBSD-Commit-ID: 9663c6a2bb7a0bc8deaccc6c30d9a2983b481620
+
+commit d433596736a2cd4818f538be11fc94783f5c5236
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Dec 30 09:24:03 2019 +0000
+
+    upstream: improve some error messages; ok markus@
+    
+    OpenBSD-Commit-ID: 4ccd8ddabb8df4f995107dd3b7ea58220e93cb81
+
+commit c54cd1892c3e7f268b21e1f07ada9f0d9816ffc0
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Dec 30 09:23:28 2019 +0000
+
+    upstream: SK API and sk-helper error/PIN passing
+    
+    Allow passing a PIN via the SK API (API major crank) and let the
+    ssh-sk-helper API follow.
+    
+    Also enhance the ssh-sk-helper API to support passing back an error
+    code instead of a complete reply. Will be used to signal "wrong PIN",
+    etc.
+    
+    feedback and ok markus@
+    
+    OpenBSD-Commit-ID: a1bd6b0a2421646919a0c139b8183ad76d28fb71
+
+commit 79fe22d9bc2868c5118f032ec1200ac9c2e3aaef
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Dec 30 09:22:49 2019 +0000
+
+    upstream: implement loading resident keys in ssh-add
+    
+    "ssh-add -O" will load resident keys from a FIDO2 token and add them
+    to a ssh-agent.
+    
+    feedback and ok markus@
+    
+    OpenBSD-Commit-ID: 608104ae957a7d65cb84e0a3a26c8f60e0df3290
+
+commit 27753a8e21887d47fe6b5c78a4aed0efe558a850
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Dec 30 09:21:59 2019 +0000
+
+    upstream: implement loading of resident keys in ssh-sk-helper
+    
+    feedback and ok markus@
+    
+    OpenBSD-Commit-ID: b273c23769ea182c55c4a7b8f9cbd9181722011a
+
+commit 14cea36df397677b8f8568204300ef654114fd76
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Dec 30 09:21:16 2019 +0000
+
+    upstream: resident keys support in SK API
+    
+    Adds a sk_load_resident_keys() function to the security key
+    API that accepts a security key provider and a PIN and returns
+    a list of keys.
+    
+    Implement support for this in the usbhid middleware.
+    
+    feedback and ok markus@
+    
+    OpenBSD-Commit-ID: 67e984e4e87f4999ce447a6178c4249a9174eff0
+
+commit 2fe05fcb4a2695f190b4fcf27770b655586ab349
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Dec 30 09:20:36 2019 +0000
+
+    upstream: Factor out parsing of struct sk_enroll_response
+    
+    We'll reuse this for extracting resident keys from a device.
+    
+    feedback and ok markus@
+    
+    OpenBSD-Commit-ID: 9bc1efd9c6897eac4df0983746cf6578c1542273
+
+commit 4532bd01d57ee13c3ca881eceac1bf9da96a4d7e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Dec 30 09:19:52 2019 +0000
+
+    upstream: basic support for generating FIDO2 resident keys
+    
+    "ssh-keygen -t ecdsa-sk|ed25519-sk -x resident" will generate a
+    device-resident key.
+    
+    feedback and ok markus@
+    
+    OpenBSD-Commit-ID: 8e1b3c56a4b11d85047bd6c6c705b7eef4d58431
+
+commit 3e60d18fba1b502c21d64fc7e81d80bcd08a2092
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Dec 30 03:30:09 2019 +0000
+
+    upstream: remove single-letter flags for moduli options
+    
+    Move all moduli generation options to live under the -O flag.
+    
+    Frees up seven single-letter flags.
+    
+    NB. this change break existing ssh-keygen commandline syntax for moduli-
+    related operations. Very few people use these fortunately.
+    
+    feedback and ok markus@
+    
+    OpenBSD-Commit-ID: d498f3eaf28128484826a4fcb343612764927935
+
+commit 1e645fe767f27725dc7fd7864526de34683f7daf
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Dec 30 03:28:41 2019 +0000
+
+    upstream: prepare for use of ssh-keygen -O flag beyond certs
+    
+    Move list of available certificate options in ssh-keygen.1 to the
+    CERTIFICATES section.
+    
+    Collect options specified by -O but delay parsing/validation of
+    certificate options until we're sure that we're acting as a CA.
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: 33e6bcc29cfca43606f6fa09bd84b955ee3a4106
+
+commit 20ccd854245c598e2b47cc9f8d4955d645195055
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Fri Dec 27 08:28:44 2019 +0000
+
+    upstream: sort -Y internally in the options list, as is already
+    
+    done in synopsis;
+    
+    OpenBSD-Commit-ID: 86d033c5764404057616690d7be992e445b42274
+
+commit 5b6c954751dd3677466cda7adb92e4f05446c96c
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Fri Dec 27 08:25:07 2019 +0000
+
+    upstream: in the options list, sort -Y and -y;
+    
+    OpenBSD-Commit-ID: 24c2e6a3aeab6e050a0271ffc73fdff91c10dcaa
+
+commit 141df487ba699cfd1ec3dcd98186e7c956e99024
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date:   Sat Dec 21 20:22:34 2019 +0000
+
+    upstream: Replace the term "security key" with "(FIDO)
+    
+    authenticator".
+    
+    The polysemous use of "key" was too confusing.  Input from markus@.
+    ok jmc@
+    
+    OpenBSD-Commit-ID: 12eea973a44c8232af89f86e4269d71ae900ca8f
+
+commit fbd9729d4eadf2f7097b6017156387ac64302453
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Dec 21 02:33:07 2019 +0000
+
+    upstream: unit tests for ForwardAgent=/path; from Eric Chiang
+    
+    OpenBSD-Regress-ID: 24f693f78290b2c17725dab2c614dffe4a88c8da
+
+commit e5b7cf8edca7e843adc125621e1dab14507f430a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Dec 16 02:39:05 2019 +0000
+
+    upstream: test security key host keys in addition to user keys
+    
+    OpenBSD-Regress-ID: 9fb45326106669a27e4bf150575c321806e275b1
+
+commit 40be78f503277bd91c958fa25ea9ef918a2ffd3d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Dec 21 02:19:13 2019 +0000
+
+    upstream: Allow forwarding a different agent socket to the path
+    
+    specified by $SSH_AUTH_SOCK, by extending the existing ForwardAgent option to
+    accepting an explicit path or the name of an environment variable in addition
+    to yes/no.
+    
+    Patch by Eric Chiang, manpage by me; ok markus@
+    
+    OpenBSD-Commit-ID: 98f2ed80bf34ea54d8b2ddd19ac14ebbf40e9265
+
+commit 416f15372bfb5be1709a0ad1d00ef5d8ebfb9e0e
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date:   Fri Dec 20 20:28:55 2019 +0000
+
+    upstream: SSH U2F keys can now be used as host keys. Fix a garden
+    
+    path sentence. ok markus@
+    
+    OpenBSD-Commit-ID: 67d7971ca1a020acd6c151426c54bd29d784bd6b
+
+commit 68010acbcfe36167b3eece3115f3a502535f80df
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Dec 20 02:42:42 2019 +0000
+
+    upstream: Move always unsupported keywords to be grouped with the other
+    
+    ones. Move oSecurityProvider to match the order in the OpCodes enum. Patch
+    from openbsd@academicsolutions.ch, ok djm@
+    
+    OpenBSD-Commit-ID: 061e4505861ec1e02ba3a63e3d1b3be3cad458ec
+
+commit 8784b02dc49e1c98df4e7aca466be2f652ed4ad1
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Dec 20 02:29:21 2019 +0000
+
+    upstream: Remove obsolete opcodes from the configuation enum.
+    
+    Patch from openbsd@academicsolutions.ch, ok djm@
+    
+    OpenBSD-Commit-ID: 395c202228872ce8d9044cc08552ac969f51e01b
+
+commit 345be6091bdc9be09c90a937d1320f97c01fab2a
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Dec 20 02:11:38 2019 +0000
+
+    upstream: Remove now-obsolete config options from example in
+    
+    comment.  Patch from openbsd@academicsolutions.ch, ok djm@
+    
+    OpenBSD-Commit-ID: 35862beb0927b1cb0af476ec23cc07f6e3006101
+
+commit ae024b22c4fd68e7f39681d605585889f9511108
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date:   Thu Dec 19 15:09:30 2019 +0000
+
+    upstream: Document that security key-hosted keys can act as host
+    
+    keys.
+    
+    Update the list of default host key algorithms in ssh_config.5 and
+    sshd_config.5.  Copy the description of the SecurityKeyProvider
+    option to sshd_config.5.
+    
+    ok jmc@
+    
+    OpenBSD-Commit-ID: edadf3566ab5e94582df4377fee3b8b702c7eca0
+
+commit bc2dc091e0ac4ff6245c43a61ebe12c7e9ea0b7f
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Dec 19 03:50:01 2019 +0000
+
+    upstream: "Forward security" -> "Forward secrecy" since that's the
+    
+    correct term. Add "MAC" since we use that acronym in other man pages.  ok
+    naddy@
+    
+    OpenBSD-Commit-ID: c35529e511788586725fb63bda3459e10738c5f5
+
+commit e905f7260d72bc0e33ef5f10a0db737ff6e77ba7
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date:   Tue Dec 17 16:21:07 2019 +0000
+
+    upstream: cut obsolete lists of crypto algorithms from outline of
+    
+    how SSH works ok markus@ jmc@
+    
+    OpenBSD-Commit-ID: 8e34973f232ab48c4d4f5d07df48d501708b9160
+
+commit f65cf1163ff01531ae02f3f9210391d0d692f699
+Author: tobhe@openbsd.org <tobhe@openbsd.org>
+Date:   Mon Dec 16 13:58:53 2019 +0000
+
+    upstream: strdup may return NULL if memory allocation fails. Use
+    
+    the safer xstrdup which fatals on allocation failures.
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: 8b608d387120630753cbcb8110e0b019c0c9a0d0
+
+commit 57634bfc5708477826c0be265ddc59b9d83e4886
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Dec 16 03:16:58 2019 +0000
+
+    upstream: sort sk-* methods behind their plain key methods cousins
+    
+    for now
+    
+    OpenBSD-Commit-ID: c97e22c2b28c0d12ee389b8b4ef5f2ada7908828
+
+commit b8df8fe920e697edcc69c520390b78c3b7ad9d84
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Dec 17 19:46:15 2019 +1100
+
+    Mac OS X has PAM too.
+
+commit bf8de8b8251af69b5ce96a8faa69145af156af4d
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Dec 17 19:37:06 2019 +1100
+
+    Show portable tarball pattern in example.
+
+commit a19ef613e98141cc37c8acdeebe285b9dbe2531e
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Dec 17 19:35:59 2019 +1100
+
+    OpenSSL is now optional.
+
+commit 1a7217ac063e48cf0082895aeee81ed2b8a57191
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Dec 15 18:58:33 2019 +0000
+
+    upstream: adapt to ssh-sk-client change
+    
+    OpenBSD-Regress-ID: 40481999a5928d635ab2e5b029e8239c112005ea
+
+commit a7fc1df246e80bfdabd09b069b91c72f9c578ca8
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Dec 11 18:47:14 2019 +0000
+
+    upstream: it's no longer possible to disable privilege separation
+    
+    in sshd, so don't double the tests' work by trying both off/on
+    
+    OpenBSD-Regress-ID: d366665466dbd09e9b707305da884be3e7619c68
+
+commit 3145d38ea06820a66c0f5e068f49af14fd2b7ac1
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Dec 15 20:59:23 2019 +0000
+
+    upstream: don't treat HostKeyAgent=none as a path either; avoids
+    
+    spurious warnings from the cfgparse regress test
+    
+    OpenBSD-Commit-ID: ba49ea7a5c92b8a16cb9c2e975dbb163853afc54
+
+commit 747e25192f436e71dd39e15d65aa32bca967533a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Dec 15 20:57:15 2019 +0000
+
+    upstream: do not attempt to find an absolute path for sshd_config
+    
+    SecurityKeyProvider=internal - unbreaks cfgparse regress test
+    
+    OpenBSD-Commit-ID: d2ddcf525c0dc3c8339522360c10b3c70f1fd641
+
+commit 9b6e30b96b094ad787511a5b989253e3b8fe1789
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Dec 15 19:47:10 2019 +0000
+
+    upstream: allow ssh-keyscan to find security key hostkeys
+    
+    OpenBSD-Commit-ID: 1fe822a7f714df19a7e7184e3a3bbfbf546811d3
+
+commit 56584cce75f3d20aaa30befc7cbd331d922927f3
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Dec 15 18:57:30 2019 +0000
+
+    upstream: allow security keys to act as host keys as well as user
+    
+    keys.
+    
+    Previously we didn't do this because we didn't want to expose
+    the attack surface presented by USB and FIDO protocol handling,
+    but now that this is insulated behind ssh-sk-helper there is
+    less risk.
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: 77b068dd133b8d87e0f010987bd5131e640ee64c
+
+commit 5af6fd5461bb709304e6979c8b7856c7af921c9e
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Dec 16 13:55:56 2019 +1100
+
+    Allow clock_nanosleep_time64 in seccomp sandbox.
+    
+    Needed on Linux ARM.  bz#3100, patch from jjelen@redhat.com.
+
+commit fff8ff6dd580e1a72ba09a6775d185175cdc8d13
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sun Dec 15 18:27:02 2019 +1100
+
+    Put SK ECDSA bits inside ifdef OPENSSL_HAS_ECC.
+    
+    Fixes build when linking against OpenSSLs built with no-ec.
+
+commit 9244990ecdcfa36bb9371058111685b05f201c1e
+Author: Damien Miller <djm@mindrot.org>
+Date:   Sat Dec 14 09:21:46 2019 +1100
+
+    remove a bunch of ENABLE_SK #ifdefs
+    
+    The ssh-sk-helper client API gives us a nice place to disable
+    security key support when it is wasn't enabled at compile time,
+    so we don't need to check everywere.
+    
+    Also, verification of security key signatures can remain enabled
+    all the time - it has no additional dependencies. So sshd can
+    accept security key pubkeys in authorized_keys, etc regardless of
+    the host's support for dlopen, etc.
+
+commit a33ab1688b5c460a7e2a301418241ce1b13b2638
+Author: Damien Miller <djm@mindrot.org>
+Date:   Sat Dec 14 09:15:06 2019 +1100
+
+    ssh-sk-client.c needs includes.h
+
+commit 633778d567ad50b63d2a3bca5e1b97d279d236d9
+Author: Damien Miller <djm@mindrot.org>
+Date:   Sat Dec 14 08:40:33 2019 +1100
+
+    only link ssh-sk-helper against libfido2
+
+commit 7b47b40b170db4d6f41da0479575f6d99dd7228a
+Author: Damien Miller <djm@mindrot.org>
+Date:   Sat Dec 14 08:20:52 2019 +1100
+
+    adapt Makefile to ssh-sk-client everywhere
+
+commit f45f3a8a12e2bee601046b916e6c5cd6eae08048
+Author: Damien Miller <djm@mindrot.org>
+Date:   Sat Dec 14 07:53:11 2019 +1100
+
+    fixup
+
+commit d21434766764d5babf99fc3937c19b625c0f6334
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Dec 13 20:16:56 2019 +0000
+
+    upstream: actually commit the ssh-sk-helper client code; ok markus
+    
+    OpenBSD-Commit-ID: fd2ea776a5bbbf4d452989d3c3054cf25a5e0589
+
+commit 611073fb40ecaf4ac65094e403edea3a08deb700
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Dec 13 19:11:14 2019 +0000
+
+    upstream: perform security key enrollment via ssh-sk-helper too.
+    
+    This means that ssh-keygen no longer needs to link against ssh-sk-helper, and
+    only ssh-sk-helper needs libfido2 and /dev/uhid* access;
+    
+    feedback & ok markus@
+    
+    OpenBSD-Commit-ID: 9464233fab95708d2ff059f8bee29c0d1f270800
+
+commit 612b1dd1ec91ffb1e01f58cca0c6eb1d47bf4423
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Dec 13 19:09:37 2019 +0000
+
+    upstream: allow sshbuf_put_stringb(buf, NULL); ok markus@
+    
+    OpenBSD-Commit-ID: 91482c1ada9adb283165d48dafbb88ae91c657bd
+
+commit b52ec0ba3983859514aa7b57d6100fa9759fe696
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Dec 13 19:09:10 2019 +0000
+
+    upstream: use ssh-sk-helper for all security key signing operations
+    
+    This extracts and refactors the client interface for ssh-sk-helper
+    from ssh-agent and generalises it for use by the other programs.
+    This means that most OpenSSH tools no longer need to link against
+    libfido2 or directly interact with /dev/uhid*
+    
+    requested by, feedback and ok markus@
+    
+    OpenBSD-Commit-ID: 1abcd3aea9a7460eccfbf8ca154cdfa62f1dc93f
+
+commit c33d46868c3d88e04a92610cdb429094aeeb5847
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Dec 11 22:19:47 2019 +0000
+
+    upstream: add a note about the 'extensions' field in the signed
+    
+    object
+    
+    OpenBSD-Commit-ID: 67c01e0565b258e0818c1ccfe1f1aeaf9a0d4c7b
+
+commit a62f4e1960691f3aeb1f972e009788b29e2ae464
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Dec 10 23:37:31 2019 +0000
+
+    upstream: some more corrections for documentation problems spotted
+    
+    by Ron Frederick
+    
+    document certifiate private key format
+    correct flags type for sk-ssh-ed25519@openssh.com keys
+    
+    OpenBSD-Commit-ID: fc4e9a1ed7f9f7f9dd83e2e2c59327912e933e74
+
+commit 22d4beb79622fc82d7111ac941269861fc7aef8d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Dec 10 23:21:56 2019 +0000
+
+    upstream: loading security keys into ssh-agent used the extension
+    
+    constraint "sk-provider@openssh.com", not "sk@openssh.com"; spotted by Ron
+    Frederick
+    
+    OpenBSD-Commit-ID: dbfba09edbe023abadd5f59c1492df9073b0e51d
+
+commit 75f7f22a43799f6d25dffd9d6683de1601da05a3
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Dec 10 22:43:19 2019 +0000
+
+    upstream: add security key types to list of keys allowed to act as
+    
+    CAs; spotted by Ron Frederick
+    
+    OpenBSD-Commit-ID: 9bb0dfff927b4f7aa70679f983f84c69d45656c3
+
+commit 516605f2d596884cedc2beed6b262716ec76f63d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Dec 10 22:37:20 2019 +0000
+
+    upstream: when acting as a CA and using a security key as the CA
+    
+    key, remind the user to touch they key to authorise the signature.
+    
+    OpenBSD-Commit-ID: fe58733edd367362f9766b526a8b56827cc439c1
+
+commit c4036fe75ea5a4d03a2a40be1f3660dcbbfa01b2
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Dec 10 22:36:08 2019 +0000
+
+    upstream: chop some unnecessary and confusing verbiage from the
+    
+    security key protocol description; feedback from Ron Frederick
+    
+    OpenBSD-Commit-ID: 048c9483027fbf9c995e5a51b3ac502989085a42
+
+commit 59175a350fe1091af7528b2971e3273aa7ca7295
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Dec 6 03:06:08 2019 +0000
+
+    upstream: fix setting of $SSH_ASKPASS_PROMPT - it shouldn't be set
+    
+    when asking passphrases, only when confirming the use of a key (i.e. for
+    ssh-agent keys added with "ssh-add -c keyfile")
+    
+    OpenBSD-Commit-ID: 6643c82960d9427d5972eb702c917b3b838ecf89
+
+commit 36eaa356d391a23a2d4e3a8aaa0223abc70b9822
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Dec 6 02:55:21 2019 +0000
+
+    upstream: bring the __func__
+    
+    OpenBSD-Commit-ID: 71a3a45b0fe1b8f680ff95cf264aa81f7abbff67
+
+commit 483cc723d1ff3b7fdafc6239348040a608ebc78d
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Sat Nov 30 07:07:59 2019 +0000
+
+    upstream: tweak the Nd lines for a bit of consistency; ok markus
+    
+    OpenBSD-Commit-ID: 876651bdde06bc1e72dd4bd7ad599f42a6ce5a16
+
+commit afffd310360b155df2133d1f5f1ab2f4e939b570
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Dec 11 13:22:06 2019 +1100
+
+    Check if memmem is declared in system headers.
+    
+    If the system (or one of the dependencies) implements memmem but does
+    not define the header, we would not declare it either resulting in
+    compiler warnings.  Check for declaration explicitly.  bz#3102.
+
+commit ad8cd420797695f3b580aea1034b9de60bede9b9
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Dec 11 13:12:01 2019 +1100
+
+    Sort depends.
+
+commit 5e3abff39e01817f6866494416f2ada25c316018
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Dec 11 13:09:34 2019 +1100
+
+    Sort .depend when rebuilding.
+    
+    This makes diffs more stable between makedepend implementations.
+
+commit 5df9d1f5c0943367d9b68435f4c82224ce11a73f
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Dec 11 13:06:43 2019 +1100
+
+    Update depend to include sk files.
+
+commit 9a967c5bbfca35835165f7d8a6165009f5b21872
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Dec 9 20:25:26 2019 +1100
+
+    Describe how to build libcrypto as PIC.
+    
+    While there, move the OpenSSL 1.1.0g caveat closer to the other version
+    information.
+
+commit b66fa5da25c4b5b67cf9f0ce7af513f5a6a6a686
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Dec 9 17:23:22 2019 +1100
+
+    Recommend running LibreSSL or OpenSSL self-tests.
+
+commit fa7924008e838cded7e8a561356ffe5e06e0ed64
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Dec 6 14:17:26 2019 +1100
+
+    Wrap ECC specific bits in ifdef.
+    
+    Fixes tests when built against an OpenSSL configured with no-ec.
+
+commit 2ff822eabd7d4461743f22d3b9ba35ab76069df5
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Nov 29 20:21:36 2019 +1100
+
+    Wrap sha2.h include in ifdef.
+    
+    Fixes build --without-openssl on at least Fedora.
+
+commit 443848155ffcda65a6077aac118c861b503a093f
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Nov 29 15:10:21 2019 +1100
+
+    compile sk-dummy.so with no-PIE version of LDFLAGS
+    
+    This lets it pick up the -L path to libcrypto for example.
+
+commit 37f5b5346e4cc6a894245aa89d2930649bb7045b
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Nov 29 14:48:46 2019 +1100
+
+    includes.h for sk-dummy.c, dummy
+
+commit b218055e59a7c1a1816f7a55ca18e3f3c05d63a4
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Nov 29 12:32:23 2019 +1100
+
+    (yet) another x-platform fix for sk-dummy.so
+    
+    Check for -fPIC support from compiler
+    
+    Compile libopenbsd-compat -fPIC
+    
+    Don't mix -fPIE and -fPIC when compiling
+
+commit 0dedb703adcd98d0dbc4479f5f312a2bd3df2850
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Nov 29 11:53:57 2019 +1100
+
+    needs includes.h for WITH_OPENSSL
+
+commit ef3853bb94c2c72e7eda0de6cec0bcb1da62058f
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Nov 29 11:52:23 2019 +1100
+
+    another attempt at sk-dummy.so working x-platform
+    
+    include a fatal() implementation to satisfy libopenbsd-compat
+    
+    clean up .lo and .so files
+    
+    .gitignore .lo and .so files
+
+commit d46ac56f1cbd5a855a2d5e7309f90d383dcf6431
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 29 00:13:29 2019 +0000
+
+    upstream: lots of dependencies go away here with ed25519 no longer
+    
+    needing the ssh_digest API.
+    
+    OpenBSD-Regress-ID: 785847ec78cb580d141e29abce351a436d6b5d49
+
+commit 7404b81f25a4a7847380c0f0cf7f1bea5f0a5cd3
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 29 00:11:21 2019 +0000
+
+    upstream: perform hashing directly in crypto_hash_sha512() using
+    
+    libcrypto or libc SHA512 functions rather than calling ssh_digest_memory();
+    avoids many dependencies on ssh code that complicate standalone use of
+    ed25519, as we want to do in sk-dummy.so
+    
+    OpenBSD-Commit-ID: 5a3c37593d3ba7add037b587cec44aaea088496d
+
+commit d39a865b7af93a7a9b5a64cf7cf0ef4396c80ba3
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Thu Nov 28 12:24:31 2019 +0000
+
+    upstream: improve the text for -A a little; input from naddy and
+    
+    djm
+    
+    OpenBSD-Commit-ID: f9cdfb1d6dbb9887c4bf3bb25f9c7a94294c988d
+
+commit 9a0e01bd0c61f553ead96b5af84abd73865847b8
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Thu Nov 28 12:23:25 2019 +0000
+
+    upstream: reshuffle the text to read better; input from naddy,
+    
+    djmc, and dtucker
+    
+    OpenBSD-Commit-ID: a0b2aca2b67614dda3d6618ea097bf0610c35013
+
+commit 5ca52c0f2e5e7f7d01d8d557b994b5c2087bed00
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Nov 28 18:09:07 2019 +1100
+
+    $< doesn't work as` I thought; explicily list objs
+
+commit 18e84bfdc5906a73405c3b42d7f840013bbffe34
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Nov 28 05:20:54 2019 +0000
+
+    upstream: tweak wording
+    
+    OpenBSD-Commit-ID: bd002ca1599b71331faca735ff5f6de29e32222e
+
+commit 8ef5bf9d03aa0f047711cff47f5ffbe3b33ff8c9
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Nov 28 13:12:30 2019 +1100
+
+    missing .SUFFIXES line makes make sad
+
+commit 323da82b8ea993b7f2c5793fd53b4f5ca105d19d
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Nov 28 09:53:42 2019 +1100
+
+    (hopefully) fix out of tree builds of sk-dummy.so
+
+commit d8b2838c5d19bf409d44ede4d32df8ee47aeb4cd
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Nov 27 22:32:11 2019 +0000
+
+    upstream: remove stray semicolon after closing brace of function;
+    
+    from Michael Forney
+    
+    OpenBSD-Commit-ID: fda95acb799bb160d15e205ee126117cf33da3a7
+
+commit 6e1d1bbf5a3eca875005e0c87f341a0a03799809
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Wed Nov 27 05:38:43 2019 +0000
+
+    upstream: Revert previous commit. The channels code still uses int
+    
+    in many places for channel ids so the INT_MAX check still makes sense.
+    
+    OpenBSD-Commit-ID: 532e4b644791b826956c3c61d6ac6da39bac84bf
+
+commit 48989244658b9748b6801034ff4ffbdfc6b1520f
+Author: Damien Miller <djm@mindrot.org>
+Date:   Wed Nov 27 16:03:12 2019 +1100
+
+    wire sk-dummy.so into test suite
+
+commit f79364bacaebde4f1c260318ab460fceacace02f
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Nov 27 05:00:17 2019 +0000
+
+    upstream: use error()+_exit() instead of fatal() to avoid running
+    
+    cleanup handlers in child process; spotted via weird regress failures in
+    portable
+    
+    OpenBSD-Commit-ID: 6902a9bb3987c7d347774444f7979b8a9ba7f412
+
+commit 70ec5e5e2681bcd409a9df94a2fec6f57a750945
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Wed Nov 27 03:34:04 2019 +0000
+
+    upstream: Make channel_id u_int32_t and remove unnecessary check
+    
+    and cast that were left over from the type conversion.  Noted by
+    t-hashida@amiya.co.jp in bz#3098, ok markus@ djm@
+    
+    OpenBSD-Commit-ID: 3ad105b6a905284e780b1fd7ff118e1c346e90b5
+
+commit ad44ca81bea83657d558aaef5a1d789a9032bac3
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Nov 26 23:43:10 2019 +0000
+
+    upstream: test FIDO2/U2F key types; ok markus@
+    
+    OpenBSD-Regress-ID: 367e06d5a260407619b4b113ea0bd7004a435474
+
+commit c6efa8a91af1d4fdb43909a23a0a4ffa012155ad
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Nov 26 23:41:23 2019 +0000
+
+    upstream: add dummy security key middleware based on work by
+    
+    markus@
+    
+    This will allow us to test U2F/FIDO2 support in OpenSSH without
+    requiring real hardware.
+    
+    ok markus@
+    
+    OpenBSD-Regress-ID: 88b309464b8850c320cf7513f26d97ee1fdf9aae
+
+commit 8635afa1cdc21366d61730d943f3cf61861899c8
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Tue Nov 26 22:42:26 2019 +0000
+
+    upstream: tweak previous;
+    
+    OpenBSD-Commit-ID: a4c097364c75da320f1b291568db830fb1ee4883
+
+commit e0d38ae9bc8c0de421605b9021d8144e4d8ff22b
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Nov 26 03:04:27 2019 +0000
+
+    upstream: more debugging; behind DEBUG_SK
+    
+    OpenBSD-Commit-ID: a978896227118557505999ddefc1f4c839818b60
+
+commit 9281d4311b8abc63b88259f354944c53f9b0b3c7
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Nov 25 21:47:49 2019 +1100
+
+    unbreak fuzzers for recent security key changes
+
+commit c5f1cc993597fed0a9013743556b1567f476c677
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Nov 25 10:32:35 2019 +0000
+
+    upstream: unbreak tests for recent security key changes
+    
+    OpenBSD-Regress-ID: 2cdf2fcae9962ca4d711338f3ceec3c1391bdf95
+
+commit 64988266820cc90a45a21672be9d762cbde8d34d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Nov 25 06:53:04 2019 +0000
+
+    upstream: unbreak after security key support landed
+    
+    OpenBSD-Regress-ID: 3ab578b0dbeb2aa6d9969b54a9c1bad329c0dcba
+
+commit e65e25c81e22ea622e89a142a303726a3882384f
+Author: tb@openbsd.org <tb@openbsd.org>
+Date:   Thu Nov 21 05:18:47 2019 +0000
+
+    upstream: Remove workaround for broken 'openssl rsa -text' output
+    
+    that was fixed in libcrypto/rsa/rsa_ameth.c r1.24.
+    
+    ok dtucker inoguchi
+    
+    OpenBSD-Regress-ID: c260edfac177daa8fcce90141587cf04a95c4f5f
+
+commit 21377ec2a9378579ba4b44a681af7bbca77581f4
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Nov 25 10:23:36 2019 +0000
+
+    upstream: redundant test
+    
+    OpenBSD-Commit-ID: 38fa7806c528a590d91ae560e67bd8b246c2d7a3
+
+commit 664deef95a2e770812533439b8bdd3f3c291ae59
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Nov 25 00:57:51 2019 +0000
+
+    upstream: document the "no-touch-required" certificate extension;
+    
+    ok markus, feedback deraadt
+    
+    OpenBSD-Commit-ID: 47640122b13f825e9c404ea99803b2372246579d
+
+commit 26cb128b31efdd5395153f4943f5be3eddc07033
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Nov 25 00:57:27 2019 +0000
+
+    upstream: Print a key touch reminder when generating a security
+    
+    key. Most keys require a touch to authorize the operation.
+    
+    OpenBSD-Commit-ID: 7fe8b23edbf33e1bb81741b9f25e9a63be5f6b68
+
+commit daeaf4136927c2a82af1399022103d67ff03f74a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Nov 25 00:55:58 2019 +0000
+
+    upstream: allow "ssh-keygen -x no-touch-required" when generating a
+    
+    security key keypair to request one that does not require a touch for each
+    authentication attempt. The default remains to require touch.
+    
+    feedback deraadt; ok markus@
+    
+    OpenBSD-Commit-ID: 887e7084b2e89c0c62d1598ac378aad8e434bcbd
+
+commit 2e71263b80fec7ad977e098004fef7d122169d40
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Nov 25 00:54:23 2019 +0000
+
+    upstream: add a "no-touch-required" option for authorized_keys and
+    
+    a similar extension for certificates. This option disables the default
+    requirement that security key signatures attest that the user touched their
+    key to authorize them.
+    
+    feedback deraadt, ok markus
+    
+    OpenBSD-Commit-ID: f1fb56151ba68d55d554d0f6d3d4dba0cf1a452e
+
+commit 0fddf2967ac51d518e300408a0d7e6adf4cd2634
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Nov 25 00:52:46 2019 +0000
+
+    upstream: Add a sshd_config PubkeyAuthOptions directive
+    
+    This directive has a single valid option "no-touch-required" that
+    causes sshd to skip checking whether user presence was tested before
+    a security key signature was made (usually by the user touching the
+    key).
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: 46e434a49802d4ed82bc0aa38cb985c198c407de
+
+commit b7e74ea072919b31391bc0f5ff653f80b9f5e84f
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Nov 25 00:51:37 2019 +0000
+
+    upstream: Add new structure for signature options
+    
+    This is populated during signature verification with additional fields
+    that are present in and covered by the signature. At the moment, it is
+    only used to record security key-specific options, especially the flags
+    field.
+    
+    with and ok markus@
+    
+    OpenBSD-Commit-ID: 338a1f0e04904008836130bedb9ece4faafd4e49
+
+commit d2b0f88178ec9e3f11b606bf1004ac2fe541a2c3
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Nov 25 00:38:17 2019 +0000
+
+    upstream: memleak in error path
+    
+    OpenBSD-Commit-ID: 93488431bf02dde85a854429362695d2d43d9112
+
+commit e2c0a21ade5e0bd7f0aab08d7eb9457f086681e9
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Nov 22 06:50:30 2019 +0000
+
+    upstream: Wait for FD to be readable or writeable during a nonblocking
+    
+    connect, not just readable.  Prevents a timeout when the server doesn't
+    immediately send a banner (eg multiplexers like sslh) but is also slightly
+    quicker for other connections since, unlike ssh1, ssh2 doesn't specify
+    that the client should parse the server banner before sending its own.
+    Patch from mnissler@chromium.org, ok djm@
+    
+    OpenBSD-Commit-ID: aba9cd8480d1d9dd31d0ca0422ea155c26c5df1d
+
+commit 2f95d43dc222ce194622b706682e8de07c9cfb42
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Nov 20 16:34:11 2019 +1100
+
+    Include openssl compat header.
+    
+    Fixes warning for ECDSA_SIG_set0 on OpenSSL versions prior to 1.1.
+
+commit a70d92f236576c032a45c39e68ca0d71e958d19d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Nov 19 22:23:19 2019 +0000
+
+    upstream: adjust on-wire signature encoding for ecdsa-sk keys to
+    
+    better match ec25519-sk keys. Discussed with markus@ and Sebastian Kinne
+    
+    NB. if you are depending on security keys (already?) then make sure you
+    update both your clients and servers.
+    
+    OpenBSD-Commit-ID: 53d88d8211f0dd02a7954d3af72017b1a79c0679
+
+commit 26369a5f7d9c4e4ef44a3e04910126e1bcea43d8
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Nov 19 22:21:15 2019 +0000
+
+    upstream: a little more information from the monitor when signature
+    
+    verification fails.
+    
+    OpenBSD-Commit-ID: e6a30071e0518cac512f9e10be3dc3500e2003f3
+
+commit 4402d6c9b5bf128dcfae2429f1d41cdaa8849b6b
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Tue Nov 19 16:02:32 2019 +0000
+
+    upstream: revert previous: naddy pointed out what's meant to
+    
+    happen. rethink needed...
+    
+    OpenBSD-Commit-ID: fb0fede8123ea7f725fd65e00d49241c40bd3421
+
+commit 88056f881315233e990e4e04a815f8f96b4674e1
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Tue Nov 19 14:54:47 2019 +0000
+
+    upstream: -c and -s do not make sense with -k; reshuffle -k into
+    
+    the main synopsis/usage; ok djm
+    
+    OpenBSD-Commit-ID: f881ba253da015398ae8758d973e3390754869bc
+
+commit 2cf262c21f35296c2ff718cfdb52e0473a1c3983
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date:   Mon Nov 18 23:17:48 2019 +0000
+
+    upstream: document '$' environment variable expansion for
+    
+    SecurityKeyProvider; ok djm@
+    
+    OpenBSD-Commit-ID: 76db507ebd336a573e1cd4146cc40019332c5799
+
+commit f0edda81c5ebccffcce52b182c3033531a1aab71
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date:   Mon Nov 18 23:16:49 2019 +0000
+
+    upstream: more missing mentions of ed25519-sk; ok djm@
+    
+    OpenBSD-Commit-ID: f242e53366f61697dffd53af881bc5daf78230ff
+
+commit 189550f5bc85148e85f4caa1f6b2fc623149a4ee
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date:   Mon Nov 18 16:10:05 2019 +0000
+
+    upstream: additional missing stdarg.h includes when built without
+    
+    WITH_OPENSSL; ok djm@
+    
+    OpenBSD-Commit-ID: 881f9a2c4e2239849cee8bbf4faec9bab128f55b
+
+commit 723a5369864b338c48d22854bc2bb4ee5c083deb
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date:   Mon Nov 18 16:08:57 2019 +0000
+
+    upstream: add the missing WITH_OPENSSL ifdefs after the ED25519-SK
+    
+    addition; ok djm@
+    
+    OpenBSD-Commit-ID: a9545e1c273e506cf70e328cbb9d0129b6d62474
+
+commit 478f4f98e4e93ae4ed1a8911dec4e5b75ea10f30
+Author: Damien Miller <djm@mindrot.org>
+Date:   Tue Nov 19 08:52:24 2019 +1100
+
+    remove all EC algs from proposals, no just sk ones
+    
+    ok dtucker@
+
+commit 6a7ef310da100f876a257b7367e3b0766dac3994
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Nov 18 22:22:04 2019 +1100
+
+    filter PUBKEY_DEFAULT_PK_ALG for ECC algorithms
+    
+    Remove ECC algorithms from the PUBKEY_DEFAULT_PK_ALG list when
+    compiling without ECC support in libcrypto.
+
+commit 64f56f1d1af3947a71a4c391f2c08747d19ee591
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Mon Nov 18 09:15:17 2019 +0000
+
+    upstream: LibreSSL change the format for openssl rsa -text output from
+    
+    "publicExponent" to "Exponent" so accept either.  with djm.
+    
+    OpenBSD-Regress-ID: b7e6c4bf700029a31c98be14600d4472fe0467e6
+
+commit 4bfc0503ad94a2a7190686a89649567c20b8534f
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Nov 18 06:58:00 2019 +0000
+
+    upstream: fix a bug that prevented serialisation of ed25519-sk keys
+    
+    OpenBSD-Commit-ID: 066682b79333159cac04fcbe03ebd9c8dcc152a9
+
+commit d88205417084f523107fbe1bc92061635cd57fd2
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Nov 18 06:39:36 2019 +0000
+
+    upstream: Fix incorrect error message when key certification fails
+    
+    OpenBSD-Commit-ID: 7771bd77ee73f7116df37c734c41192943a73cee
+
+commit 740c4bc9875cbb4b9fc03fd5eac19df080f20df5
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Nov 18 06:39:02 2019 +0000
+
+    upstream: fix bug that prevented certification of ed25519-sk keys
+    
+    OpenBSD-Commit-ID: 64c8cc6f5de2cdd0ee3a81c3a9dee8d862645996
+
+commit 85409cbb505d8c463ab6e2284b4039764c7243de
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Nov 18 06:24:17 2019 +0000
+
+    upstream: allow *-sk key types to be turned into certificates
+    
+    OpenBSD-Commit-ID: cd365ee343934862286d0b011aa77fa739d2a945
+
+commit e2e1283404e06a22ac6135d057199e70dcadb8dd
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Nov 18 04:55:02 2019 +0000
+
+    upstream: mention ed25519-sk key/cert types here too; prompted by
+    
+    jmc@
+    
+    OpenBSD-Commit-ID: e281977e4a4f121f3470517cbd5e483eee37b818
+
+commit 97dc5d1d82865a7d20f1eb193b5c62ce684024e5
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Nov 18 04:50:45 2019 +0000
+
+    upstream: mention ed25519-sk in places where it is accepted;
+    
+    prompted by jmc@
+    
+    OpenBSD-Commit-ID: 076d386739ebe7336c2137e583bc7a5c9538a442
+
+commit 130664344862a8c7afd3e24d8d36ce40af41a99f
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Nov 18 04:34:47 2019 +0000
+
+    upstream: document ed25519-sk pubkey, private key and certificate
+    
+    formats
+    
+    OpenBSD-Commit-ID: 795a7c1c80315412e701bef90e31e376ea2f3c88
+
+commit 71856e1142fc01628ce53098f8cfc74765464b35
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Nov 18 04:29:50 2019 +0000
+
+    upstream: correct order or ecdsa-sk private key fields
+    
+    OpenBSD-Commit-ID: 4d4a0c13226a79f0080ce6cbe74f73b03ed8092e
+
+commit 93fa2a6649ae3e0626cbff25c985a4573d63e3f2
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Nov 18 04:16:53 2019 +0000
+
+    upstream: correct description of fields in pub/private keys (was
+    
+    missing curve name); spotted by Sebastian Kinne
+    
+    OpenBSD-Commit-ID: 2a11340dc7ed16200342d384fb45ecd4fcce26e7
+
+commit b497e920b409250309c4abe64229237b8f2730ba
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Nov 18 15:05:04 2019 +1100
+
+    Teach the GTK2/3 ssh-askpass the new prompt hints
+    
+    ssh/ssh-agent now sets a hint environment variable $SSH_ASKPASS_PROMPT
+    when running the askpass program. This is intended to allow the
+    askpass to vary its UI across the three cases it supports: asking for
+    a passphrase, confirming the use of a key and (recently) reminding
+    a user to touch their security key.
+    
+    This adapts the gnome-ssh-askpass[23] to use these hints. Specifically,
+    for SSH_ASKPASS_PROMPT=confirm it will skip the text input box and show
+    only "yes"/"no" buttons. For SSH_ASKPASS_PROMPT=none (used to remind
+    users to tap their security key), it shows only a "close" button.
+    
+    Help wanted: adapt the other askpass programs in active use, including
+    x11-ssh-askpass, lxqt-openssh-askpass, etc.
+
+commit 857f49e91eeae6feb781ef5f5e26c38ca3d953ec
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Nov 18 14:15:26 2019 +1100
+
+    Move ifdef OPENSSL_HAS_ECC.
+    
+    Found by -Wimplicit-fallthrough: one ECC case was not inside the ifdef.
+    ok djm@
+
+commit 6cf1c40096a79e5eedcf897c7cdb46bb32d4a3ee
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Nov 18 14:14:18 2019 +1100
+
+    Enable -Wimplicit-fallthrough if supported
+    
+    Suggested by djm.
+
+commit 103c51fd5f5ddc01cd6b5c1132e711765b921bf5
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Nov 18 01:59:48 2019 +0000
+
+    upstream: missing break in getopt switch; spotted by Sebastian Kinne
+    
+    OpenBSD-Commit-ID: f002dbf14dba5586e8407e90f0141148ade8e8fc
+
+commit 9a1225e8ca2ce1fe809910874935302234399a6d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Nov 16 23:17:20 2019 +0000
+
+    upstream: tweak debug message
+    
+    OpenBSD-Commit-ID: 2bf336d3be0b7e3dd97920d7e7471146a281d2b9
+
+commit 4103a3ec7c68493dbc4f0994a229507e943a86d3
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Nov 16 22:42:30 2019 +0000
+
+    upstream: a little debug() in the security key interface
+    
+    OpenBSD-Commit-ID: 4c70300609a5c8b19707207bb7ad4109e963b0e8
+
+commit 05daa211de926f66f50b7380d637f84dc6341574
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Nov 16 22:36:48 2019 +0000
+
+    upstream: always use ssh-sk-helper, even for the internal USB HID
+    
+    support. This avoid the need for a wpath pledge in ssh-agent.
+    
+    reported by jmc@
+    
+    OpenBSD-Commit-ID: 19f799c4d020b870741d221335dbfa5e76691c23
+
+commit d431778a561d90131814f986b646299f9af33c8c
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Fri Nov 15 15:41:01 2019 +0000
+
+    upstream: fix typos in sk_enroll
+    
+    OpenBSD-Commit-ID: faa9bf779e008b3e64e2eb1344d9b7d83b3c4487
+
+commit af90aec0443ec51e6b2d804cb91771d3905f8a6f
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Fri Nov 15 11:16:28 2019 +0000
+
+    upstream: double word;
+    
+    OpenBSD-Commit-ID: 43d09bafa4ea9002078cb30ca9adc3dcc0b9c2b9
+
+commit fd1a96490cef7f945a1b3b5df4e90c8a1070f425
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 15 06:00:20 2019 +0000
+
+    upstream: remove most uses of BN_CTX
+    
+    We weren't following the rules re BN_CTX_start/BN_CTX_end and the places
+    we were using it didn't benefit from its use anyway. ok dtucker@
+    
+    OpenBSD-Commit-ID: ea9ba6c0d2e6f6adfe00b309a8f41842fe12fc7a
+
+commit 39b87104cdd47baf79ef77dc81de62cea07d119f
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Nov 15 18:56:54 2019 +1100
+
+    Add wrappers for other ultrix headers.
+    
+    Wrappers protect against multiple inclusions for headers that don't do
+    it themselves.
+
+commit 134a74f4e0cf750931f1125beb2a3f40c54c8809
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Nov 15 18:55:13 2019 +1100
+
+    Add SSIZE_MAX when we define ssize_t.
+
+commit 9c6d0a3a1ed77989d8c5436d8c3cc6c7045c0197
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Nov 15 17:13:19 2019 +1100
+
+    Remove ultrix realpath hack.
+
+commit c63fba5e3472307167850bbd84187186af7fa9f0
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 15 05:37:27 2019 +0000
+
+    upstream: unshield security key privkey before attempting signature
+    
+    in agent. spotted by dtucker@
+    
+    OpenBSD-Commit-ID: fb67d451665385b8a0a55371231c50aac67b91d2
+
+commit d165bb5396e3f718480e6039ca2cf77f5a2c2885
+Author: deraadt@openbsd.org <deraadt@openbsd.org>
+Date:   Fri Nov 15 05:26:56 2019 +0000
+
+    upstream: rewrite c99-ism
+    
+    OpenBSD-Commit-ID: d0c70cca29cfa7e6d9f7ec1d6d5dabea112499b3
+
+commit 03e06dd0e6e1c0a9f4b4b9de7def8a44dcbf93a7
+Author: deraadt@openbsd.org <deraadt@openbsd.org>
+Date:   Fri Nov 15 05:25:52 2019 +0000
+
+    upstream: only clang understands those new -W options
+    
+    OpenBSD-Commit-ID: d9b910e412d139141b072a905e66714870c38ac0
+
+commit 5c0bc273cba53f822b7d777bbb6c35d160d3b505
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Nov 15 16:08:00 2019 +1100
+
+    configure flag to built-in security key support
+    
+    Require --with-security-key-builtin before enabling the built-in
+    security key support (and consequent dependency on libfido2).
+
+commit fbcb9a7fa55300b8bd4c18bee024c6104c5a25d7
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Nov 15 16:06:30 2019 +1100
+
+    upstream commit
+    
+    revision 1.48
+    date: 2019/02/04 16:45:40;  author: millert;  state: Exp;  lines: +16 -17;  commitid: cpNtVC7erojNyctw;
+    Make gl_pathc, gl_matchc and gl_offs size_t in glob_t to match POSIX.
+    This requires a libc major version bump.  OK deraadt@
+
+commit 2cfb11abac85885de0cb888bbeb9a3e4303105ea
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Nov 15 16:05:07 2019 +1100
+
+    upstream commit
+    
+    revision 1.47
+    date: 2017/05/08 14:53:27;  author: millert;  state: Exp;  lines: +34 -21;  commitid: sYfxfyUHAfarP8sE;
+    Fix exponential CPU use with repeated '*' operators by changing '*'
+    handling to be interative instead of recursive.
+    Fix by Yves Orton, ported to OpenBSD glob.c by Ray Lai.  OK tb@
+
+commit 228dd595c7882bb9b161dbb7d4dca15c8a5f03f5
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Nov 15 16:04:28 2019 +1100
+
+    upstream commit
+    
+    revision 1.46
+    date: 2015/12/28 22:08:18;  author: mmcc;  state: Exp;  lines: +5 -9;  commitid: 0uXuF2O13NH9q2e1;
+    Remove NULL-checks before free() and a few related dead assignments.
+    
+    ok and valuable input from millert@
+
+commit a16f748690139b9f452485d97511ad5e578f59b2
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Nov 15 16:02:43 2019 +1100
+
+    upstream commit
+    
+    revision 1.44
+    date: 2015/09/14 16:09:13;  author: tedu;  state: Exp;  lines: +3 -5;  commitid: iWfSX2BIn0sLw62l;
+    remove null check before free. from Michael McConville
+    ok semarie
+
+commit fd37cdeafe25adfcdc752280f535d28de7997ff1
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Nov 15 16:02:27 2019 +1100
+
+    upstream commit
+    
+    revision 1.43
+    date: 2015/06/13 16:57:04;  author: deraadt;  state: Exp;  lines: +4 -4;  commitid: zOUKuqWBdOPOz1SZ;
+    in glob() initialize the glob_t before the first failure check.
+    from j@pureftpd.org
+    ok millert stsp
+
+commit fd62769c3882adea118dccaff80a06009874a2d1
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Nov 15 16:01:20 2019 +1100
+
+    upstream commit
+    
+    revision 1.42
+    date: 2015/02/05 12:59:57;  author: millert;  state: Exp;  lines: +2 -1;  commitid: DTQbfd4poqBW8iSJ;
+    Include stdint.h, not limits.h to get SIZE_MAX.  OK guenther@
+
+commit 2b6cba7ee2b8b36f393be739c860a9d2e5d8eb48
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Nov 15 16:00:07 2019 +1100
+
+    upstream commit
+    
+    revision 1.41
+    date: 2014/10/08 05:35:27;  author: deraadt;  state: Exp;  lines: +3 -3;  commitid: JwTGarRLHQKDgPh2;
+    obvious realloc -> reallocarray conversion
+
+commit ab3600665387ae34785498558c4409e27f495b0b
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 15 04:12:32 2019 +0000
+
+    upstream: don't consult dlopen whitelist for internal security key
+    
+    provider; spotted by dtucker@
+    
+    OpenBSD-Commit-ID: bfe5fbd17e4ff95dd85b9212181652b54444192e
+
+commit 19f8ec428db835f68c1cfd63587e9880ccd6486c
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Nov 15 15:08:28 2019 +1100
+
+    upstream commit
+    
+    revision 1.40
+    date: 2013/09/30 12:02:34;  author: millert;  state: Exp;  lines: +14 -15;
+    Use PATH_MAX, NAME_MAX and LOGIN_NAME_MAX not MAXPATHNAMELEN,
+    MAXNAMLEN or MAXLOGNAME where possible.  OK deraadt@
+
+commit bb7413db98e418d4af791244660abf6c829783f5
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Nov 15 15:07:30 2019 +1100
+
+    upstream commit
+    
+    revision 1.39
+    date: 2012/01/20 07:09:42;  author: tedu;  state: Exp;  lines: +4 -4;
+    the glob stat limit is way too low.  bump to 2048.
+    while here, failed stats should count against the limit too.
+    ok deraadt sthen stsp
+
+commit 01362cf7cb979525c014714e2bccf799a46e772e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 15 03:41:57 2019 +0000
+
+    upstream: U2F tokens may return FIDO_ERR_USER_PRESENCE_REQUIRED when
+    
+    probed to see if they own a key handle. Handle this case so the find_device()
+    look can work for them. Reported by Michael Forney
+    
+    OpenBSD-Commit-ID: 2ccd5b30a6ddfe4dba228b7159bf168601bd9166
+
+commit cf62307bc9758105913dcb91b418e4968ac2244d
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Nov 15 14:01:00 2019 +1100
+
+    Add libfido2 to INSTALL.
+
+commit 69fbda1894349d1f420c842dfcbcc883239d1aa7
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Nov 15 13:42:15 2019 +1100
+
+    libcrypto is now optional.
+
+commit 45ffa369886e37930776d7c15dd8b973242d6ecc
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 15 02:38:07 2019 +0000
+
+    upstream: show the "please touch your security key" notifier when
+    
+    using the (default) build-in security key support.
+    
+    OpenBSD-Commit-ID: 4707643aaa7124501d14e92d1364b20f312a6428
+
+commit 49dc9fa928d77807c53bdc2898db7fb515fe5eb3
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 15 02:37:24 2019 +0000
+
+    upstream: close the "touch your security key" notifier on the error
+    
+    path too
+    
+    OpenBSD-Commit-ID: c7628bf80505c1aefbb1de7abc8bb5ee51826829
+
+commit 22a82712e89bf17c27427aeba15795fb4011a0c2
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 15 02:20:06 2019 +0000
+
+    upstream: correct function name in debug message
+    
+    OpenBSD-Commit-ID: 2482c99d2ce448f39282493050f8a01e3ffc39ab
+
+commit 018e2902a65c22faded215a7c588492c948f108c
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 15 00:32:40 2019 +0000
+
+    upstream: follow existing askpass logic for security key notifier:
+    
+    fall back to _PATH_SSH_ASKPASS_DEFAULT if no $SSH_ASKPASS environment
+    variable is set.
+    
+    OpenBSD-Commit-ID: cda753726b13fb797bf7a9f7a0b3022d9ade4520
+
+commit 575d0042a94997c1eeb86a6dcfb30b3c7bdbcba3
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Nov 14 21:56:52 2019 +0000
+
+    upstream: remove debugging goop that snuck in to last commit
+    
+    OpenBSD-Commit-ID: 8ea4455a2d9364a0a04f9e4a2cbfa4c9fcefe77e
+
+commit 63a5b24f2dbdc9a4bf2182ac3db26731ddc617e8
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Nov 15 11:21:26 2019 +1100
+
+    don't fatal if libfido2 not found
+    
+    spotted by dtucker@
+
+commit 129952a81c00c332721b4ba3ede868c720ad7f4e
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Nov 15 11:17:12 2019 +1100
+
+    correct object dependency
+
+commit 6bff9521ab9a9f7396d635755c342b72373bb4f9
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Nov 14 21:27:29 2019 +0000
+
+    upstream: directly support U2F/FIDO2 security keys in OpenSSH by
+    
+    linking against the (previously external) USB HID middleware. The dlopen()
+    capability still exists for alternate middlewares, e.g. for Bluetooth, NFC
+    and test/debugging.
+    
+    OpenBSD-Commit-ID: 14446cf170ac0351f0d4792ba0bca53024930069
+
+commit 4f5e331cb8e11face3025aa6578662dde489c3ad
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Wed Nov 13 22:00:21 2019 +0000
+
+    upstream: in order to be able to figure out the number of
+    
+    signatures left on a shielded key, we need to transfer the number of
+    signatures left from the private to the public key. ok djm@
+    
+    OpenBSD-Commit-ID: 8a5d0d260aeace47d372695fdae383ce9b962574
+
+commit dffd02e297e6c2a4e86775f293eb1b0ff01fb3df
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Wed Nov 13 20:25:45 2019 +0000
+
+    upstream: fix check for sig_s; noted by qsa at qualys.com
+    
+    OpenBSD-Commit-ID: 34198084e4afb424a859f52c04bb2c9668a52867
+
+commit fc173aeb1526d4268db89ec5dfebaf8750dd26cd
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Wed Nov 13 11:25:11 2019 +0000
+
+    upstream: When clients get denied by MaxStartups, send a
+    
+    noification prior to the SSH2 protocol banner according to RFC4253 section
+    4.2.  ok djm@ deraadt@ markus@
+    
+    OpenBSD-Commit-ID: e5dabcb722d54dea18eafb336d50b733af4f9c63
+
+commit bf219920b70cafbf29ebc9890ef67d0efa54e738
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Wed Nov 13 07:53:10 2019 +0000
+
+    upstream: fix shield/unshield for xmss keys: - in ssh-agent we need
+    
+    to delay the call to shield   until we have received key specific options. -
+    when serializing xmss keys for shield we need to deal with   all optional
+    components (e.g. state might not be loaded). ok djm@
+    
+    OpenBSD-Commit-ID: cc2db82524b209468eb176d6b4d6b9486422f41f
+
+commit 40598b85d72a509566b7b2a6d57676c7231fed34
+Author: deraadt@openbsd.org <deraadt@openbsd.org>
+Date:   Wed Nov 13 05:42:26 2019 +0000
+
+    upstream: remove size_t gl_pathc < 0 test, it is invalid. the
+    
+    return value from glob() is sufficient. discussed with djm
+    
+    OpenBSD-Commit-ID: c91203322db9caaf7efaf5ae90c794a91070be3c
+
+commit 72687c8e7c38736e3e64e833ee7aa8f9cd9efed1
+Author: deraadt@openbsd.org <deraadt@openbsd.org>
+Date:   Wed Nov 13 04:47:52 2019 +0000
+
+    upstream: stdarg.h required more broadly; ok djm
+    
+    OpenBSD-Commit-ID: b5b15674cde1b54d6dbbae8faf30d47e6e5d6513
+
+commit 1e0b248d47c96be944868a735553af8482300a07
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Nov 14 16:08:17 2019 +1100
+
+    Put sshsk_sign call inside ifdef ENABLE_SK.
+    
+    Fixes build against OpenSSL configured without ECC.
+
+commit 546274a6f89489d2e6be8a8b62f2bb63c87a61fd
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Nov 13 23:27:31 2019 +1100
+
+    Remove duplicate __NR_clock_nanosleep
+
+commit b1c82f4b8adf3f42476d8a1f292df33fb7aa1a56
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Nov 13 23:19:35 2019 +1100
+
+    seccomp: Allow clock_nanosleep() in sandbox.
+    
+    seccomp: Allow clock_nanosleep() to make OpenSSH working with latest
+    glibc.  Patch from Jakub Jelen <jjelen@redhat.com> via bz #3093.
+
+commit 2b523d23804c13cb68db135b919fcf312c42b580
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Nov 13 11:56:56 2019 +1100
+
+    Include stdarg.h for va_list in xmalloc.h.
+
+commit 245dcbdca5374296bdb9c48be6e24bdf6b1c0af7
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Nov 13 11:19:26 2019 +1100
+
+    Put headers inside ifdef _AIX.
+    
+    Prevents compile errors due to missing definitions (eg va_list) on
+    non-AIX platforms.
+
+commit a4cc579c6ad2b2e54bdd6cc0d5e12c2288113a56
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Nov 13 10:41:41 2019 +1100
+
+    Fix comment in match_usergroup_pattern_list.
+    
+    Spotted by balu.gajjala@gmail.com via bz#3092.
+
+commit fccff339cab5aa66f2554e0188b83f980683490b
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Nov 12 22:38:19 2019 +0000
+
+    upstream: allow an empty attestation certificate returned by a
+    
+    security key enrollment - these are possible for tokens that only offer self-
+    attestation. This also needs support from the middleware.
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: 135eeeb937088ef6830a25ca0bbe678dfd2c57cc
+
+commit e44bb61824e36d0d181a08489c16c378c486a974
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Nov 12 22:36:44 2019 +0000
+
+    upstream: security keys typically need to be tapped/touched in
+    
+    order to perform a signature operation. Notify the user when this is expected
+    via the TTY (if available) or $SSH_ASKPASS if we can.
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: 0ef90a99a85d4a2a07217a58efb4df8444818609
+
+commit 4671211068441519011ac0e38c588317f4157ba1
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Nov 12 22:35:02 2019 +0000
+
+    upstream: pass SSH_ASKPASS_PROMPT hint to y/n key confirm too
+    
+    OpenBSD-Commit-ID: 08d46712e5e5f1bad0aea68e7717b7bec1ab8959
+
+commit 5d1c1590d736694f41b03e686045f08fcae20d62
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Nov 12 22:34:20 2019 +0000
+
+    upstream: dd API for performing one-shot notifications via tty or
+    
+    SSH_ASKPASS
+    
+    OpenBSD-Commit-ID: 9484aea33aff5b62ce3642bf259546c7639f23f3
+
+commit 166927fd410823eec8a7b2472463db51e0e6fef5
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Nov 12 22:32:48 2019 +0000
+
+    upstream: add xvasprintf()
+    
+    OpenBSD-Commit-ID: e5e3671c05c121993b034db935bce1a7aa372247
+
+commit 782093ec6cf64cc6c4078410093359869ea9329f
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Nov 13 09:08:55 2019 +1100
+
+    Remove leftover if statement from sync.
+
+commit b556cc3cbf0c43f073bb41bba4e92ca709a1ec13
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Tue Nov 12 19:34:40 2019 +0000
+
+    upstream: remove extra layer for ed25519 signature; ok djm@
+    
+    OpenBSD-Commit-ID: 7672d9d0278b4bf656a12d3aab0c0bfe92a8ae47
+
+commit 3fcf69ace19e75cf9dcd7206f396adfcb29611a8
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Tue Nov 12 19:34:00 2019 +0000
+
+    upstream: check sig_r and sig_s for ssh-sk keys; ok djm
+    
+    OpenBSD-Commit-ID: 1a1e6a85b5f465d447a3800f739e35c5b74e0abc
+
+commit 2c55744a56de0ffc81fe445a1e7fc5cd308712b3
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Tue Nov 12 19:33:08 2019 +0000
+
+    upstream: enable ed25519 support; ok djm
+    
+    OpenBSD-Commit-ID: 1a399c5b3ef15bd8efb916110cf5a9e0b554ab7e
+
+commit fd1a3b5e38721b1d69aae2d9de1a1d9155dfa5c7
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Tue Nov 12 19:32:30 2019 +0000
+
+    upstream: update sk-api to version 2 for ed25519 support; ok djm
+    
+    OpenBSD-Commit-ID: 77aa4d5b6ab17987d8a600907b49573940a0044a
+
+commit 7c32b51edbed5bd57870249c0a45dffd06be0002
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Tue Nov 12 19:31:45 2019 +0000
+
+    upstream: implement sshsk_ed25519_assemble(); ok djm
+    
+    OpenBSD-Commit-ID: af9ec838b9bc643786310b5caefc4ca4754e68c6
+
+commit fe05a36dc0ea884c8c2395d53d804fe4f4202b26
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Tue Nov 12 19:31:18 2019 +0000
+
+    upstream: implement sshsk_ed25519_inner_sig(); ok djm
+    
+    OpenBSD-Commit-ID: f422d0052c6d948fe0e4b04bc961f37fdffa0910
+
+commit e03a29e6554cd0c9cdbac0dae53dd79e6eb4ea47
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Tue Nov 12 19:30:50 2019 +0000
+
+    upstream: rename sshsk_ecdsa_sign() to sshsk_sign(); ok djm
+    
+    OpenBSD-Commit-ID: 1524042e09d81e54c4470d7bfcc0194c5b46fe19
+
+commit bc7b5d6187de625c086b5f639b25bbad17bbabfc
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Tue Nov 12 19:30:21 2019 +0000
+
+    upstream: factor out sshsk_ecdsa_inner_sig(); ok djm@
+    
+    OpenBSD-Commit-ID: 07e41997b542f670a15d7e2807143fe01efef584
+
+commit cef84a062db8cfeece26f067235dc440f6992c17
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Tue Nov 12 19:29:54 2019 +0000
+
+    upstream: factor out sshsk_ecdsa_assemble(); ok djm@
+    
+    OpenBSD-Commit-ID: 2313761a3a84ccfe032874d638d3c363e0f14026
+
+commit 7c096c456f33f3d2682736d4735cc10e790276e9
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Tue Nov 12 19:29:24 2019 +0000
+
+    upstream: implement ssh-ed25519-sk verification; ok djm@
+    
+    OpenBSD-Commit-ID: 37906d93948a1e3d237c20e713d6ca8fbf7d13f6
+
+commit ba5fb02bed1e556d0ce7b1740ae8a5f87b737491
+Author: Damien Miller <djm@mindrot.org>
+Date:   Wed Nov 13 08:48:30 2019 +1100
+
+    ignore ssh-sk-helper
+
+commit 78c96498947f711141f493a40d202c482cc59438
+Author: deraadt@openbsd.org <deraadt@openbsd.org>
+Date:   Mon Nov 11 19:53:37 2019 +0000
+
+    upstream: skip demanding -fstack-protector-all on hppa. we never
+    
+    wrote a stack protector for reverse-stack architectures, and i don't think
+    anyone else did either. a warning per compiled file is just annoying.
+    
+    OpenBSD-Commit-ID: 14806a59353152f843eb349e618abbf6f4dd3ada
+
+commit aa1c9e37789f999979fe59df74ce5c8424861ac8
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 8 03:54:02 2019 +0000
+
+    upstream: duplicate 'x' character in getopt(3) optstring
+    
+    OpenBSD-Commit-ID: 64c81caa0cb5798de3621eca16b7dd22e5d0d8a7
+
+commit aa4c640dc362816d63584a16e786d5e314e24390
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date:   Thu Nov 7 08:38:38 2019 +0000
+
+    upstream: Fill in missing man page bits for U2F security key support:
+    
+    Mention the new key types, the ~/.ssh/id_ecdsa_sk file, ssh's
+    SecurityKeyProvider keyword, the SSH_SK_PROVIDER environment variable,
+    and ssh-keygen's new -w and -x options.
+    
+    Copy the ssh-sk-helper man page from ssh-pkcs11-helper with minimal
+    substitutions.
+    
+    ok djm@
+    
+    OpenBSD-Commit-ID: ef2e8f83d0c0ce11ad9b8c28945747e5ca337ac4
+
+commit b236b27d6dada7f0542214003632b4e9b7aa1380
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sun Nov 3 00:10:43 2019 +1100
+
+    Put sftp-realpath in libssh.a
+    
+    and remove it from the specific binary targets.
+
+commit 382c18c20cdcec45b5d21ff25b4a5e0df91a68c4
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sun Nov 3 00:09:21 2019 +1100
+
+    statfs might be defined in sys/mount.h.
+    
+    eg on old NetBSDs.
+
+commit 03ffc0951c305c8e3b5fdc260d65312a57f8f7ea
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Nov 2 23:25:01 2019 +1100
+
+    Put stdint.h inside ifdef HAVE_STDINT_H.
+
+commit 19cb64c4b42d4312ce12091fd9436dbd6898998c
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Nov 2 22:45:44 2019 +1100
+
+    Rebuild .depend.
+
+commit 3611bfe89b92ada5914526d8ff0919aeb967cfa7
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Nov 2 22:42:05 2019 +1100
+
+    Define __BSD_VISIBLE in fnmatch.h.
+    
+    .. since we use symbols defined only when it is when using the compat
+    fnmatch.
+
+commit f5cc5816aaddb8eca3cba193f53e99d6a0b37d05
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Nov 2 16:39:38 2019 +1100
+
+    Only enable U2F if OpenSSL supports ECC.
+    
+    This requires moving the U2F bits to below the OpenSSL parts so we have
+    the required information.  ok djm@
+
+commit ad38406fc95fa223b0ef2edf8ff50508f8ab1cb6
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date:   Fri Nov 1 12:10:43 2019 +0000
+
+    upstream: fix miscellaneous text problems; ok djm@
+    
+    OpenBSD-Commit-ID: 0cbf411a14d8fa0b269b69cbb1b4fc0ca699fe9f
+
+commit 9cac151c2dc76b8e5b727b2fa216f572e372170f
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Nov 1 18:26:07 2019 +1100
+
+    Add flags needed to build and work on Ultrix.
+
+commit 0e3c5bc50907d2058407641b5a3581b7eda91b7e
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Nov 1 18:24:29 2019 +1100
+
+    Hook up fnmatch for platforms that don't have it.
+
+commit b56dbfd9d967e5b6ce7be9f81f206112e19e1030
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Nov 1 18:17:42 2019 +1100
+
+    Add missing bracket in realpath macro.
+
+commit 59ccb56f15e5e530e7c1b5a0b361749d8c6217d5
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Nov 1 17:32:47 2019 +1100
+
+    Import fnmatch.c from OpenBSD.
+
+commit 79d46de9fbea0f3c0e8ae7cf84effaba089071b0
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Nov 1 15:22:32 2019 +1100
+
+    Use sftp_realpath if no native realpath.
+
+commit bb4f003ed8c5f61ec74a66bcedc8ab19bf5b35c4
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Nov 1 15:06:16 2019 +1100
+
+    Configure flags for haiku from haikuports.
+    
+    Should build with the default flags with ./configure
+
+commit 4332b4fe49360679647a8705bc08f4e81323f6b4
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 1 03:54:33 2019 +0000
+
+    upstream: fix a race condition in the SIGCHILD handler that could turn
+    
+    in to a kill(-1); bz3084, reported by Gao Rui, ok dtucker@
+    
+    OpenBSD-Commit-ID: ac2742e04a69d4c34223505b6a32f6d686e18896
+
+commit 03f9205f0fb49ea2507eacc143737a8511ae5a4e
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Nov 1 14:49:25 2019 +1100
+
+    conditionalise SK sign/verify on ENABLE_SK
+    
+    Spotted by Darren and his faux-Vax
+
+commit 5eb7b9563ff818e17de24231bf2d347d9db302c5
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Nov 1 14:41:07 2019 +1100
+
+    Add prototype for localtime_r if needed.
+
+commit d500b59a825f6a58f2abf7b04eb1992d81e45d58
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Nov 1 13:42:12 2019 +1100
+
+    Check if IP_TOS is defined before using.
+
+commit 764d51e04460ec0da12e05e4777bc90c116accb9
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Nov 1 13:34:49 2019 +1100
+
+    autoconf pieces for U2F support
+    
+    Mostly following existing logic for PKCS#11 - turning off support
+    when either libcrypto or dlopen(3) are unavailable.
+
+commit 45f17a159acfc5a8e450bfbcc2cffe72950ed7a3
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 1 02:32:05 2019 +0000
+
+    upstream: remove duplicate PUBKEY_DEFAULT_PK_ALG on !WITH_OPENSSL path
+    
+    OpenBSD-Commit-ID: 95a7cafad2a4665d57cabacc28031fabc0bea9fc
+
+commit db8d13f7925da7337df87248995c533e111637ec
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 1 02:06:52 2019 +0000
+
+    upstream: more additional source files
+    
+    OpenBSD-Regress-ID: 8eaa25fb901594aee23b76eda99dca5b8db94c6f
+
+commit f89c5df65dd307739ff22319c2cf847d3b0c5ab4
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 1 02:04:25 2019 +0000
+
+    upstream: additional source files here too
+    
+    OpenBSD-Regress-ID: 8809f8e1c8f7459e7096ab6b58d8e56cb2f483fd
+
+commit 02275afa1ecbfbd39f27d34c97090e76bec232ec
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 1 02:03:27 2019 +0000
+
+    upstream: additional source files here too
+    
+    OpenBSD-Regress-ID: 09297e484327f911fd353489518cceaa0c1b95ce
+
+commit dfc8f01b9886c7999e6e20acf3f7492cb8c80796
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 1 01:57:59 2019 +0000
+
+    upstream: adapt to extra sshkey_sign() argument and additional
+    
+    dependencies
+    
+    OpenBSD-Regress-ID: 7a25604968486c4d6f81d06e8fbc7d17519de50e
+
+commit afa59e26eeb44a93f36f043f60b936eaddae77c4
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 1 01:55:41 2019 +0000
+
+    upstream: skip security-key key types for tests until we have a
+    
+    dummy U2F middleware to use.
+    
+    OpenBSD-Regress-ID: 37200462b44334a4ad45e6a1f7ad1bd717521a95
+
+commit de871e4daf346a712c78fa4ab8f18b231a47cb85
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Fri Nov 1 00:52:35 2019 +0000
+
+    upstream: sort;
+    
+    OpenBSD-Commit-ID: 8264b0be01ec5a60602bd50fd49cc3c81162ea16
+
+commit 2aae149a34b1b5dfbef423d3b7999a96818969bb
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Oct 31 21:37:33 2019 +0000
+
+    upstream: undo debugging bits that shouldn't have been committed
+    
+    OpenBSD-Commit-ID: 4bd5551b306df55379afe17d841207990eb773bf
+
+commit 3420e0464bd0e8fedcfa5fd20ad37bdc740ad5b4
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Nov 1 09:24:58 2019 +1100
+
+    depend
+
+commit b923a90abc7bccb11a513dc8b5c0f13a0ea9682c
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Oct 31 21:28:27 2019 +0000
+
+    upstream: fix -Wshadow warning
+    
+    OpenBSD-Commit-ID: 3441eb04f872a00c2483c11a5f1570dfe775103c
+
+commit 9a14c64c38fc14d0029f1c7bc70cf62cc7f0fdf9
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Oct 31 21:23:19 2019 +0000
+
+    upstream: Refactor signing - use sshkey_sign for everything,
+    
+    including the new U2F signatures.
+    
+    Don't use sshsk_ecdsa_sign() directly, instead make it reachable via
+    sshkey_sign() like all other signature operations. This means that
+    we need to add a provider argument to sshkey_sign(), so most of this
+    change is mechanically adding that.
+    
+    Suggested by / ok markus@
+    
+    OpenBSD-Commit-ID: d5193a03fcfa895085d91b2b83d984a9fde76c8c
+
+commit 07da39f71d36fb547749a5b16aa8892e621a7e4a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Oct 31 21:22:01 2019 +0000
+
+    upstream: ssh-agent support for U2F/FIDO keys
+    
+    feedback & ok markus@
+    
+    OpenBSD-Commit-ID: bb544a44bc32e45d2ec8bf652db2046f38360acb
+
+commit eebec620c9519c4839d781c4d5b6082152998f82
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Oct 31 21:20:38 2019 +0000
+
+    upstream: ssh AddKeysToAgent support for U2F/FIDO keys
+    
+    feedback & ok markus@
+    
+    OpenBSD-Commit-ID: ac08e45c7f995fa71f8d661b3f582e38cc0a2f91
+
+commit 486164d060314a7f8bca2a00f53be9e900c5e74d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Oct 31 21:19:56 2019 +0000
+
+    upstream: ssh-add support for U2F/FIDO keys
+    
+    OpenBSD-Commit-ID: 7f88a5181c982687afedf3130c6ab2bba60f7644
+
+commit b9dd14d3091e31fb836f69873d3aa622eb7b4a1c
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Oct 31 21:19:14 2019 +0000
+
+    upstream: add new agent key constraint for U2F/FIDO provider
+    
+    feedback & ok markus@
+    
+    OpenBSD-Commit-ID: d880c380170704280b4003860a1744d286c7a172
+
+commit 884416bdb10468f1252e4d7c13d51b43dccba7f6
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Oct 31 21:18:28 2019 +0000
+
+    upstream: ssh client support for U2F/FIDO keys
+    
+    OpenBSD-Commit-ID: eb2cfa6cf7419a1895e06e398ea6d41516c5b0bc
+
+commit 01a0670f69c5b86e471e033b92145d6c7cc77c58
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Oct 31 21:17:49 2019 +0000
+
+    upstream: Separate myproposal.h userauth pubkey types
+    
+    U2F/FIDO keys are not supported for host authentication, so we need
+    a separate list for user keys.
+    
+    feedback & ok markus@
+    
+    OpenBSD-Commit-ID: 7fe2e6ab85f9f2338866e5af8ca2d312abbf0429
+
+commit 23f38c2d8cda3fad24e214e1f0133c42435b54ee
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Oct 31 21:17:09 2019 +0000
+
+    upstream: ssh-keygen support for generating U2F/FIDO keys
+    
+    OpenBSD-Commit-ID: 6ce04f2b497ac9dd8c327f76f1e6c724fb1d1b37
+
+commit ed3467c1e16b7396ff7fcf12d2769261512935ec
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Oct 31 21:16:20 2019 +0000
+
+    upstream: U2F/FIDO middleware interface
+    
+    Supports enrolling (generating) keys and signatures.
+    
+    feedback & ok markus@
+    
+    OpenBSD-Commit-ID: 73d1dd5939454f9c7bd840f48236cba41e8ad592
+
+commit 02bb0768a937e50bbb236efc2bbdddb1991b1c85
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Oct 31 21:15:14 2019 +0000
+
+    upstream: Initial infrastructure for U2F/FIDO support
+    
+    Key library support: including allocation, marshalling public/private
+    keys and certificates, signature validation.
+    
+    feedback & ok markus@
+    
+    OpenBSD-Commit-ID: a17615ba15e0f7932ac4360cb18fc9a9544e68c7
+
+commit 57ecc10628b04c384cbba2fbc87d38b74cd1199d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Oct 31 21:14:17 2019 +0000
+
+    upstream: Protocol documentation for U2F/FIDO keys in OpenSSH
+    
+    OpenBSD-Commit-ID: 8f3247317c2909870593aeb306dff848bc427915
+
+commit f4fdcd2b7a2bbf5d8770d44565173ca5158d4dcb
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Nov 1 08:36:16 2019 +1100
+
+    Missing unit test files
+
+commit 1bcd1169c5221688418fa38606e9c69055b72451
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Oct 29 19:45:03 2019 +1100
+
+    Add implementation of localtime_r.
+
+commit 2046ed16c1202431b0307674c33a123a113e8297
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Tue Oct 29 07:47:27 2019 +0000
+
+    upstream: Signal handler cleanup: remove leftover support for
+    
+    unreliable signals and now-unneeded save and restore of errno.  ok deraadt@
+    markus@
+    
+    OpenBSD-Commit-ID: 01dd8a1ebdd991c8629ba1f5237283341a93cd88
+
+commit 70fc9a6ca4dd33cb2dd400a4dad5db9683a3d284
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Tue Oct 22 08:50:35 2019 +0000
+
+    upstream: fixes from lucas;
+    
+    OpenBSD-Commit-ID: 4c4bfd2806c5bbc753788ffe19c5ee13aaf418b2
+
+commit 702368aa4381c3b482368257ac574a87b5a80938
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Tue Oct 22 07:06:35 2019 +0000
+
+    upstream: Import regenerated moduli file.
+    
+    OpenBSD-Commit-ID: 58ec755be4e51978ecfee73539090eb68652a987
+
+commit 5fe81da22652f8caa63e9e3a1af519a85d36337e
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Oct 28 21:19:47 2019 +1100
+
+    Fix ifdefs to not mask needed bits.
+
+commit 7694e9d2fb5785bbdd0920dce7a160bd79feaf00
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Oct 28 17:05:36 2019 +1100
+
+    Only use RLIMIT_NOFILE if it's defined.
+
+commit d561b0b2fa2531b4cc3bc70a7d657c6485c9fd0b
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Oct 28 16:09:04 2019 +1100
+
+    Make sure we have struct statfs before using.
+
+commit 2912596aecfcf48e5115c7a906d1e664f7717a4b
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Oct 28 16:06:59 2019 +1100
+
+    Define UINT32_MAX if needed.
+
+commit 7169e31121e8c8cc729b55154deb722ae495b316
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Oct 28 16:00:45 2019 +1100
+
+    Move utimensat definition into timespec section.
+    
+    Since utimensat uses struct timespec, move it to the section where we
+    define struct timespec when needed.
+
+commit 850ec1773d656cbff44d78a79e369dc262ce5853
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Oct 28 15:57:22 2019 +1100
+
+    Wrap OpenSSL bits in WITH_OPENSSL.
+
+commit 6fc7e1c6fec3ba589869ae98e968c0e5e2e4695b
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Oct 28 15:53:25 2019 +1100
+
+    Wrap poll.h includes in HAVE_POLL_H.
+
+commit 9239a18f96905cc1a353e861e33af093652f24e7
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Oct 24 14:39:49 2019 +1100
+
+    Add a function call stackprotector tests.
+    
+    Including a function call in the test programs for the gcc stack
+    protector flag tests exercises more of the compiler and makes it more
+    likely it'll detect problems.
+
+commit b9705393be4612fd5e29d0cd8e7cf2b66ed19eb7
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Oct 22 18:09:22 2019 +1100
+
+    Import regenerated moduli file.
+
+commit 76ed2199491397e0f9902ade80d5271e4a9b2630
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Oct 16 06:05:39 2019 +0000
+
+    upstream: potential NULL dereference for revoked hostkeys; reported
+    
+    by krishnaiah bommu
+    
+    OpenBSD-Commit-ID: 35ff685e7cc9dd2e3fe2e3dfcdcb9bc5c79f6506
+
+commit 6500c3bc71bf4fe14972c1177e6b93f1164d07a4
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Oct 16 06:03:30 2019 +0000
+
+    upstream: free buf before return; reported by krishnaiah bommu
+    
+    OpenBSD-Commit-ID: 091bb23a6e913af5d4f72c50030b53ce1cef4de1
+
+commit d7d116b6d9e6cb79cc235e9801caa683d3db3181
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Oct 14 06:00:02 2019 +0000
+
+    upstream: memleak in error path; spotted by oss-fuzz, ok markus@
+    
+    OpenBSD-Commit-ID: d6ed260cbbc297ab157ad63931802fb1ef7a4266
+
+commit 9b9e3ca6945351eefb821ff783a4a8e6d9b98b9a
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Oct 11 14:12:16 2019 +1100
+
+    Re-add SA_RESTART to mysignal.
+    
+    This makes mysignal implement reliable BSD semantics according to
+    Stevens' APUE.  This was first attempted in 2001 but was reverted
+    due to problems with HP-UX 10.20 and select() and possibly grantpt().
+    Modern systems should be fine with it, but if any current platforms have
+    a problem with it now we can disable it just for those.  ok djm@
+
+commit 0bd312a362168c1eae3cd6b3889395a78e6fd0f8
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Oct 10 09:42:03 2019 +1100
+
+    Fix ifdef typo for declaration of memmem.
+    
+    Fixes build on IRIX.  bz#3081.
+
+commit 01ce1cd402d5eecde2bba35b67e08f5b266b37fd
+Author: Abhishek Arya <inferno@chromium.org>
+Date:   Tue Oct 8 20:19:18 2019 -0700
+
+    Update README.md
+
+commit 1ba130ac8fb2884307f658126f04578f8aef409e
+Author: Damien Miller <djm@mindrot.org>
+Date:   Wed Oct 9 13:49:35 2019 +1100
+
+    add a fuzzer for private key parsing
+
+commit cdf1d0a9f5d18535e0a18ff34860e81a6d83aa5c
+Author: Damien Miller <djm@mindrot.org>
+Date:   Wed Oct 9 11:31:03 2019 +1100
+
+    prepare for 8.1 release
+
+commit 3b4e56d740b74324e2d7542957cad5a11518f455
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Oct 9 00:04:57 2019 +0000
+
+    upstream: openssh-8.1
+    
+    OpenBSD-Commit-ID: 3356bb34e2aa287f0e6d6773c9ae659dc680147d
+
+commit 29e0ecd9b4eb3b9f305e2240351f0c59cad9ef81
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Oct 9 00:04:42 2019 +0000
+
+    upstream: fix an unreachable integer overflow similar to the XMSS
+    
+    case, and some other NULL dereferences found by fuzzing.
+    
+    fix with and ok markus@
+    
+    OpenBSD-Commit-ID: 0f81adbb95ef887ce586953e1cb225fa45c7a47b
+
+commit a546b17bbaeb12beac4c9aeed56f74a42b18a93a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Oct 9 00:02:57 2019 +0000
+
+    upstream: fix integer overflow in XMSS private key parsing.
+    
+    Reported by Adam Zabrocki via SecuriTeam's SSH program.
+    
+    Note that this code is experimental and not compiled by default.
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: cd0361896d15e8a1bac495ac583ff065ffca2be1
+
+commit c2cc25480ba36ab48c1a577bebb12493865aad87
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Tue Oct 8 22:40:39 2019 +0000
+
+    upstream: Correct type for end-of-list sentinel; fixes initializer
+    
+    warnings on some platforms.  ok deraadt.
+    
+    OpenBSD-Commit-ID: a990dbc2dac25bdfa07e79321349c73fd991efa2
+
+commit e827aedf8818e75c0016b47ed8fc231427457c43
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Oct 7 23:10:38 2019 +0000
+
+    upstream: reversed test yielded incorrect debug message
+    
+    OpenBSD-Commit-ID: 78bb512d04cfc238adb2c5b7504ac93eecf523b3
+
+commit 8ca491d29fbe26e5909ce22b344c0a848dc28d55
+Author: Damien Miller <djm@mindrot.org>
+Date:   Tue Oct 8 17:05:57 2019 +1100
+
+    depend
+
+commit 86a0323374cbd404629e75bb320b3fa1c16aaa6b
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Oct 9 09:36:06 2019 +1100
+
+    Make MAKE_CLONE no-op macro more correct.
+    
+    Similar to the previous change to DEF_WEAK, some compilers don't like
+    the empty statement, so convert into a no-op function prototype.
+
+commit cfc1897a2002ec6c4dc879b24e8b3153c87ea2cf
+Author: Damien Miller <djm@mindrot.org>
+Date:   Wed Oct 9 09:06:35 2019 +1100
+
+    wrap stdint.h include in HAVE_STDINT_H
+    
+    make the indenting a little more consistent too..
+    
+    Fixes Solaris 2.6; reported by Tom G. Christensen
+
+commit 13b3369830a43b89a503915216a23816d1b25744
+Author: Damien Miller <djm@mindrot.org>
+Date:   Tue Oct 8 15:32:02 2019 +1100
+
+    avoid "return (value)" in void-declared function
+    
+    spotted by Tim Rice; ok dtucker
+
+commit 0c7f8d2326d812b371f7afd63aff846973ec80a4
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Oct 8 14:44:50 2019 +1100
+
+    Make DEF_WEAK more likely to be correct.
+    
+    Completely nop-ing out DEF_WEAK leaves an empty statemment which some
+    compilers don't like.  Replace with a no-op function template.  ok djm@
+
+commit b1e79ea8fae9c252399677a28707661d85c7d00c
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Sun Oct 6 11:49:50 2019 +0000
+
+    upstream: Instead of running sed over the whole log to remove CRs,
+    
+    remove them only where it's needed (and confuses test(1) on at least OS X in
+    portable).
+    
+    OpenBSD-Regress-ID: a6ab9b4bd1d33770feaf01b2dfb96f9e4189d2d0
+
+commit 8dc7d6b75a7f746fdd056acd41dffc0a13557a4c
+Author: Eduardo Barretto <ebarretto@linux.vnet.ibm.com>
+Date:   Tue May 9 13:33:30 2017 -0300
+
+    Enable specific ioctl call for EP11 crypto card (s390)
+    
+    The EP11 crypto card needs to make an ioctl call, which receives an
+    specific argument. This crypto card is for s390 only.
+    
+    Signed-off-by: Eduardo Barretto <ebarretto@linux.vnet.ibm.com>
+
+commit 07f2c7f34951c04d2cd796ac6c80e47c56c4969e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Oct 4 04:31:59 2019 +0000
+
+    upstream: fix memory leak in error path; bz#3074 patch from
+    
+    krishnaiah.bommu@intel.com, ok dtucker
+    
+    OpenBSD-Commit-ID: d031853f3ecf47b35a0669588f4d9d8e3b307b3c
+
+commit b7fbc75e119170f4d15c94a7fda4a1050e0871d6
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Oct 4 04:13:39 2019 +0000
+
+    upstream: space
+    
+    OpenBSD-Commit-ID: 350648bcf00a2454e7ef998b7d88e42552b348ac
+
+commit 643ab68c79ac1644f4a31e36928c2bfc8a51db3c
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Oct 4 03:39:19 2019 +0000
+
+    upstream: more sshsig regress tests: check key revocation, the
+    
+    check-novalidate signature test mode and signing keys in ssh-agent.
+    
+    From Sebastian Kinne (slightly tweaked)
+    
+    OpenBSD-Regress-ID: b39566f5cec70140674658cdcedf38752a52e2e2
+
+commit 714031a10bbe378a395a93cf1040f4ee1451f45f
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Oct 4 03:26:58 2019 +0000
+
+    upstream: Check for gmtime failure in moduli generation. Based on
+    
+    patch from krishnaiah.bommu@intel.com, ok djm@
+    
+    OpenBSD-Commit-ID: 4c6a4cde0022188ac83737de08da0e875704eeaa
+
+commit 6918974405cc28ed977f802fd97a9c9a9b2e141b
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Thu Oct 3 17:07:50 2019 +0000
+
+    upstream: use a more common options order in SYNOPSIS and sync
+    
+    usage(); while here, no need for Bk/Ek;
+    
+    ok dtucker
+    
+    OpenBSD-Commit-ID: 38715c3f10b166f599a2283eb7bc14860211bb90
+
+commit feff96b7d4c0b99307f0459cbff128aede4a8984
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Oct 2 09:50:50 2019 +0000
+
+    upstream: thinko in previous; spotted by Mantas
+    
+    =?UTF-8?q?=20Mikul=C4=97nas?=
+    MIME-Version: 1.0
+    Content-Type: text/plain; charset=UTF-8
+    Content-Transfer-Encoding: 8bit
+    
+    OpenBSD-Commit-ID: ffa3f5a45e09752fc47d9041e2203ee2ec15b24d
+
+commit b5a89eec410967d6b712665f8cf0cb632928d74b
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Oct 2 08:07:13 2019 +0000
+
+    upstream: make signature format match PROTOCO
+    
+    =?UTF-8?q?=20as=20a=20string,=20not=20raw=20bytes.=20Spotted=20by=20Manta?=
+    =?UTF-8?q?s=20Mikul=C4=97nas?=
+    MIME-Version: 1.0
+    Content-Type: text/plain; charset=UTF-8
+    Content-Transfer-Encoding: 8bit
+    
+    OpenBSD-Commit-ID: 80fcc6d52893f80c6de2bedd65353cebfebcfa8f
+
+commit dc6f81ee94995deb11bbf7e19801022c5f6fd90a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Oct 2 08:05:50 2019 +0000
+
+    upstream: ban empty namespace strings for s
+    
+    =?UTF-8?q?shsig;=20spotted=20by=20Mantas=20Mikul=C4=97nas?=
+    MIME-Version: 1.0
+    Content-Type: text/plain; charset=UTF-8
+    Content-Transfer-Encoding: 8bit
+    
+    OpenBSD-Commit-ID: 7c5bcf40bed8f4e826230176f4aa353c52aeb698
+
+commit fa5bd8107e0e2b3e1e184f55d0f9320c119f65f0
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Oct 2 14:30:55 2019 +1000
+
+    Put ssherr.h back as it's actually needed.
+
+commit 3ef92a657444f172b61f92d5da66d94fa8265602
+Author: Lonnie Abelbeck <lonnie@abelbeck.com>
+Date:   Tue Oct 1 09:05:09 2019 -0500
+
+    Deny (non-fatal) shmget/shmat/shmdt in preauth privsep child.
+    
+    New wait_random_seeded() function on OpenSSL 1.1.1d uses shmget, shmat, and shmdt
+    in the preauth codepath, deny (non-fatal) in seccomp_filter sandbox.
+
+commit edd1d3a6261aecbf9a55944fd7be1db83571b46e
+Author: Damien Miller <djm@mindrot.org>
+Date:   Wed Oct 2 10:54:28 2019 +1000
+
+    remove duplicate #includes
+    
+    Prompted by Jakub Jelen
+
+commit 13c508dfed9f25e6e54c984ad00a74ef08539e70
+Author: Damien Miller <djm@mindrot.org>
+Date:   Wed Oct 2 10:51:15 2019 +1000
+
+    typo in comment
+
+commit d0c3ac427f6c52b872d6617421421dd791664445
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Oct 2 00:42:30 2019 +0000
+
+    upstream: remove some duplicate #includes
+    
+    OpenBSD-Commit-ID: ed6827ab921eff8027669848ef4f70dc1da4098c
+
+commit 084682786d9275552ee93857cb36e43c446ce92c
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Oct 1 10:22:53 2019 +0000
+
+    upstream: revert unconditional forced login implemented in r1.41 of
+    
+    ssh-pkcs11.c; r1.45 added a forced login as a fallback for cases where the
+    token returns no objects and this is less disruptive for users of tokens
+    directly in ssh (rather than via ssh-agent) and in ssh-keygen
+    
+    bz3006, patch from Jakub Jelen; ok markus
+    
+    OpenBSD-Commit-ID: 33d6df589b072094384631ff93b1030103b3d02e
+
+commit 6c91d42cce3f055917dc3fd2c305dfc5b3b584b3
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Sun Sep 29 16:31:57 2019 +0000
+
+    upstream: group and sort single letter options; ok deraadt
+    
+    OpenBSD-Commit-ID: e1480e760a2b582f79696cdcff70098e23fc603f
+
+commit 3b44bf39ff4d7ef5d50861e2e9dda62d2926d2fe
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Fri Sep 27 20:03:24 2019 +0000
+
+    upstream: fix the DH-GEX text in -a; because this required a comma,
+    
+    i added a comma to the first part, for balance...
+    
+    OpenBSD-Commit-ID: 2c3464e9e82a41e8cdfe8f0a16d94266e43dbb58
+
+commit 3e53ef28fab53094e3b19622ba0e9c3d5fe71273
+Author: deraadt@openbsd.org <deraadt@openbsd.org>
+Date:   Tue Sep 24 12:50:46 2019 +0000
+
+    upstream: identity_file[] should be PATH_MAX, not the arbitrary
+    
+    number 1024
+    
+    OpenBSD-Commit-ID: e775f94ad47ce9ab37bd1410d7cf3b7ea98b11b7
+
+commit 90d4b2541e8c907793233d9cbd4963f7624f4174
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Fri Sep 20 18:50:58 2019 +0000
+
+    upstream: new sentence, new line;
+    
+    OpenBSD-Commit-ID: c35ca5ec07be460e95e7406af12eee04a77b6698
+
+commit fbec7dba01b70b49ac47f56031310865dff86200
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Sep 30 18:01:12 2019 +1000
+
+    Include stdio.h for snprintf.
+    
+    Patch from vapier@gentoo.org.
+
+commit 0a403bfde71c4b82147473298d3a60b4171468bd
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Sep 30 14:11:42 2019 +1000
+
+    Add SKIP_LTESTS for skipping specific tests.
+
+commit 4d59f7a5169c451ebf559aedec031ac9da2bf80c
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Sep 27 05:25:12 2019 +0000
+
+    upstream: Test for empty result in expected bits. Remove CRs from log
+    
+    as they confuse tools on some platforms.  Re-enable the 3des-cbc test.
+    
+    OpenBSD-Regress-ID: edf536d4f29fc1ba412889b37247a47f1b49d250
+
+commit 7c817d129e2d48fc8a6f7965339313023ec45765
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Sep 27 15:26:22 2019 +1000
+
+    Re-enable dhgex test.
+    
+    Since we've added larger fallback groups to dh.c this test will pass
+    even if there is no moduli file installed on the system.
+
+commit c1e0a32fa852de6d1c82ece4f76add0ab0ca0eae
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Sep 24 21:17:20 2019 +1000
+
+    Add more ToS bits, currently only used by netcat.
+
+commit 5a273a33ca1410351cb484af7db7c13e8b4e8e4e
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Sep 19 15:41:23 2019 +1000
+
+    Privsep is now required.
+
+commit 8aa2aa3cd4d27d14e74b247c773696349472ef20
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Sep 16 03:23:02 2019 +0000
+
+    upstream: Allow testing signature syntax and validity without verifying
+    
+    that a signature came from a trusted signer. To discourage accidental or
+    unintentional use, this is invoked by the deliberately ugly option name
+    "check-novalidate"
+    
+    from Sebastian Kinne
+    
+    OpenBSD-Commit-ID: cea42c36ab7d6b70890e2d8635c1b5b943adcc0b
+
+commit 7047d5afe3103f0f07966c05b810682d92add359
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Sep 13 04:52:34 2019 +0000
+
+    upstream: clarify that IdentitiesOnly also applies to the default
+    
+    ~/.ssh/id_* keys; bz#3062
+    
+    OpenBSD-Commit-ID: 604be570e04646f0f4a17026f8b2aada6a585dfa
+
+commit b36ee3fcb2f1601693b1b7fd60dd6bd96006ea75
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Sep 13 04:36:43 2019 +0000
+
+    upstream: Plug mem leaks on error paths, based in part on github
+    
+    pr#120 from David Carlier.  ok djm@.
+    
+    OpenBSD-Commit-ID: c57adeb1022a8148fc86e5a88837b3b156dbdb7e
+
+commit 2aefdf1aef906cf7548a2e5927d35aacb55948d4
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Sep 13 04:31:19 2019 +0000
+
+    upstream: whitespace
+    
+    OpenBSD-Commit-ID: 57a71dd5f4cae8d61e0ac631a862589fb2bfd700
+
+commit fbe24b142915331ceb2a3a76be3dc5b6d204fddf
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Sep 13 04:27:35 2019 +0000
+
+    upstream: allow %n to be expanded in ProxyCommand strings
+    
+    From Zachary Harmany via github.com/openssh/openssh-portable/pull/118
+    ok dtucker@
+    
+    OpenBSD-Commit-ID: 7eebf1b7695f50c66d42053d352a4db9e8fb84b6
+
+commit 2ce1d11600e13bee0667d6b717ffcc18a057b821
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Sep 13 04:07:42 2019 +0000
+
+    upstream: clarify that ConnectTimeout applies both to the TCP
+    
+    connection and to the protocol handshake/KEX. From Jean-Charles Longuet via
+    Github PR140
+    
+    OpenBSD-Commit-ID: ce1766abc6da080f0d88c09c2c5585a32b2256bf
+
+commit df780114278f406ef7cb2278802a2660092fff09
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Mon Sep 9 02:31:19 2019 +0000
+
+    upstream: Fix potential truncation warning. ok deraadt.
+    
+    OpenBSD-Commit-ID: d87b7e3a94ec935e8194e7fce41815e22804c3ff
+
+commit ec0e6243660bf2df30c620a6a0d83eded376c9c6
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Sep 13 13:14:39 2019 +1000
+
+    memleak of buffer in sshpam_query
+    
+    coverity report via Ed Maste; ok dtucker@
+
+commit c17e4638e5592688264fc0349f61bfc7b4425aa5
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Sep 13 13:12:42 2019 +1000
+
+    explicitly test set[ug]id() return values
+    
+    Legacy !_POSIX_SAVED_IDS path only; coverity report via Ed Maste
+    ok dtucker@
+
+commit 91a2135f32acdd6378476c5bae475a6e7811a6a2
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date:   Fri Sep 6 14:45:34 2019 +0000
+
+    upstream: Allow prepending a list of algorithms to the default set
+    
+    by starting the list with the '^' character, e.g.
+    
+    HostKeyAlgorithms ^ssh-ed25519
+    Ciphers ^aes128-gcm@openssh.com,aes256-gcm@openssh.com
+    
+    ok djm@ dtucker@
+    
+    OpenBSD-Commit-ID: 1e1996fac0dc8a4b0d0ff58395135848287f6f97
+
+commit c8bdd2db77ac2369d5cdee237656f266c8f41552
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Sep 6 07:53:40 2019 +0000
+
+    upstream: key conversion should fail for !openssl builds, not fall
+    
+    through to the key generation code
+    
+    OpenBSD-Commit-ID: b957436adc43c4941e61d61958a193a708bc83c9
+
+commit 823f6c37eb2d8191d45539f7b6fa877a4cb4ed3d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Sep 6 06:08:11 2019 +0000
+
+    upstream: typo in previous
+    
+    OpenBSD-Commit-ID: 7c3b94110864771a6b80a0d8acaca34037c3c96e
+
+commit 6a710d3e06fd375e2c2ae02546b9541c488a2cdb
+Author: Damien Miller <djm@mindrot.org>
+Date:   Sun Sep 8 14:48:11 2019 +1000
+
+    needs time.h for --without-openssl
+
+commit f61f29afda6c71eda26effa54d3c2e5306fd0833
+Author: Damien Miller <djm@mindrot.org>
+Date:   Sat Sep 7 19:25:00 2019 +1000
+
+    make unittests pass for no-openssl case
+
+commit 105e1c9218940eb53473f55a9177652d889ddbad
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Sep 6 05:59:41 2019 +0000
+
+    upstream: avoid compiling certain files that deeply depend on
+    
+    libcrypto when WITH_OPENSSL isn't set
+    
+    OpenBSD-Commit-ID: 569f08445c27124ec7c7f6c0268d844ec56ac061
+
+commit 670104b923dd97b1c06c0659aef7c3e52af571b2
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Sep 6 05:23:55 2019 +0000
+
+    upstream: fixes for !WITH_OPENSSL compilation; ok dtucker@
+    
+    OpenBSD-Commit-ID: 7fd68eaa9e0f7482b5d4c7e8d740aed4770a839f
+
+commit be02d7cbde3d211ec2ed2320a1f7d86b2339d758
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Sep 6 04:53:27 2019 +0000
+
+    upstream: lots of things were relying on libcrypto headers to
+    
+    transitively include various system headers (mostly stdlib.h); include them
+    explicitly
+    
+    OpenBSD-Commit-ID: 5b522f4f2d844f78bf1cc4f3f4cc392e177b2080
+
+commit d05aaaaadcad592abfaa44540928e0c61ef72ebb
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Sep 6 03:30:42 2019 +0000
+
+    upstream: remove leakmalloc reference; we used this early when
+    
+    refactoring but not since
+    
+    OpenBSD-Commit-ID: bb28ebda8f7c490b87b37954044a6cdd43a7eb2c
+
+commit 1268f0bcd8fc844ac6c27167888443c8350005eb
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Sep 6 04:24:06 2019 +0000
+
+    upstream: Check for RSA support before using it for the user key,
+    
+    otherwise use ed25519 which is supported when built without OpenSSL.
+    
+    OpenBSD-Regress-ID: 3d23ddfe83c5062f00ac845d463f19a2ec78c0f7
+
+commit fd7a2dec652b9efc8e97f03f118f935dce732c60
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Sep 6 14:07:10 2019 +1000
+
+    Provide explicit path to configure-check.
+    
+    On some platforms (at least OpenBSD) make won't search VPATH for target
+    files, so building out-of-tree will fail at configure-check.  Provide
+    explicit path.  ok djm@
+
+commit 00865c29690003b4523cc09a0e104724b9f911a4
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Sep 6 01:58:50 2019 +0000
+
+    upstream: better error code for bad arguments; inspired by
+    
+    OpenBSD-Commit-ID: dfc263b6041de7f0ed921a1de0b81ddebfab1e0a
+
+commit afdf27f5aceb4973b9f5308f4310c6e3fd8db1fb
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Sep 5 21:38:40 2019 +1000
+
+    revert config.h/config.h.in freshness checks
+    
+    turns out autoreconf and configure don't touch some files if their content
+    doesn't change, so the mtime can't be relied upon in a makefile rule
+
+commit a97609e850c57bd2cc2fe7e175fc35cb865bc834
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Sep 5 20:54:39 2019 +1000
+
+    extend autoconf freshness test
+    
+    make it cover config.h.in and config.h separately
+
+commit 182297c10edb21c4856c6a38326fd04d81de41a5
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Sep 5 20:34:54 2019 +1000
+
+    check that configure/config.h is up to date
+    
+    Ensure they are newer than the configure.ac / aclocal.m4 source
+
+commit 7d6034bd020248e9fc0f8c39c71c858debd0d0c1
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Sep 5 10:05:51 2019 +0000
+
+    upstream: if a PKCS#11 token returns no keys then try to login and
+    
+    refetch them. Based on patch from Jakub Jelen; bz#2430 ok markus@
+    
+    OpenBSD-Commit-ID: ab53bd6ddd54dd09e54a8bfbed1a984496f08b43
+
+commit 76f09bd95917862101b740afb19f4db5ccc752bf
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Sep 5 09:35:19 2019 +0000
+
+    upstream: sprinkle in some explicit errors here, otherwise the
+    
+    percolate all the way up to dispatch_run_fatal() and lose all meaninful
+    context
+    
+    to help with bz#3063; ok dtucker@
+    
+    OpenBSD-Commit-ID: 5b2da83bb1c4a3471444b7910b2120ae36438a0a
+
+commit 0ea332497b2b2fc3995f72f6bafe9d664c0195b3
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Sep 5 09:25:13 2019 +0000
+
+    upstream: only send ext_info for KEX_INITIAL; bz#2929 ok dtucker
+    
+    OpenBSD-Commit-ID: 00f5c6062f6863769f5447c6346f78c05d2e4a63
+
+commit f23d91f9fa7f6f42e70404e000fac88aebfe3076
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Thu Sep 5 05:47:23 2019 +0000
+
+    upstream: macro fix; ok djm
+    
+    OpenBSD-Commit-ID: e891dd6c7996114cb32f0924cb7898ab55efde6e
+
+commit 8b57337c1c1506df2bb9f039d0628a6de618566b
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Sep 5 15:46:39 2019 +1000
+
+    update fuzzing makefile to more recent clang
+
+commit ae631ad77daf8fd39723d15a687cd4b1482cbae8
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Sep 5 15:45:32 2019 +1000
+
+    fuzzer for sshsig allowed_signers option parsing
+
+commit 69159afe24120c97e5ebaf81016c85968afb903e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Sep 5 05:42:59 2019 +0000
+
+    upstream: memleak on error path; found by libfuzzer
+    
+    OpenBSD-Commit-ID: 34d44cb0fb5bdb5fcbc6b02b804e71b20a7a5fc7
+
+commit bab6feb01f9924758ca7129dba708298a53dde5f
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Sep 5 04:55:32 2019 +0000
+
+    upstream: expose allowed_signers options parsing code in header for
+    
+    fuzzing
+    
+    rename to make more consistent with philosophically-similar auth
+    options parsing API.
+    
+    OpenBSD-Commit-ID: 0c67600ef04187f98e2912ca57b60c22a8025b7c
+
+commit 4f9d75fbafde83d428e291516f8ce98e6b3a7c4b
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date:   Wed Sep 4 20:31:15 2019 +0000
+
+    upstream: Call comma-separated lists as such to clarify semantics.
+    
+    Options such as Ciphers take values that may be a list of ciphers; the
+    complete list, not indiviual elements, may be prefixed with a dash or plus
+    character to remove from or append to the default list, respectively.
+    
+    Users might read the current text as if each elment took an optional prefix,
+    so tweak the wording from "values" to "list" to prevent such ambiguity for
+    all options supporting these semantics.
+    
+    Fix instances missed in first commit.  ok jmc@ kn@
+    
+    OpenBSD-Commit-ID: 7112522430a54fb9f15a7a26d26190ed84d5e417
+
+commit db1e6f60f03641b2d17e0ab062242609f4ed4598
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Wed Sep 4 05:56:54 2019 +0000
+
+    upstream: tweak previous;
+    
+    OpenBSD-Commit-ID: 0abd728aef6b5b35f6db43176aa83b7e3bf3ce27
+
+commit 0f44e5956c7c816f6600f2a47be4d7bb5a8d711d
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date:   Tue Sep 3 20:51:49 2019 +0000
+
+    upstream: repair typo and editing mishap
+    
+    OpenBSD-Commit-ID: d125ab720ca71ccf9baf83e08ddc8c12a328597e
+
+commit f4846dfc6a79f84bbc6356ae3184f142bacedc24
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Sep 5 11:09:28 2019 +1000
+
+    Fuzzer harness for sshsig
+
+commit b08a6bc1cc7750c6f8a425d1cdbd86552fffc637
+Author: Damien Miller <djm@mindrot.org>
+Date:   Tue Sep 3 18:45:42 2019 +1000
+
+    oops; missed including the actual file
+
+commit 1a72c0dd89f09754df443c9576dde624a17d7dd0
+Author: Damien Miller <djm@mindrot.org>
+Date:   Tue Sep 3 18:44:10 2019 +1000
+
+    portability fixes for sshsig
+
+commit 6d6427d01304d967e58544cf1c71d2b4394c0522
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Sep 3 08:37:45 2019 +0000
+
+    upstream: regress test for sshsig; feedback and ok markus@
+    
+    OpenBSD-Regress-ID: 74c0974f2cdae8d9599b9d76a09680bae55d8a8b
+
+commit 59650f0eaf65115afe04c39abfb93a4fc994ec55
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Sep 3 08:37:06 2019 +0000
+
+    upstream: only add plain keys to prevent any certs laying around
+    
+    from confusing the test.
+    
+    OpenBSD-Regress-ID: b8f1508f822bc560b98dea910e61ecd76f34100f
+
+commit d637c4aee6f9b5280c13c020d7653444ac1fcaa5
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Sep 3 08:35:27 2019 +0000
+
+    upstream: sshsig tweaks and improvements from and suggested by
+    
+    Markus
+    
+    ok markus/me
+    
+    OpenBSD-Commit-ID: ea4f46ad5a16b27af96e08c4877423918c4253e9
+
+commit 2a9c9f7272c1e8665155118fe6536bebdafb6166
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Sep 3 08:34:19 2019 +0000
+
+    upstream: sshsig: lightweight signature and verification ability
+    
+    for OpenSSH
+    
+    This adds a simple manual signature scheme to OpenSSH.
+    Signatures can be made and verified using ssh-keygen -Y sign|verify
+    
+    Signatures embed the key used to make them. At verification time, this
+    is matched via principal name against an authorized_keys-like list
+    of allowed signers.
+    
+    Mostly by Sebastian Kinne w/ some tweaks by me
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: 2ab568e7114c933346616392579d72be65a4b8fb
+
+commit 5485f8d50a5bc46aeed829075ebf5d9c617027ea
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Sep 3 08:32:11 2019 +0000
+
+    upstream: move authorized_keys option parsing helpsers to misc.c
+    
+    and make them public; ok markus@
+    
+    OpenBSD-Commit-ID: c18bcb2a687227b3478377c981c2d56af2638ea2
+
+commit f8df0413f0a057b6a3d3dd7bd8bc7c5d80911d3a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Sep 3 08:31:20 2019 +0000
+
+    upstream: make get_sigtype public as sshkey_get_sigtype(); ok
+    
+    markus@
+    
+    OpenBSD-Commit-ID: 01f8cdbec63350490d2249f41112c5780d1cfbb8
+
+commit dd8002fbe63d903ffea5be7b7f5fc2714acab4a0
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Sep 3 08:30:47 2019 +0000
+
+    upstream: move advance_past_options to authfile.c and make it
+    
+    public; ok markus@
+    
+    OpenBSD-Commit-ID: edda2fbba2c5b1f48e60f857a2010479e80c5f3c
+
+commit c72d78ccbe642e08591a626e5de18381489716e0
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Sep 3 08:29:58 2019 +0000
+
+    upstream: move skip_space() to misc.c and make it public; ok
+    
+    markus@
+    
+    OpenBSD-Commit-ID: caa77e8a3b210948e29ad3e28c5db00852961eae
+
+commit 06af3583f46e2c327fdd44d8a95b8b4e8dfd8db5
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Sep 3 08:29:15 2019 +0000
+
+    upstream: authfd: add function to check if key is in agent
+    
+    This commit adds a helper function which allows the caller to
+    check if a given public key is present in ssh-agent.
+    
+    work by Sebastian Kinne; ok markus@
+    
+    OpenBSD-Commit-ID: d43c5826353e1fdc1af71eb42961b30782c7bd13
+
+commit 2ab5a8464870cc4b29ddbe849bbbc255729437bf
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Sep 3 08:28:30 2019 +0000
+
+    upstream: fix memleak in ssh_free_identitylist(); ok markus@
+    
+    OpenBSD-Commit-ID: aa51f77ae2c5330a1f61b2d22933f24a443f9abf
+
+commit 85443f165b4169b2a448b3e24bc1d4dc5b3156a4
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Sep 3 08:27:52 2019 +0000
+
+    upstream: factor out confirm_overwrite(); ok markus@
+    
+    OpenBSD-Commit-ID: 304e95381b39c774c8fced7e5328b106a3ff0400
+
+commit 9a396e33685633581c67d5ad9664570ef95281f2
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Sep 2 23:46:46 2019 +0000
+
+    upstream: constify an argument
+    
+    OpenBSD-Commit-ID: 724bafc9f993746ad4303e95bede2c030de6233b
+
+commit b52c0c2e64988277a35a955a474d944967059aeb
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Sep 2 00:19:25 2019 +0000
+
+    upstream: downgrade PKCS#11 "provider returned no slots" warning
+    
+    from log level error to debug. This is common when attempting to enumerate
+    keys on smartcard readers with no cards plugged in. bz#3058 ok dtucker@
+    
+    OpenBSD-Commit-ID: bb8839ddeb77c271390488af1b771041d43e49c6
+
+commit 0713322e18162463c5ab5ddfb9f935055ca775d8
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Sep 1 23:47:32 2019 +0000
+
+    upstream: print comment when printing pubkey from private
+    
+    bz#3052; ok dtucker
+    
+    OpenBSD-Commit-ID: a91b2a8d5f1053d34d7fce44523c53fb534ba914
+
+commit 368f1cc2fbd6ad10c66bc1b67c2c04aebf8a04a8
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Sep 2 10:28:42 2019 +1000
+
+    fixed test in OSX closefrom() replacement
+    
+    from likan_999.student AT sina.com
+
+commit 6b7c53498def19a14dd9587bf521ab6dbee8988f
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Sep 2 10:22:02 2019 +1000
+
+    retain Solaris PRIV_FILE_LINK_ANY in sftp-server
+    
+    Dropping this privilege removes the ability to create hard links to
+    files owned by other users. This is required for the legacy sftp rename
+    operation.
+    
+    bz#3036; approach ok Alex Wilson (the original author of the Solaris
+    sandbox/pledge replacement code)
+
+commit e50f808712393e86d69e42e9847cdf8d473412d7
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Aug 30 05:08:28 2019 +0000
+
+    upstream: Use ed25519 for most hostkey rotation tests since it's
+    
+    supported even when built without OpenSSL.  Use RSA for the secondary type
+    test if supported, otherwise skip it.  Fixes this test for !OpenSSL builds.
+    
+    OpenBSD-Regress-ID: 101cb34a84fd974c623bdb2e496f25a6e91be109
+
+commit 5e4796c47dd8d6c38fb2ff0b3e817525fed6040d
+Author: bluhm@openbsd.org <bluhm@openbsd.org>
+Date:   Thu Aug 22 21:47:27 2019 +0000
+
+    upstream: Test did not compile due to missing symbols. Add source
+    
+    sshbuf-misc.c to regress as it was done in ssh make file. from Moritz Buhl
+    
+    OpenBSD-Regress-ID: 9e1c23476bb845f3cf3d15d9032da3ed0cb2fcf5
+
+commit e0e7e3d0e26f2c30697e6d0cfc293414908963c7
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Aug 30 14:26:19 2019 +1000
+
+    tweak warning flags
+    
+    Enable -Wextra if compiler supports it
+    
+    Set -Wno-error=format-truncation if available to prevent expected
+    string truncations in openbsd-compat from breaking -Werror builds
+
+commit 28744182cf90e0073b76a9e98de58a47e688b2c4
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Aug 30 13:21:38 2019 +1000
+
+    proc_pidinfo()-based closefrom() for OS X
+    
+    Refactor closefrom() to use a single brute-force close() loop fallback.
+    
+    Based on patch from likan_999.student@sina.com in bz#3049. ok dtucker@
+
+commit dc2ca588144f088a54febebfde3414568dc73d5f
+Author: kn@openbsd.org <kn@openbsd.org>
+Date:   Fri Aug 16 11:16:32 2019 +0000
+
+    upstream: Call comma-separated lists as such to clarify semantics
+    
+    Options such as Ciphers take values that may be a list of ciphers;  the
+    complete list, not indiviual elements, may be prefixed with a dash or plus
+    character to remove from or append to the default list respectively.
+    
+    Users might read the current text as if each elment took an optional prefix,
+    so tweak the wording from "values" to "list" to prevent such ambiguity for
+    all options supporting this semantics (those that provide a list of
+    available elements via "ssh -Q ...").
+    
+    Input and OK jmc
+    
+    OpenBSD-Commit-ID: 4fdd175b0e5f5cb10ab3f26ccc38a93bb6515d57
+
+commit c4736f39e66729ce2bf5b06ee6b391e092b48f47
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Aug 16 06:35:27 2019 +0000
+
+    upstream: include sshbuf-misc.c in SRCS_BASE
+    
+    OpenBSD-Commit-ID: 99dd10e72c04e93849981d43d64c946619efa474
+
+commit d0e51810f332fe44ebdba41113aacf319d35f5a5
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Aug 24 15:12:11 2019 +1000
+
+    Fix pasto in fallback code.
+    
+    There is no parameter called "pathname", it should simply be "path".
+    bz#3059, patch from samuel at cendio.se.
+
+commit e83c989bfd9fc9838b7dfb711d1dc6da81814045
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Aug 23 10:19:30 2019 +1000
+
+    use SC_ALLOW_ARG_MASK to limit mmap protections
+    
+    Restrict to PROT_(READ|WRITE|NONE), i.e. exclude PROT_EXEC
+
+commit f6906f9bf12c968debec3671bbf19926ff8a235b
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Aug 23 10:08:48 2019 +1000
+
+    allow mprotect(2) with PROT_(READ|WRITE|NONE) only
+    
+    Used by some hardened heap allocators. Requested by Yegor
+    Timoshenko in https://github.com/openssh/openssh-portable/pull/142
+
+commit e3b6c966b79c3ea5d51b923c3bbdc41e13b96ea0
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Aug 16 06:13:15 2019 +0000
+
+    upstream: switch percent_expand() to use sshbuf instead of a limited
+    
+    fixed buffer; ok markus@
+    
+    OpenBSD-Commit-ID: 3f9ef20bca5ef5058b48c1cac67c53b9a1d15711
+
+commit 9ab5b9474779ac4f581d402ae397f871ed16b383
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Aug 9 05:05:54 2019 +0000
+
+    upstream: produce a useful error message if the user's shell is set
+    
+    incorrectly during "match exec" processing. bz#2791 reported by Dario
+    Bertini; ok dtucker
+    
+    OpenBSD-Commit-ID: cf9eddd6a6be726cb73bd9c3936f3888cd85c03d
+
+commit 8fdbc7247f432578abaaca1b72a0dbf5058d67e5
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Aug 9 04:24:03 2019 +0000
+
+    upstream: Change description of TCPKeepAlive from "inactive" to
+    
+    "unresponsive" to clarify what it checks for.  Patch from jblaine at
+    kickflop.net via github pr#129, ok djm@.
+    
+    OpenBSD-Commit-ID: 3682f8ec7227f5697945daa25d11ce2d933899e9
+
+commit 7afc45c3ed72672690014dc432edc223b23ae288
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Aug 8 08:02:57 2019 +0000
+
+    upstream: Allow the maximimum uint32 value for the argument passed to
+    
+    -b which allows better error messages from later validation.  bz#3050, ok
+    djm@
+    
+    OpenBSD-Commit-ID: 10adf6876b2401b3dc02da580ebf67af05861673
+
+commit c31e4f5fb3915c040061981a67224de7650ab34b
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date:   Mon Aug 5 21:45:27 2019 +0000
+
+    upstream: Many key types are supported now, so take care to check
+    
+    the size restrictions and apply the default size only to the matching key
+    type. tweak and ok dtucker@
+    
+    OpenBSD-Commit-ID: b825de92d79cc4cba19b298c61e99909488ff57e
+
+commit 6b39a7b49ebacec4e70e24bfc8ea2f11057aac22
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Mon Aug 5 11:50:33 2019 +0000
+
+    upstream: Remove now-redundant perm_ok arg since
+    
+    sshkey_load_private_type will now return SSH_ERR_KEY_BAD_PERMISSIONS in that
+    case.  Patch from jitendra.sharma at intel.com, ok djm@
+    
+    OpenBSD-Commit-ID: 07916a17ed0a252591b71e7fb4be2599cb5b0c77
+
+commit d46075b923bf25e6f25959a3f5b458852161cb3e
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Aug 5 21:36:48 2019 +1000
+
+    Fix mem leak in unit test.
+    
+    Patch from jitendra.sharma at intel.com.
+
+commit c4ffb72593c08921cf9291bc05a5ef1d0aaa6891
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Aug 2 01:41:24 2019 +0000
+
+    upstream: fix some memleaks in test_helper code
+    
+    bz#3037 from Jitendra Sharma
+    
+    OpenBSD-Regress-ID: 71440fa9186f5842a65ce9a27159385c6cb6f751
+
+commit 6e76e69dc0c7712e9ac599af34bd091b0e7dcdb5
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Aug 2 01:23:19 2019 +0000
+
+    upstream: typo; from Christian Hesse
+    
+    OpenBSD-Commit-ID: 82f6de7438ea7ee5a14f44fdf5058ed57688fdc3
+
+commit 49fa065a1bfaeb88a59abdfa4432d3b9c35b0655
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jul 30 05:04:49 2019 +0000
+
+    upstream: let sshbuf_find/cmp take a void* for the
+    
+    search/comparison argument, instead of a u_char*. Saves callers needing to
+    cast.
+    
+    OpenBSD-Commit-ID: d63b69b7c5dd570963e682f758f5a47b825605ed
+
+commit 7adf6c430d6fc17901e167bc0789d31638f5c2f8
+Author: mestre@openbsd.org <mestre@openbsd.org>
+Date:   Wed Jul 24 08:57:00 2019 +0000
+
+    upstream: When using a combination of a Yubikey+GnuPG+remote
+    
+    forwarding the gpg-agent (and options ControlMaster+RemoteForward in
+    ssh_config(5)) then the codepath taken will call mux_client_request_session
+    -> mm_send_fd -> sendmsg(2). Since sendmsg(2) is not allowed in that codepath
+    then pledge(2) kills the process.
+    
+    The solution is to add "sendfd" to pledge(2), which is not too bad considering
+    a little bit later we reduce pledge(2) to only "stdio proc tty" in that
+    codepath.
+    
+    Problem reported and diff provided by Timothy Brown <tbrown at freeshell.org>
+    
+    OK deraadt@
+    
+    OpenBSD-Commit-ID: 7ce38b6542bbec00e441595d0a178e970a9472ac
+
+commit 0e2fe18acc1da853a9120c2e9af68e8d05e6503e
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Tue Jul 23 23:06:57 2019 +0000
+
+    upstream: Fix typo in CASignatureAlgorithms wherein what should be
+    
+    a comma is a dot. Patch from hnj2 via github pr#141.
+    
+    OpenBSD-Commit-ID: 01f5a460438ff1af09aab483c0a70065309445f0
+
+commit e93ffd1a19fc47c49d68ae2fb332433690ecd389
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Jul 29 16:04:01 2019 +1000
+
+    Report success of individual tests as well as all.
+    
+    This puts the "all tests passed" message back at the end where the
+    test harnesses can find it.
+
+commit 2ad5b36b18bddf2965fe60384c29b3f1d451b4ed
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Jul 29 09:49:23 2019 +1000
+
+    convert to UTF-8; from Mike Frysinger
+
+commit d31e7c937ba0b97534f373cf5dea34675bcec602
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Jul 26 04:22:21 2019 +0000
+
+    upstream: Restrict limit-keytype to types supported by build. This
+    
+    means we have to skip a couple tests when only one key type is supported.
+    
+    OpenBSD-Regress-ID: 22d05befb9c7ce21ce8dc22acf1ffe9e2ef2e95e
+
+commit 0967a233b8a28907ae8a4a6773c89f21d2ace11b
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Jul 25 18:36:28 2019 +1000
+
+    Remove override disabling DH-GEX.
+    
+    The DH-GEX override doesn't work when build without OpenSSL, and
+    we'll prefer curve25519 these days, removing the need for it.
+
+commit 061407efc19b41ab4a7485e5adcff2a12befacdb
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Jul 25 09:17:35 2019 +0000
+
+    upstream: Only use supported key types during KRL test, preferring
+    
+    ed25519 since it's supported by both OpenSSL and non-OpenSSL builds.
+    
+    OpenBSD-Regress-ID: 9f2bb3eadd50fcc8245b1bd8fd6f0e53602f71aa
+
+commit 47f8ff1fa5b76790c1d785815fd13ee6009f8012
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Jul 25 08:48:11 2019 +0000
+
+    upstream: Switch keys-command test from rsa to ed25519 since it's
+    
+    supported for both OpenSSL and non-OpenSSL builds.
+    
+    OpenBSD-Regress-ID: 174be4be876edd493e4a5c851e5bc579885e7a0a
+
+commit 1e94afdfa8df774ab7dd3bad52912b636dc31bbd
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Jul 25 08:28:15 2019 +0000
+
+    upstream: Make certificate tests work with the supported key
+    
+    algorithms.  Allows tests to pass when built without OpenSSL.
+    
+    OpenBSD-Regress-ID: 617169a6dd9d06db3697a449d9a26c284eca20fc
+
+commit 26bf693661a48b97b6023f702b2af643676ac21a
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Tue Jul 23 13:49:14 2019 +0000
+
+    upstream: Construct list of key types to test based on the types
+    
+    supported by the binaries.
+    
+    OpenBSD-Regress-ID: fcbd115efacec8ab0ecbdb3faef79ac696cb1d62
+
+commit 773c55b3d1230e8f7714a1b33873c37b85049c74
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Tue Jul 23 13:32:48 2019 +0000
+
+    upstream: Only use DSA key type in tests if binaries support it.
+    
+    OpenBSD-Regress-ID: 770e31fe61dc33ed8eea9c04ce839b33ddb4dc96
+
+commit 159e987a54d92ccd73875e7581ffc64e8927a715
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Jul 24 14:21:19 2019 +1000
+
+    Split test targets further.
+    
+    Splits test into file-tests, t-exec, unit and interop-tests and their
+    respective dependencies.  Should allow running any set individually
+    without having to build the other dependencies that are not needed
+    for that specific test.
+
+commit 520d4550a2470106d63e30079bb05ce82f3a4f7d
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Jul 24 11:20:18 2019 +1000
+
+    Add lib dependencies for regress binary targets.
+
+commit 4e8d0dd78d5f6142841a07dc8b8c6b4730eaf587
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Jul 24 00:12:51 2019 +1000
+
+    Make "unit" a dependency of "test".
+
+commit 4317b2a0480e293e58ba115e47b49d3a384b6568
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Jul 23 23:24:47 2019 +1000
+
+    upstream rev 1.28: fix comment typo.
+
+commit e0055af2bd39fdb44566ff6594147664e1fac8b8
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Jul 23 23:06:22 2019 +1000
+
+    Split regress-binaries into two targets.
+    
+    Split the binaries for the unit tests out into a regress-unit-binaries
+    target, and add a dependency on it for only the unit tests.  This allows
+    us to run the integration tests only ("make t-exec") without building
+    the unit tests, which allows us to run a subset of the tests when
+    building --without-openssl without trying (and failing) to build the
+    unit tests.
+    
+    This means there are two targets for "unit" which I *think* is valid
+    (it works in testing, and makedepend will generate Makefiles of this
+    form)a but I could be wrong.
+
+commit 7cdf9fdcf11aaaa98c2bd22c92882ea559e772ad
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Tue Jul 23 08:19:29 2019 +0000
+
+    upstream: Skip DH group generation test if binaries don't support
+    
+    DH-GEX.
+    
+    OpenBSD-Regress-ID: 7c918230d969ecf7656babd6191a74526bffbffd
+
+commit 3a3eab8bb0da3d2f0f32cb85a1a268bcca6e4d69
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Tue Jul 23 07:55:29 2019 +0000
+
+    upstream: Only test conversion of key types supported by the
+    
+    binaries.
+    
+    OpenBSD-Regress-ID: e3f0938a0a7407e2dfbb90abc3ec979ab6e8eeea
+
+commit 7e66b7d98c6e3f48a1918c3e1940c9b11b10ec63
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Tue Jul 23 07:39:43 2019 +0000
+
+    upstream: Only add ssh-dss to allowed key types if it's supported
+    
+    by the binary.
+    
+    OpenBSD-Regress-ID: 395a54cab16e9e4ece9aec047ab257954eebd413
+
+commit fd0684b319e664d8821dc4ca3026126dfea3ccf4
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Jul 23 22:36:39 2019 +1000
+
+    Remove sys/cdefs.h include.
+    
+    It's not needed on -portable (that's handled by includes.h) and not all
+    platforms have it.
+
+commit 9634ffbf29b3c2493e69d10b37077b09a8cbf5ff
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Jul 23 22:25:44 2019 +1000
+
+    Add headers to prevent warnings w/out OpenSSL.
+
+commit 2ea60312e1c08dea88982fec68244f89a40912ff
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Jul 23 22:11:50 2019 +1000
+
+    Include stdlib.h for free() and calloc().
+
+commit 11cba2a4523fda447e2554ea457484655bedc831
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Jul 23 21:51:22 2019 +1000
+
+    Re-apply portability changes to current sha2.{c,h}.
+    
+    Rather than attempt to apply 14 years' worth of changes to OpenBSD's sha2
+    I imported the current versions directly then re-applied the portability
+    changes.  This also allowed re-syncing digest-libc.c against upstream.
+
+commit 09159594a3bbd363429ee6fafde57ce77986dd7c
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Jul 23 20:27:51 2019 +1000
+
+    Import current sha2.c and sha2.h from OpenBSD.
+    
+    These are not changed from their original state, the next commit will
+    re-apply the portable changes.
+
+commit 2e6035b900cc9d7432d95084e03993d1b426f812
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Jul 23 08:11:22 2019 +1000
+
+    Rename valgrind "errors" to "failures".
+    
+    When valgrind is enabled, test-exec.sh counts the number of invocations
+    that valgrind detects failures in, not the total number of errors detected.
+    This makes the name to be more accurate.
+
+commit e82c9bb9ffa65725cc2e03ea81cb79ce3387f66b
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Jul 19 18:51:18 2019 +1000
+
+    Skip running sftp-chroot under Valgrind.
+
+commit 41e22c2e05cb950b704945ac9408f6109c9b7848
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Sat Jul 20 09:50:58 2019 +0000
+
+    upstream: Remove the sleeps and thus races from the forwarding
+    
+    test.  They were originally required to work with Protocol 1, but now we can
+    use ssh -N and the control socket without the sleeps. While there, suppress
+    output fro the control exit commands.
+    
+    OpenBSD-Regress-ID: 4c51a1d651242f12c90074c18c61008a74c1c790
+
+commit 0423043c5e54293f4dd56041304fd0046c317be9
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Sat Jul 20 09:37:31 2019 +0000
+
+    upstream: Allow SLEEPTIME to be overridden.
+    
+    OpenBSD-Regress-ID: 1596ab168729954be3d219933b2d01cc93687e76
+
+commit d466b6a5cfba17a83c7aae9f584ab164e2ece0a1
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Sat Jul 20 09:14:40 2019 +0000
+
+    upstream: Move sleep time into a variable so that we can increase
+    
+    it for platforms or configurations that are much slower then usual.
+    
+    OpenBSD-Regress-ID: 88586cabc800062c260d0b876bdcd4ca3f58a872
+
+commit b4a7c9d2b5f928e0b902b580d35dc8b244a3aae0
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jul 19 03:45:44 2019 +0000
+
+    upstream: add regression tests for scp for out-of-destination path file
+    
+    creation by Harry Sintonen via Jakub Jelen in bz3007
+    
+    OpenBSD-Regress-ID: 01ae5fbc6ce400b2df5a84dc3152a9e31f354c07
+
+commit bca0582063f148c7ddf409ec51435a5a726bee4c
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jul 19 03:38:01 2019 +0000
+
+    upstream: Accept the verbose flag when searching for host keys in known
+    
+    hosts (i.e. "ssh-keygen -vF host") to print the matching host's random- art
+    signature too. bz#3003 "amusing, pretty" deraadt@
+    
+    OpenBSD-Commit-ID: 686221a5447d6507f40a2ffba5393984d889891f
+
+commit 5299a09fa2879a068af200c91028fcfa9283c0f0
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Jul 19 13:50:25 2019 +1000
+
+    Revert one dependency per line change.
+    
+    It turns out that having such a large number of lines in the .depend
+    file will cause the memory usage of awk during AC_SUBST to blow up on at
+    least NetBSD's awk, causing configure to fail.
+
+commit 01dddb231f23b4a7b616f9d33a0b9d937f9eaf0e
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Jul 19 13:19:19 2019 +1000
+
+    fix SIGWINCH delivery of Solaris for mux sessions
+    
+    Remove PRIV_PROC_SESSION which was limiting ability to send SIGWINCH
+    signals to other sessions.  bz#3030; report and fix from Darren Moffat
+
+commit 05500af21d27c1a3ddac232b018cc23da7b1ee95
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Jul 19 13:20:03 2019 +1000
+
+    Force dependencies one per line.
+    
+    Force makedepend to output one dependency per line, which will make
+    reading diffs against it much easier.  ok djm@
+
+commit b5bc5d016bbb83eb7f8e685390044e78b1ea1427
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Jul 19 13:18:07 2019 +1000
+
+    make depend.
+
+commit 65333f7454365fe40f7367630e7dd10903b9d99e
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Jul 19 13:16:11 2019 +1000
+
+    Show when skipping valgrind for a test.
+
+commit fccb7eb3436da8ef3dcd22e5936ba1abc7ae6730
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Jul 19 10:41:56 2019 +1000
+
+    Enable connect-privsep test with valgrind.
+    
+    connect-privsep seems to work OK with valgrind now so don't skip
+    valgrind on it.
+
+commit d7423017265c5ae6d0be39340feb6c9f016b1f71
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Jul 19 07:43:07 2019 +1000
+
+    Show valgrind results and error counts.
+
+commit 22b9b3e944880db906c6ac5527c4228bd92b293a
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Jul 18 13:40:12 2019 +1000
+
+    Fix format string integer type in error message.
+
+commit ed46a0c0705895834d3f47a46faa89c2a71b760a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Jul 18 13:26:00 2019 +0000
+
+    upstream: fix off-by-one in sshbuf_dtob64() base64 wrapping that could
+    
+    cause extra newlines to be appended at the end of the base64 text (ugly, but
+    harmless). Found and fixed by Sebastian Kinne
+    
+    OpenBSD-Commit-ID: 9fe290bd68f706ed8f986a7704ca5a2bd32d7b68
+
+commit a192021fedead23c375077f92346336d531f8cad
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Jul 18 11:09:38 2019 +1000
+
+    Fail tests if Valgrind enabled and reports errors.
+    
+    Also dump the failing valgrind report to stdout (not the cleanest
+    solution, but better than nothing).
+
+commit d1c491ecb939ee10b341fa7bb6205dff19d297e5
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Jul 18 10:17:54 2019 +1000
+
+    Allow low-priv tests to write to pipe dir.
+    
+    When running regression tests with Valgrind and SUDO, the low-priv agent
+    tests need to be able to create pipes in the appropriate directory.
+
+commit 8a5bb3e78191cc206f970c26d2a26c949971e91a
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Jul 17 21:24:55 2019 +1000
+
+    Put valgrind vgdb files to a specific directory.
+    
+    Valgrind by default puts vgdb files and pipes under /tmp, however it
+    is not always able to clean them up, which can cause test failures when
+    there's a pid/file collision.  Using a specific directory ensures that
+    we can clean up and start clean.
+
+commit f8829fe57fb0479d6103cfe1190095da3c032c6d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jul 16 22:16:49 2019 +0000
+
+    upstream: adapt to sshbuf_dtob64() change
+    
+    OpenBSD-Regress-ID: 82374a83edf0955fd1477169eee3f5d6467405a6
+
+commit 1254fcbb2f005f745f2265016ee9fa52e16d37b0
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Tue Jul 16 03:21:54 2019 +0000
+
+    upstream: Remove ssh1 files from CLEANFILES since ssh1 no longer
+    
+    supported.
+    
+    OpenBSD-Regress-ID: 5b9ae869dc669bac05939b4a2fdf44ee067acfa0
+
+commit 9dc81a5adabc9a7d611ed2e63fbf4c85d43b15c6
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Tue Jul 16 02:09:29 2019 +0000
+
+    upstream: Update names of host key files in CLEANFILES to match
+    
+    recent changes to the tests.
+    
+    OpenBSD-Regress-ID: 28743052de3acf70b06f18333561497cd47c4ecf
+
+commit e44e4ad1190db22ed407a79f32a8cff5bcd2b815
+Author: Damien Miller <djm@mindrot.org>
+Date:   Tue Jul 16 23:26:53 2019 +1000
+
+    depend
+
+commit 16dd8b2c78a0de106c7429e2a294d203f6bda3c7
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jul 16 13:18:39 2019 +0000
+
+    upstream: remove mostly vestigal uuencode.[ch]; moving the only unique
+    
+    functionality there (wrapping of base64-encoded data) to sshbuf functions;
+    feedback and ok markus@
+    
+    OpenBSD-Commit-ID: 4dba6735d88c57232f6fccec8a08bdcfea44ac4c
+
+commit 45478898f9590b5cc8bc7104e573b84be67443b0
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Jul 16 09:20:23 2019 +1000
+
+    Hook memmem compat code into build.
+    
+    This fixes builds on platforms that don't have it (at least old DragonFly,
+    probably others).
+
+commit c7bd4617293a903bd3fac3394a7e72d439af49a5
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Jul 16 09:07:18 2019 +1000
+
+    Import memmem.c from OpenBSD.
+
+commit 477e2a3be8b10df76e8d76f0427b043280d73d68
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jul 15 13:12:02 2019 +0000
+
+    upstream: unit tests for sshbuf_cmp() and sshbuf_find(); ok markus
+    
+    OpenBSD-Regress-ID: b52d36bc3ab6dc158c1e59a9a4735f821cf9e1fd
+
+commit eb0d8e708a1f958aecd2d6e2ff2450af488d4c2a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jul 15 13:16:29 2019 +0000
+
+    upstream: support PKCS8 as an optional format for storage of
+    
+    private keys, enabled via "ssh-keygen -m PKCS8" on operations that save
+    private keys to disk.
+    
+    The OpenSSH native key format remains the default, but PKCS8 is a
+    superior format to PEM if interoperability with non-OpenSSH software
+    is required, as it may use a less terrible KDF (IIRC PEM uses a single
+    round of MD5 as a KDF).
+    
+    adapted from patch by Jakub Jelen via bz3013; ok markus
+    
+    OpenBSD-Commit-ID: 027824e3bc0b1c243dc5188504526d73a55accb1
+
+commit e18a27eedccb024acb3cd9820b650a5dff323f01
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jul 15 13:11:38 2019 +0000
+
+    upstream: two more bounds-checking sshbuf counterparts to common
+    
+    string operations: sshbuf_cmp() (bcmp-like) and sshbuf_find() (memmem like)
+    
+    feedback and ok markus@
+    
+    OpenBSD-Commit-ID: fd071ec2485c7198074a168ff363a0d6052a706a
+
+commit bc551dfebb55845537b1095cf3ccd01640a147b7
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Jul 15 12:52:45 2019 +1000
+
+    Clear valgrind-out dir to prevent collisions.
+
+commit 5db9ba718e983661a9114ae1418f6e412d1f52d5
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Jul 15 12:02:27 2019 +1000
+
+    Allow agent tests to write to valgrind dir.
+
+commit 121e48fa5305f41f0477d9908e3d862987a68a84
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Jul 14 23:33:19 2019 +0000
+
+    upstream: unit tests for sshbuf_peek/poke bounds-checked random access
+    
+    functions. ok markus@
+    
+    OpenBSD-Regress-ID: 034c4284b1da6b12e25c762a6b958efacdafbaef
+
+commit 101d164723ffbc38f8036b6f3ea3bfef771ba250
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Jul 14 23:32:27 2019 +0000
+
+    upstream: add some functions to perform random-access read/write
+    
+    operations inside buffers with bounds checking. Intended to replace manual
+    pointer arithmetic wherever possible.
+    
+    feedback and ok markus@
+    
+    OpenBSD-Commit-ID: 91771fde7732738f1ffed078aa5d3bee6d198409
+
+commit 7250879c72d28275a53f2f220e49646c3e42ef18
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jul 12 04:08:39 2019 +0000
+
+    upstream: include SHA2-variant RSA key algorithms in KEX proposal;
+    
+    allows ssh-keyscan to harvest keys from servers that disable olde SHA1
+    ssh-rsa. bz#3029 from Jakub Jelen
+    
+    OpenBSD-Commit-ID: 9f95ebf76a150c2f727ca4780fb2599d50bbab7a
+
+commit a0876bd994cab9ba6e47ba2a163a4417c7597487
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jul 12 03:56:21 2019 +0000
+
+    upstream: print explicit "not modified" message if a file was
+    
+    requested for resumed download but was considered already complete.
+    
+    bz#2978 ok dtucker
+    
+    OpenBSD-Commit-ID: f32084b26a662f16215ee4ca4a403d67e49ab986
+
+commit b9b0f2ac9625933db53a35b1c1ce423876630558
+Author: tb@openbsd.org <tb@openbsd.org>
+Date:   Wed Jul 10 07:04:27 2019 +0000
+
+    upstream: Fix a typo and make <esc><right> move right to the
+    
+    closest end of a word just like <esc><left> moves left to the closest
+    beginning of a word.
+    
+    ok djm
+    
+    OpenBSD-Commit-ID: 6afe01b05ed52d8b12eb1fda6e9af5afb5e198ee
+
+commit 8729498a5d239980a91d32f031b34e8c58c52f62
+Author: Damien Miller <djm@mindrot.org>
+Date:   Wed Jul 10 09:43:19 2019 +1000
+
+    fix typo that prevented detection of Linux VRF
+    
+    Reported by hexiaowen AT huawei.com
+
+commit 5b2b79ff7c057ee101518545727ed3023372891d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jul 9 04:15:00 2019 +0000
+
+    upstream: cap the number of permiopen/permitlisten directives we're
+    
+    willing to parse on a single authorized_keys line; ok deraadt@
+    
+    OpenBSD-Commit-ID: a43a752c2555d26aa3fc754805a476f6e3e30f46
+
+commit eb0b51dac408fadd1fd13fa6d726ab8fdfcc4152
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Jul 8 17:27:26 2019 +1000
+
+    Move log.h include inside ifdefs.
+    
+    Fixes build on some other platforms that don't have va_list immediately
+    available (eg NetBSD).
+
+commit 43702f8e6fa22a258e25c4dd950baaae0bc656b7
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Jul 6 23:07:04 2019 +1000
+
+    Include log.h for debug() and friends.
+    
+    Should fix some compiler warnings on IRIX (bz#3032).
+
+commit 53a6ebf1445a857f5e487b18ee5e5830a9575149
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Jul 8 13:44:32 2019 +1000
+
+    sftp-realpath.c needs includes.h
+
+commit 4efe1adf05ee5d3fce44320fcff68735891f4ee6
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Jul 8 13:38:39 2019 +1000
+
+    remove realpath() compat replacement
+    
+    We shipped a BSD implementation of realpath() because sftp-server
+    depended on its behaviour.
+    
+    OpenBSD is now moving to a more strictly POSIX-compliant realpath(2),
+    so sftp-server now unconditionally requires its own BSD-style realpath
+    implementation. As such, there is no need to carry another independant
+    implementation in openbsd-compat.
+    
+    ok dtucker@
+
+commit 696fb4298e80f2ebcd188986a91b49af3b7ca14c
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Sun Jul 7 01:05:00 2019 +0000
+
+    upstream: Remove some set but never used variables. ok daraadt@
+    
+    OpenBSD-Commit-ID: 824baf9c59afc66a4637017e397b9b74a41684e7
+
+commit 156e9e85e92b46ca90226605d9eff49e8ec31b22
+Author: deraadt@openbsd.org <deraadt@openbsd.org>
+Date:   Fri Jul 5 12:35:40 2019 +0000
+
+    upstream: still compile uuencode.c, unbreaks build
+    
+    OpenBSD-Commit-ID: 5ea3d63ab972691f43e9087ab5fd8376d48e898f
+
+commit cec9ee527a12b1f6c2e0a1c155fec64a38d71cf6
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jul 5 07:32:01 2019 +0000
+
+    upstream: revert header removal that snuck into previous
+    
+    OpenBSD-Commit-ID: 3919cdd58989786660b8269b325646ef8856428e
+
+commit 569b650f93b561c09c655f83f128e1dfffe74101
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jul 5 04:55:40 2019 +0000
+
+    upstream: add a local implementation of BSD realpath() for
+    
+    sftp-server use ahead of OpenBSD's realpath changing to match POSIX;
+    
+    ok deraadt@ (thanks for snaps testing)
+    
+    OpenBSD-Commit-ID: 4f8cbf7ed8679f6237264301d104ecec64885d55
+
+commit b8e2b797362526437e0642a6c2f2970d794f2561
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Jul 6 13:13:57 2019 +1000
+
+    Add prototype for strnlen to prevent warnings.
+
+commit 4c3e00b1ed7e596610f34590eb5d54ee50d77878
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Jul 6 13:02:34 2019 +1000
+
+    Cast *ID types to unsigned long when printing.
+    
+    UID and GID types vary by platform so cast to u_long and use %lu when
+    printing them to prevent warnings.
+
+commit 2753521e899f30d1d58b5da0b4e68fde6fcf341e
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Jul 6 12:54:43 2019 +1000
+
+    Add prototype for compat strndup.(bz#3032).
+
+commit 01a1e21cd55d99293c8ff8ed7c590f2ee440da43
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Jul 6 12:00:41 2019 +1000
+
+    Add missing bracket in EGD seeding code.
+    
+    When configured --with-prngd-socket the code had a missing bracket after
+    an API change.  Fix that and a couple of warnings.  bz#3032 , from
+    ole.weidner at protonmail.ch
+
+commit e187b1d4607392cf2c19243afe0d0311a4ff3591
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Jul 5 04:19:39 2019 +0000
+
+    upstream: Add (recently added) rsa_oldfmt to CLEANFILES.
+    
+    OpenBSD-Regress-ID: 405beda94e32aa6cc9c80969152fab91f7c54bd3
+
+commit 74b541bfabdcb57c1683cd9b3f1d1f4d5e41563e
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Jul 5 04:12:46 2019 +0000
+
+    upstream: Adapt the PuTTY/Conch tests to new key names.
+    
+    A recent regress change (2a9b3a2ce411d16cda9c79ab713c55f65b0ec257 in
+    portable) broke the PuTTY and Twisted Conch interop tests, because the
+    key they want to use is now called ssh-rsa rather than rsa.  Adapt the
+    tests to the new file names.  bz#3020, patch from cjwatson at debian.org.
+    
+    OpenBSD-Regress-ID: fd342a37db4d55aa4ec85316f73082c8eb96e64e
+
+commit de08335a4cfaa9b7081e94ea4a8b7153c230546d
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Jul 5 04:03:13 2019 +0000
+
+    upstream: Add a sleep to allow forwards to come up.
+    
+    Currently when the multiplex client requests a forward it returns
+    once the request has been sent but not necessarily when the forward
+    is up.  This causes intermittent text failures due to this race,
+    so add some sleeps to mitigate this until we can fix it properly.
+    
+    OpenBSD-Regress-ID: 384c7d209d2443d25ea941d7f677e932621fb253
+
+commit 4d249284729f864faa2e8f3e015f9a41b674544a
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Jul 5 14:58:57 2019 +1000
+
+    Remove nc stderr redirection to resync w/OpenBSD.
+
+commit c5cfa90e03432181ffcc7ad3f9f815179bd0c626
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Jul 5 13:21:45 2019 +1000
+
+    Do not fatal on failed lookup of group "tty".
+    
+    Some platforms (eg AIX and Cygwin) do not have a "tty" group.  In those
+    cases we will fall back to making the tty device the user's primary
+    group, so do not fatal if the group lookup fails.  ok djm@
+
+commit 8b4cc4bdc8a70bf209a274fa2b2a49c1e3c8d8a2
+Author: deraadt@openbsd.org <deraadt@openbsd.org>
+Date:   Thu Jul 4 16:20:10 2019 +0000
+
+    upstream: fatal() if getgrnam() cannot find "tty"
+    
+    OpenBSD-Commit-ID: d148c1c052fa0ed7d105b5428b5c1bab91630048
+
+commit 48cccc275c6a1e91d3f80fdb0dc0d5baf529aeca
+Author: deraadt@openbsd.org <deraadt@openbsd.org>
+Date:   Thu Jul 4 16:16:51 2019 +0000
+
+    upstream: stat() returns precisely -1 to indicate error
+    
+    OpenBSD-Commit-ID: 668e8d022ed4ab847747214f64119e5865365fa1
+
+commit 8142fcaf9ed8ff66252deecbfd29fc59d5f2df4f
+Author: deraadt@openbsd.org <deraadt@openbsd.org>
+Date:   Wed Jul 3 03:24:02 2019 +0000
+
+    upstream: snprintf/vsnprintf return < 0 on error, rather than -1.
+    
+    OpenBSD-Commit-ID: a261c421140a0639bb2b66bbceca72bf8239749d
+
+commit 4d28fa78abce2890e136281950633fae2066cc29
+Author: deraadt@openbsd.org <deraadt@openbsd.org>
+Date:   Fri Jun 28 13:35:04 2019 +0000
+
+    upstream: When system calls indicate an error they return -1, not
+    
+    some arbitrary value < 0.  errno is only updated in this case.  Change all
+    (most?) callers of syscalls to follow this better, and let's see if this
+    strictness helps us in the future.
+    
+    OpenBSD-Commit-ID: 48081f00db7518e3b712a49dca06efc2a5428075
+
+commit e8c974043c1648eab0ad67a7ba6a3e444fe79d2d
+Author: deraadt@openbsd.org <deraadt@openbsd.org>
+Date:   Fri Jun 28 05:44:09 2019 +0000
+
+    upstream: asprintf returns -1, not an arbitrary value < 0. Also
+    
+    upon error the (very sloppy specification) leaves an undefined value in *ret,
+    so it is wrong to inspect it, the error condition is enough. discussed a
+    little with nicm, and then much more with millert until we were exasperated
+    
+    OpenBSD-Commit-ID: 29258fa51edf8115d244b9d4b84028487bf8923e
+
+commit 1b2d55d15c6240c15a1e1cf4203b82e54a766272
+Author: deraadt@openbsd.org <deraadt@openbsd.org>
+Date:   Fri Jun 28 01:23:50 2019 +0000
+
+    upstream: oops, from asou
+    
+    OpenBSD-Commit-ID: 702e765d1639b732370d8f003bb84a1c71c4d0c6
+
+commit 5cdbaa78fcb718c39af4522d98016ad89d065427
+Author: deraadt@openbsd.org <deraadt@openbsd.org>
+Date:   Thu Jun 27 18:03:37 2019 +0000
+
+    upstream: Some asprintf() calls were checked < 0, rather than the
+    
+    precise == -1. ok millert nicm tb, etc
+    
+    OpenBSD-Commit-ID: caecf8f57938685c04f125515b9f2806ad408d53
+
+commit b2e3e57be4a933d9464bccbe592573725765486f
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Jun 27 06:29:35 2019 +0000
+
+    upstream: fix NULL deference (bzero) on err
+    
+    =?UTF-8?q?or=20path=20added=20in=20last=20commit;=20spotted=20by=20Reynir?=
+    =?UTF-8?q?=20Bj=C3=B6rnsson?=
+    MIME-Version: 1.0
+    Content-Type: text/plain; charset=UTF-8
+    Content-Transfer-Encoding: 8bit
+    
+    ok deraadt@ markus@ tb@
+    
+    OpenBSD-Commit-ID: b11b084bcc551b2c630560eb08618dd501027bbd
+
+commit 58ceacdcbaebefc77d120712de55c6fc6aa32bb1
+Author: Jitendra Sharma <jitendra.sharma@intel.com>
+Date:   Fri Jun 21 09:54:17 2019 +0530
+
+    Update README doc to include missing test cases
+    
+    Readme regress document is missing various individual tests,
+    which are supported currently. Update README to
+    include those test cases.
+
+commit 7959330a554051b5587f8af3fec0c2c0d5820f64
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Wed Jun 26 22:29:43 2019 +0000
+
+    upstream: Remove unneeded unlink of xauthfile o
+    
+    =?UTF-8?q?n=20error=20path.=20=20From=20Erik=20Sj=C3=B6lund=20via=20githu?=
+    =?UTF-8?q?b,=20ok=20djm@=20deraadt@?=
+    MIME-Version: 1.0
+    Content-Type: text/plain; charset=UTF-8
+    Content-Transfer-Encoding: 8bit
+    
+    OpenBSD-Commit-ID: 62a4893cf83b29a4bbfedc40e7067c25c203e632
+
+commit 8de52eb224143783a49f9bddd9ab7800022a8276
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Jun 23 12:21:46 2019 +0000
+
+    upstream: fix mismatch proto/decl from key shielding change; spotted
+    
+    via oss-fuzz
+    
+    OpenBSD-Commit-ID: 1ea0ba05ded2c5557507bd844cd446e5c8b5b3b7
+
+commit 1dfadb9b57c2985c95838a0292d1c2f6a501896e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jun 21 04:21:45 2019 +0000
+
+    upstream: adapt for key shielding API changes (const removal)
+    
+    OpenBSD-Regress-ID: 298890bc52f0cd09dba76dc1022fabe89bc0ded6
+
+commit 4f7a56d5e02e3d04ab69eac1213817a7536d0562
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jun 21 04:21:04 2019 +0000
+
+    upstream: Add protection for private keys at rest in RAM against
+    
+    speculation and memory sidechannel attacks like Spectre, Meltdown, Rowhammer
+    and Rambleed. This change encrypts private keys when they are not in use with
+    a symmetic key that is derived from a relatively large "prekey" consisting of
+    random data (currently 16KB).
+    
+    Attackers must recover the entire prekey with high accuracy before
+    they can attempt to decrypt the shielded private key, but the current
+    generation of attacks have bit error rates that, when applied
+    cumulatively to the entire prekey, make this unlikely.
+    
+    Implementation-wise, keys are encrypted "shielded" when loaded and then
+    automatically and transparently unshielded when used for signatures or
+    when being saved/serialised.
+    
+    Hopefully we can remove this in a few years time when computer
+    architecture has become less unsafe.
+    
+    been in snaps for a bit already; thanks deraadt@
+    
+    ok dtucker@ deraadt@
+    
+    OpenBSD-Commit-ID: 19767213c312e46f94b303a512ef8e9218a39bd4
+
+commit 4cd6b12cc9c10bf59c8b425041f3ea5091285a0f
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jun 21 03:19:59 2019 +0000
+
+    upstream: print the correct AuthorizedPrincipalsCommand rather than
+    
+    an uninitialised variable; spotted by dtucker@
+    
+    OpenBSD-Commit-ID: 02802018784250f68202f01c8561de82e17b0638
+
+commit 5f68ab436b0e01751d564e9a9041e6ac3673e45a
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Wed Jun 19 20:12:44 2019 +0000
+
+    upstream: from tim: - for reput, it is remote-path which is
+    
+    optional, not local-path - sync help
+    
+    from deraadt:
+    - prefer -R and undocument -r (but add a comment for future editors)
+    
+    from schwarze:
+    - prefer -p and undocument -P (as above. the comment was schwarze's too)
+    
+    more:
+    - add the -f flag to reput and reget
+    - sort help (i can;t remember who suggested this originally)
+    
+    djm and deraadt were ok with earlier versions of this;
+    tim and schwarze ok
+    
+    OpenBSD-Commit-ID: 3c699b53b46111f5c57eed4533f132e7e58bacdd
+
+commit 99bcbbc77fbd5a5027031f42a5931b21b07c947e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jun 14 04:03:48 2019 +0000
+
+    upstream: check for convtime() refusing to accept times that
+    
+    resolve to LONG_MAX Reported by Kirk Wolf bz2977; ok dtucker
+    
+    OpenBSD-Regress-ID: 15c9fe87be1ec241d24707006a31123d3a3117e0
+
+commit e5cccb2410247c9b8151b9510a876abdf5424b24
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Sun Apr 28 22:53:26 2019 +0000
+
+    upstream: Add unit tests for user@host and URI parsing.
+    
+    OpenBSD-Regress-ID: 69d5b6f278e04ed32377046f7692c714c2d07a68
+
+commit 0bb7e38834e3f9886302bbaea630a6b0f8cfb520
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Apr 18 18:57:16 2019 +0000
+
+    upstream: Add tests for sshd -T -C with Match.
+    
+    OpenBSD-Regress-ID: d4c34916fe20d717692f10ef50b5ae5a271c12c7
+
+commit 73eb6cef41daba0359c1888e4756108d41b4e819
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sun Jun 16 12:55:27 2019 +1000
+
+    Include stdio.h for vsnprintf.
+    
+    Patch from mforney at mforney.org.
+
+commit adcaf40fd0a180e6cb5798317fdf479b52e3c09a
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Jun 8 09:07:04 2019 +1000
+
+    upstream rev 1.27: fix integer overflow.
+    
+    Cast bitcount to u_in64_t before bit shifting to prevent integer overflow
+    on 32bit platforms which cause incorrect results when adding a block
+    >=512M in size.  sha1 patch from ante84 at gmail.com via openssh github,
+    sha2 with djm@, ok tedu@
+
+commit 7689048e6103d3c34cba24ac5aeea7bf8405d19a
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Jun 8 09:06:06 2019 +1000
+
+    upstream rev 1.25: add DEF_WEAK.
+    
+    Wrap blowfish, sha*, md5, and rmd160 so that internal calls go direct
+    ok deraadt@
+
+commit 55f3153393ac7e072a4b4b21b194864460d8f44a
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Jun 8 09:02:24 2019 +1000
+
+    upstream rev 1.25: add sys/types.h
+
+commit 10974f986fa842a3a3a693e3d5761072540002b4
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Jun 8 09:01:14 2019 +1000
+
+    upstream: Use explicit_bzero instead of memset
+    
+    in hash Final and End functions.  OK deraadt@ djm@
+
+commit cb8f56570f70b00abae4267d4bcce2bfae7dfff6
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jun 14 04:13:58 2019 +0000
+
+    upstream: slightly more instructive error message when the user
+    
+    specifies multiple -J options on the commandline. bz3015 ok dtucker@
+    
+    OpenBSD-Commit-ID: 181c15a65cac3b575819bc8d9a56212c3c748179
+
+commit 2317ce4b0ed7d8c4b0c684e2d47bff5006bd1178
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jun 14 03:51:47 2019 +0000
+
+    upstream: process agent requests for RSA certificate private keys using
+    
+    correct signature algorithm when requested. Patch from Jakub Jelen in bz3016
+    ok dtucker markus
+    
+    OpenBSD-Commit-ID: 61f86efbeb4a1857a3e91298c1ccc6cf49b79624
+
+commit c95b90d40170473825904be561b1eafba354f376
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jun 14 03:39:59 2019 +0000
+
+    upstream: for public key authentication, check AuthorizedKeysFiles
+    
+    files before consulting AuthorizedKeysCommand; ok dtucker markus
+    
+    OpenBSD-Commit-ID: 13652998bea5cb93668999c39c3c48e8429db8b3
+
+commit a5a53914989ddd3521b6edc452bc3291784a4f4f
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jun 14 03:28:19 2019 +0000
+
+    upstream: if passed a bad fd, log what it was
+    
+    OpenBSD-Commit-ID: 582e2bd05854e49365195b58989b68ac67f09140
+
+commit 7349149da1074d82b71722338e05b6a282f126cc
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Wed Jun 12 11:31:50 2019 +0000
+
+    upstream: Hostname->HostName cleanup; from lauri tirkkonen ok
+    
+    dtucker
+    
+    OpenBSD-Commit-ID: 4ade73629ede63b691f36f9a929f943d4e7a44e4
+
+commit 76af9c57387243556d38935555c227d0b34062c5
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Wed Jun 12 05:53:21 2019 +0000
+
+    upstream: deraadt noticed some inconsistency in the way we denote
+    
+    the "Hostname" and "X11UseLocalhost" keywords; this makes things consistent
+    (effectively reversing my commit of yesterday);
+    
+    ok deraadt markus djm
+    
+    OpenBSD-Commit-ID: 255c02adb29186ac91dcf47dfad7adb1b1e54667
+
+commit d1bbfdd932db9b9b799db865ee1ff50060dfc895
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Tue Jun 11 13:39:40 2019 +0000
+
+    upstream: consistent lettering for "HostName" keyword; from lauri
+    
+    tirkkonen
+    
+    OpenBSD-Commit-ID: 0c267a1257ed7482b13ef550837b6496e657d563
+
+commit fc0340f7c4ee29bfb12bd1de9f99defa797e16b4
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Jun 8 00:10:59 2019 +1000
+
+    Typo fixes in error messages.
+    
+    Patch from knweiss at gmail.com via github pull req #97 (portable-
+    specific parts).
+
+commit 4b7dd22b02b64b1ededd3c0e98a6e7ae21e31d38
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Jun 7 14:18:48 2019 +0000
+
+    upstream: Typo and spelling fixes in comments and error messages.
+    
+    Patch from knweiss at gmail.com via -portable.
+    
+    OpenBSD-Commit-ID: 2577465442f761a39703762c4f87a8dfcb918b4b
+
+commit 130ef0695e1731392ca33831939fe89e8b70cc17
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Jun 8 00:47:07 2019 +1000
+
+    Include missed bits from previous sync.
+
+commit 25e3bccbaa63d27b9d5e09c123f1eb28594d2bd6
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Jun 7 03:47:12 2019 +0000
+
+    upstream: Check for user@host when parsing sftp target. This
+    
+    allows user@[1.2.3.4] to work without a path in addition to with one.
+    bz#2999, ok djm@
+    
+    OpenBSD-Commit-ID: d989217110932490ba8ce92127a9a6838878928b
+
+commit 0323d9b619d512f80c57575b810a05791891f657
+Author: otto@openbsd.org <otto@openbsd.org>
+Date:   Thu Jun 6 05:13:13 2019 +0000
+
+    upstream: Replace calls to ssh_malloc_init() by a static init of
+    
+    malloc_options. Prepares for changes in the way malloc is initialized.  ok
+    guenther@ dtucker@
+    
+    OpenBSD-Commit-ID: 154f4e3e174f614b09f792d4d06575e08de58a6b
+
+commit c586d2d3129265ea64b12960c379d634bccb6535
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri May 31 03:20:07 2019 +0000
+
+    upstream: fix ssh-keysign fd handling problem introduced in r1.304
+    
+    caused by a typo (STDIN_FILENO vs STDERR_FILENO)
+    
+    OpenBSD-Commit-ID: 57a0b4be7bef23963afe24150e24bf014fdd9cb0
+
+commit 410b231aa41ff830b2f5b09b5aaf5e5cdc1ab86b
+Author: lum@openbsd.org <lum@openbsd.org>
+Date:   Wed May 29 08:30:26 2019 +0000
+
+    upstream: Make the standard output messages of both methods of
+    
+    changing a key pair's comments (using -c and -C) more applicable to both
+    methods. ok and suggestions djm@ dtucker@
+    
+    OpenBSD-Commit-ID: b379338118109eb36e14a65bc0a12735205b3de6
+
+commit 2b3402dc9f1d9b0df70291b424f36e436cdfa7e0
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Jun 8 00:03:07 2019 +1000
+
+    Always clean up before and after utimensat test.
+
+commit 182898192d4b720e4faeafd5b39c2cfb3b92aa21
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Jun 7 23:47:37 2019 +1000
+
+    Update utimensat test.
+    
+    POSIX specifies that when given a symlink, AT_SYMLINK_NOFOLLOW should
+    update the symlink and not the destination.  The compat code doesn't
+    have a way to do this, so where possible it fails instead of following a
+    symlink when explicitly asked not to. Instead of checking for an explicit
+    failure, check that it does not update the destination, which both the
+    real and compat implmentations should honour.
+    
+    Inspired by github pull req #125 from chutzpah at gentoo.org.
+
+commit d220b675205185e0b4d6b6524acc2e5c599ef0e2
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Jun 7 14:26:54 2019 +1000
+
+    Have pthread_create return errno on failure.
+    
+    According to POSIX, pthread_create returns the failure reason in
+    the non-zero function return code so make the fork wrapper do that.
+    Matches previous change.
+
+commit 1bd4f7f25f653e0cadb2e6f25d79bc3c35c6aa4d
+Author: Elliott Hughes <enh@google.com>
+Date:   Thu Apr 25 13:36:27 2019 -0700
+
+    pthread_create(3) returns positive values on failure.
+    
+    Found by inspection after finding similar bugs in other code used by
+    Android.
+
+commit b3a77b25e5f7880222b179431a74fad76d2cf60c
+Author: Harald Freudenberger <freude@linux.ibm.com>
+Date:   Fri May 24 10:11:15 2019 +0200
+
+    allow s390 specific ioctl for ecc hardware support
+    
+    Adding another s390 specific ioctl to be able to support ECC hardware
+    acceleration to the sandbox seccomp filter rules.
+    
+    Now the ibmca openssl engine provides elliptic curve cryptography
+    support with the help of libica and CCA crypto cards. This is done via
+    jet another ioctl call to the zcrypt device driver and so there is a
+    need to enable this on the openssl sandbox.
+    
+    Code is s390 specific and has been tested, verified and reviewed.
+    
+    Please note that I am also the originator of the previous changes in
+    that area.  I posted these changes to Eduardo and he forwarded the
+    patches to the openssl community.
+    
+    Signed-off-by: Harald Freudenberger <freude@linux.ibm.com>
+    Reviewed-by: Joerg Schmidbauer <jschmidb@de.ibm.com>
+
+commit 2459df9aa11820f8092a8651aeb381af7ebbccb1
+Author: Sorin Adrian Savu <sorin25@users.noreply.github.com>
+Date:   Sun May 26 21:50:08 2019 +0300
+
+    openssl-devel is obsoleted by libssl-devel
+    
+    openssl-devel is no longer installable via the cygwin setup and
+    it's hidden by default, so you can't see the replacement very easy.
+
+commit 85ceb0e64bff672558fc87958cd548f135c83cdd
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Mon May 20 06:01:59 2019 +0000
+
+    upstream: tweak previous;
+    
+    OpenBSD-Commit-ID: 42f39f22f53cfcb913bce401ae0f1bb93e08dd6c
+
+commit 30615295609f5c57b3137b3021fe63bfa45c1985
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon May 20 00:25:55 2019 +0000
+
+    upstream: embiggen format buffer size for certificate serial number so
+    
+    that it will fit a full 64 bit integer. bz#3012 from Manoel Domingues Junior
+    
+    OpenBSD-Commit-ID: a51f3013056d05b976e5af6b978dcb9e27bbc12b
+
+commit 476e3551b2952ef73acc43d995e832539bf9bc4d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon May 20 00:20:35 2019 +0000
+
+    upstream: When signing certificates with an RSA key, default to
+    
+    using the rsa-sha2-512 signature algorithm. Certificates signed by RSA keys
+    will therefore be incompatible with OpenSSH < 7.2 unless the default is
+    overridden.
+    
+    Document the ability of the ssh-keygen -t flag to override the
+    signature algorithm when signing certificates, and the new default.
+    
+    ok deraadt@
+    
+    OpenBSD-Commit-ID: 400c9c15013978204c2cb80f294b03ae4cfc8b95
+
+commit 606077ee1e77af5908431d003fb28461ef7be092
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri May 17 13:14:12 2019 +1000
+
+    Add no-op implementation of pam_putenv.
+    
+    Some platforms such as HP-UX do not have pam_putenv.  Currently the
+    calls are ifdef'ed out, but a new one was recently added.  Remove the
+    ifdefs and add a no-op implementation.  bz#3008, ok djm.
+
+commit 1ac98be8724c9789d770ddb8e7f0dbf1b55e05a0
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri May 17 12:42:17 2019 +1000
+
+    Use the correct macro for SSH_ALLOWED_CA_SIGALGS.
+
+commit 97370f6c2c3b825f8c577b7e6c00b1a98d30a6cf
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri May 17 10:54:51 2019 +1000
+
+    Fix building w/out ECC.
+    
+    Ifdef out ECC specific code so that that it'll build against an OpenSSL
+    configured w/out ECC.  With & ok djm@
+
+commit 633703babf8d9a88da85f23b800e1b88dec7cdbd
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri May 17 10:50:29 2019 +1000
+
+    Conditionalize ECDH methods in CA algos.
+    
+    When building against an OpenSSL configured without ECC, don't include
+    those algos in CASignatureAlgorithms.  ok djm@
+
+commit 5c8d14c512f5d413095b22bdba08a6bb990f1e97
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu May 16 08:47:27 2019 +0000
+
+    upstream: Move a variable declaration to the block where it's used
+    
+    to make things a little tidier for -portable.
+    
+    OpenBSD-Commit-ID: 616379861be95619e5358768b7dee4793e2f3a75
+
+commit a1d29cc36a5e6eeabc935065a8780e1ba5b67014
+Author: deraadt@openbsd.org <deraadt@openbsd.org>
+Date:   Wed May 15 04:43:31 2019 +0000
+
+    upstream: When doing the fork+exec'ing for ssh-keysign, rearrange
+    
+    the socket into fd3, so as to not mistakenly leak other fd forward
+    accidentally. ok djm
+    
+    OpenBSD-Commit-ID: 24cc753f5aa2c6a7d0fbf62766adbc75cd785296
+
+commit db7606d4a62fee67b0cb2f32dfcbd7b3642bfef5
+Author: schwarze@openbsd.org <schwarze@openbsd.org>
+Date:   Tue May 14 12:47:17 2019 +0000
+
+    upstream: Delete some .Sx macros that were used in a wrong way.
+    
+    Part of a patch from Stephen Gregoratto <dev at sgregoratto dot me>.
+    
+    OpenBSD-Commit-ID: 15501ed13c595f135e7610b1a5d8345ccdb513b7
+
+commit cb4accb1233865d9151f8a50cc5f0c61a3fd4077
+Author: florian@openbsd.org <florian@openbsd.org>
+Date:   Fri May 10 18:55:17 2019 +0000
+
+    upstream: For PermitOpen violations add the remote host and port to
+    
+    be able to find out from where the request was comming.
+    
+    Add the same logging for PermitListen violations which where not
+    logged at all.
+    
+    Pointed out by Robert Kisteleki (robert AT ripe.net)
+    
+    input markus
+    OK deraadt
+    
+    OpenBSD-Commit-ID: 8a7d0f1b7175504c0d1dca8d9aca1588b66448c8
+
+commit cd16aceec148d55088fc8df6be88335578d85258
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu May 16 07:53:20 2019 +1000
+
+    Add OpenSSL 1.1.1 to the supported list.
+    
+    Clarify the language around prngd and egd.
+
+commit 6fd4aa2aafbce90acb11a328ca0aa0696cb01c6b
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed May 15 16:19:14 2019 +1000
+
+    Fix typo in man page formatter selector.
+
+commit 285546b73e2c172565c992a695927ac8cf3b4cc6
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri May 10 15:04:42 2019 +1000
+
+    Use "doc" man page format if mandoc present.
+    
+    Previously configure would not select the "doc" man page format if
+    mandoc was present but nroff was not.  This checks for mandoc first
+    and removes a now-superflous AC_PATH_PROG.  Based on a patch from
+    vehk at vehk.de and feedback from schwarze at usta.de.
+
+commit 62dd70613b77b229f53db3cc1c3e8a206fa2b582
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri May 3 06:06:30 2019 +0000
+
+    upstream: Use the correct (according to POSIX) format for
+    
+    left-justification in snmprintf. bz#3002, patch from velemas at gmail.com, ok
+    markus@.
+    
+    OpenBSD-Commit-ID: 65d252b799be0cc8f68b6c47cece0a57bb00fea7
+
+commit 62be1ffe5ffc68cfaac183320503c00a8c72e0b1
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri May 3 04:11:00 2019 +0000
+
+    upstream: Free channel objects on exit path. Patch from markus at
+    
+    blueflash.cc, ok deraadt
+    
+    OpenBSD-Commit-ID: dbe4db381603909482211ffdd2b48abd72169117
+
+commit 1c554a5d94b9de6bd5374e2992a5662746cc39ba
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri May 3 03:27:38 2019 +0000
+
+    upstream: Free host on exit path. Patch from markus at
+    
+    blueflash.cc, ok djm@
+    
+    OpenBSD-Commit-ID: c54e9945d93c4ce28350d8b9fa8b71f744ef2b5a
+
+commit 99043bd64e5e0f427173f4fa83ef25a4676624a3
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri May 3 03:25:18 2019 +0000
+
+    upstream: Wrap XMSS including in ifdef. Patch from markus at
+    
+    blueflash.cc, ok djm
+    
+    OpenBSD-Commit-ID: e3b34fc35cf12d33bde91ac03633210a3bc0f8b5
+
+commit 8fcfb7789c43a19d24162a7a4055cd09ee951b34
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Apr 26 08:37:17 2019 +0000
+
+    upstream: Import regenerated moduli.
+    
+    OpenBSD-Commit-ID: db6375fc302e3bdf07d96430c63c991b2c2bd3ff
+
+commit 3a7db919d5dd09f797971b3cf8ee301767459774
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Tue Apr 23 11:56:41 2019 +0000
+
+    upstream: Use the LogLevel typdef instead of int where appropriate. Patch from Markus Schmidt via openssh-unix-dev, ok markus@
+    
+    OpenBSD-Commit-ID: 4c0f0f458e3da7807806b35e3eb5c1e8403c968a
+
+commit d7c6e38b87efab1f140745fd8b1106b82e6e4a68
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Apr 19 05:47:44 2019 +0000
+
+    upstream: Document new default RSA key size. From
+    
+    sebastiaanlokhorst at gmail.com via bz#2997.
+    
+    OpenBSD-Commit-ID: bdd62ff5d4d649d2147904e91bf7cefa82fe11e1
+
+commit e826bbcafe26dac349a8593da5569e82faa45ab8
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Apr 18 18:56:16 2019 +0000
+
+    upstream: When running sshd -T, assume any attibute not provided by
+    
+    -C does not match, which allows it to work when sshd_config contains a Match
+    directive with or without -C.  bz#2858, ok djm@
+    
+    OpenBSD-Commit-ID: 1a701f0a33e3bc96753cfda2fe0b0378520b82eb
+
+commit 5696512d7ad57e85e89f8011ce8dec617be686aa
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Apr 18 07:32:56 2019 +0000
+
+    upstream: Remove crc32.{c,h} which were only used by the now-gone
+    
+    SSH1 protocol. Patch from yumkam at gmail.com, ok deraadt.
+    
+    OpenBSD-Commit-ID: cceda5876c5ba6b4d8abcd52335329198cee3240
+
+commit 34e87fb5d9ce607f5701ab4c31d837ad8133e2d1
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Apr 30 12:27:57 2019 +1000
+
+    Remove unused variables from RLIMIT_NOFILE test.
+
+commit 35e82e62c1ef53cfa457473a4c4d957d6197371a
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Apr 26 18:38:27 2019 +1000
+
+    Import regenerated moduli.
+
+commit 5590f53f99219e95dc23b0ebd220f19a6f46b101
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Apr 26 18:22:10 2019 +1000
+
+    Whitespace resync w/OpenBSD.
+    
+    Patch from markus at blueflash.cc via openssh-unix-dev.
+
+commit b7b8334914fb9397a6725f3b5d2de999b0bb69ac
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Apr 26 18:06:34 2019 +1000
+
+    Don't install duplicate STREAMS modules on Solaris
+    
+    Check if STREAMS modules are already installed on pty before installing
+    since when compiling with XPG>=4 they will likely be installed already.
+    Prevents hangs and duplicate lines on the terminal.  bz#2945 and bz#2998,
+    patch from djm@
+
+commit fd0fa130ecf06d7d092932adcd5d77f1549bfc8d
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Apr 18 08:52:57 2019 +1000
+
+    makedepend
+
+commit 5de397a876b587ba05a9169237deffdc71f273b0
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Apr 5 11:29:51 2019 -0700
+
+    second thoughts: leave README in place
+    
+    A number of contrib/* files refer to the existing README so let's leave
+    it in place for release and add the new markdown version in parallel.
+    
+    I'll get rid of README after release.
+
+commit 5d3127d9274519b25ed10e320f45045ba8d7f3be
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Apr 5 11:29:31 2019 -0700
+
+    Revert "rewrite README"
+    
+    This reverts commit 9444d82678cb7781820da4d1c23b3c2b9fb1e12f.
+
+commit 9444d82678cb7781820da4d1c23b3c2b9fb1e12f
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Apr 5 11:21:48 2019 -0700
+
+    rewrite README
+    
+    Include basic build instructions and comments on commonly-used build-
+    time flags, links to the manual pages and other resources.
+    
+    Now in Markdown format for better viewing on github, etc.
+
+commit a924de0c4908902433813ba205bee1446bd1a157
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Apr 5 03:41:52 2019 +1100
+
+    update versions
+
+commit 312dcee739bca5d6878c536537b2a8a497314b75
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Apr 3 15:48:45 2019 +0000
+
+    upstream: openssh-8.0
+    
+    OpenBSD-Commit-ID: 5aafdf218679dab982fea20771afd643be9a127b
+
+commit 885bc114692046d55e2a170b932bdc0092fa3456
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Apr 4 02:47:40 2019 +1100
+
+    session: Do not use removed API
+    
+    from Jakub Jelen
+
+commit 9d7b2882b0c9a5e9bf8312ce4075bf178e2b98be
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Mar 29 11:31:40 2019 +0000
+
+    upstream: when logging/fataling on error, include a bit more detail
+    
+    than just the function name and the error message
+    
+    OpenBSD-Commit-ID: dd72d7eba2215fcb89be516c378f633ea5bcca9f
+
+commit 79a87d32783d6c9db40af8f35e091d9d30365ae7
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Apr 3 06:27:45 2019 +1100
+
+    Remove "struct ssh" from sys_auth_record_login.
+    
+    It's not needed, and is not available from the call site in loginrec.c
+    Should only affect AIX, spotted by Kevin Brott.
+
+commit 138c0d52cdc90f9895333b82fc57d81cce7a3d90
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Apr 2 18:21:35 2019 +1100
+
+    Adapt custom_failed_login to new prototype.
+    
+    Spotted by Kevin Brott.
+
+commit a0ca4009ab2f0b1007ec8ab6864dbf9b760a8ed5
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Apr 1 20:07:23 2019 +1100
+
+    Add includes.h for compat layer.
+    
+    Should fix build on AIX 7.2.
+
+commit 00991151786ce9b1d577bdad1f83a81d19c8236d
+Author: Tim Rice <tim@multitalents.net>
+Date:   Sun Mar 31 22:14:22 2019 -0700
+
+    Stop USL compilers for erroring with "integral constant expression expected"
+
+commit 43f47ebbdd4037b569c23b8f4f7981f53b567f1d
+Author: Tim Rice <tim@multitalents.net>
+Date:   Sun Mar 31 19:22:19 2019 -0700
+
+    Only use O_NOFOLLOW in fchownat and fchmodat if defined
+
+commit 342d6e51589b184c337cccfc4c788b60ff8b3765
+Author: Jakub Jelen <jjelen@redhat.com>
+Date:   Fri Mar 29 12:29:41 2019 +0100
+
+    Adjust softhsm2 path on Fedora Linux for regress
+    
+    The SoftHSM lives in Fedora in /usr/lib64/pkcs11/libsofthsm2.so
+
+commit f5abb05f8c7358dacdcb866fe2813f6d8efd5830
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Mar 28 09:26:14 2019 +1100
+
+    Only use O_NOFOLLOW in utimensat if defined.
+    
+    Fixes build on systems that don't have it (Solaris <=9)  Found by
+    Tom G. Christensen.
+
+commit 786cd4c1837fdc3fe7b4befe54a3f37db7df8715
+Author: Corinna Vinschen <vinschen@redhat.com>
+Date:   Wed Mar 27 18:18:21 2019 +0100
+
+    drop old Cygwin considerations
+    
+    - Cygwin supports non-DOS characters in filenames
+    - Cygwin does not support Windows XP anymore
+    
+    Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
+
+commit 21da87f439b48a85b951ef1518fe85ac0273e719
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Mar 27 09:29:14 2019 +0000
+
+    upstream: fix interaction between ClientAliveInterval and RekeyLimit
+    
+    that could cause connection to close incorrectly; Report and patch from Jakub
+    Jelen in bz#2757; ok dtucker@ markus@
+    
+    OpenBSD-Commit-ID: 17229a8a65bd8e6c2080318ec2b7a61e1aede3fb
+
+commit 4f0019a9afdb4a94d83b75e82dbbbe0cbe826c56
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Mar 25 22:34:52 2019 +0000
+
+    upstream: Fix authentication failures when "AuthenticationMethods
+    
+    any" in a Match block overrides a more restrictive global default.
+    
+    Spotted by jmc@, ok markus@
+    
+    OpenBSD-Commit-ID: a90a4fe2ab81d0eeeb8fdfc21af81f7eabda6666
+
+commit d6e5def308610f194c0ec3ef97a34a3e9630e190
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Mar 25 22:33:44 2019 +0000
+
+    upstream: whitespace
+    
+    OpenBSD-Commit-ID: 106e853ae8a477e8385bc53824d3884a8159db07
+
+commit 26e0cef07b04479537c971dec898741df1290fe5
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Mon Mar 25 16:19:44 2019 +0000
+
+    upstream: Expand comment to document rationale for default key
+    
+    sizes. "seems worthwhile" deraadt.
+    
+    OpenBSD-Commit-ID: 72e5c0983d7da1fb72f191870f36cb58263a2456
+
+commit f47269ea67eb4ff87454bf0d2a03e55532786482
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Mon Mar 25 15:49:00 2019 +0000
+
+    upstream: Increase the default RSA key size to 3072 bits. Based on
+    
+    the estimates from NIST Special Publication 800-57, 3k bits provides security
+    equivalent to 128 bits which is the smallest symmetric cipher we enable by
+    default. ok markus@ deraadt@
+    
+    OpenBSD-Commit-ID: 461dd32ebe808f88f4fc3ec74749b0e6bef2276b
+
+commit 62949c5b37af28d8490d94866e314a76be683a5e
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Fri Mar 22 20:58:34 2019 +0000
+
+    upstream: full stop in the wrong place;
+    
+    OpenBSD-Commit-ID: 478a0567c83553a2aebf95d0f1bd67ac1b1253e4
+
+commit 1b1332b5bb975d759a50b37f0e8bc8cfb07a0bb0
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Sat Mar 16 19:14:21 2019 +0000
+
+    upstream: benno helped me clean up the tcp forwarding section;
+    
+    OpenBSD-Commit-ID: d4bec27edefde636fb632b7f0b7c656b9c7b7f08
+
+commit 2aee9a49f668092ac5c9d34e904ef7a9722e541d
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Fri Mar 8 17:24:43 2019 +0000
+
+    upstream: fix use-after-free in ssh-pkcs11; found by hshoexer w/AFL
+    
+    OpenBSD-Commit-ID: febce81cca72b71f70513fbee4ff52ca050f675c
+
+commit 9edbd7821e6837e98e7e95546cede804dac96754
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Mar 14 10:17:28 2019 +1100
+
+    Fix build when configured --without-openssl.
+    
+    ok djm@
+
+commit 825ab32f0d04a791e9d19d743c61ff8ed9b4d8e5
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Mar 14 08:51:17 2019 +1100
+
+    On Cygwin run sshd as SYSTEM where possible.
+    
+    Seteuid now creates user token using S4U.  We don't create a token
+    from scratch anymore, so we don't need the "Create a process token"
+    privilege.  The service can run under SYSTEM again...
+    
+    ...unless Cygwin is running on Windows Vista or Windows 7 in the
+    WOW64 32 bit emulation layer.  It turns out that WOW64 on these systems
+    didn't implement MsV1_0 S4U Logon so we still need the fallback
+    to NtCreateToken for these systems.
+    
+    Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
+
+commit a212107bfdf4d3e870ab7a443e4d906e5b9578c3
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Mar 13 10:49:16 2019 +1100
+
+    Replace alloca with xcalloc.
+    
+    The latter checks for memory exhaustion and integer overflow and may be
+    at a less predictable place.  Sanity check by vinschen at redhat.com, ok
+    djm@
+
+commit daa7505aadca68ba1a2c70cbdfce423208eb91ee
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Mar 12 09:19:19 2019 +1100
+
+    Use Cygwin-specific matching only for users+groups.
+    
+    Patch from vinschen at redhat.com, updated a little by me.
+
+commit fd10cf027b56f9aaa80c9e3844626a05066589a4
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Wed Mar 6 22:14:23 2019 +0000
+
+    upstream: Move checks for lists of users or groups into their own
+    
+    function. This is a no-op on OpenBSD but will make things easier in
+    -portable, eg on systems where these checks should be case-insensitive.  ok
+    djm@
+    
+    OpenBSD-Commit-ID: 8bc9c8d98670e23f8eaaaefe29c1f98e7ba0487e
+
+commit ab5fee8eb6a011002fd9e32b1597f02aa8804a25
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Wed Mar 6 21:06:59 2019 +0000
+
+    upstream: Reset last-seen time when sending a keepalive. Prevents
+    
+    sending two keepalives successively and prematurely terminating connection
+    when ClientAliveCount=1.  While there, collapse two similar tests into one.
+    ok markus@
+    
+    OpenBSD-Commit-ID: 043670d201dfe222537a2a4bed16ce1087de5ddd
+
+commit c13b74530f9f1d9df7aeae012004b31b2de4438e
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date:   Tue Mar 5 16:17:12 2019 +0000
+
+    upstream: PKCS#11 support is no longer limited to RSA; ok benno@
+    
+    kn@
+    
+    OpenBSD-Commit-ID: 1a9bec64d530aed5f434a960e7515a3e80cbc826
+
+commit e9552d6043db7cd170ac6ba1b4d2c7a5eb2c3201
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Mar 1 03:29:32 2019 +0000
+
+    upstream: in ssh_set_newkeys(), mention the direction that we're
+    
+    keying in debug messages. Previously it would be difficult to tell which
+    direction it was talking about
+    
+    OpenBSD-Commit-ID: c2b71bfcceb2a7389b9d0b497fb2122a406a522d
+
+commit 76a24b3fa193a9ca3e47a8779d497cb06500798b
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Mar 1 02:32:39 2019 +0000
+
+    upstream: Fix two race conditions in sshd relating to SIGHUP:
+    
+    1. Recently-forked child processes will briefly remain listening to
+      listen_socks. If the main server sshd process completes its restart
+      via execv() before these sockets are closed by the child processes
+      then it can fail to listen at the desired addresses/ports and/or
+      fail to restart.
+    
+    2. When a SIGHUP is received, there may be forked child processes that
+      are awaiting their reexecution state. If the main server sshd
+      process restarts before passing this state, these child processes
+      will yield errors and use a fallback path of reading the current
+      sshd_config from the filesystem rather than use the one that sshd
+      was started with.
+    
+    To fix both of these cases, we reuse the startup_pipes that are shared
+    between the main server sshd and forked children. Previously this was
+    used solely to implement tracking of pre-auth child processes for
+    MaxStartups, but this extends the messaging over these pipes to include
+    a child->parent message that the parent process is safe to restart. This
+    message is sent from the child after it has completed its preliminaries:
+    closing listen_socks and receiving its reexec state.
+    
+    bz#2953, reported by Michal Koutný; ok markus@ dtucker@
+    
+    OpenBSD-Commit-ID: 7df09eacfa3ce13e9a7b1e9f17276ecc924d65ab
+
+commit de817e9dfab99473017d28cdf69e60397d00ea21
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Mar 1 02:16:47 2019 +0000
+
+    upstream: mention PKCS11Provide=none, reword a little and remove
+    
+    mention of RSA keys only (since we support ECDSA now and might support others
+    in the future). Inspired by Jakub Jelen via bz#2974
+    
+    OpenBSD-Commit-ID: a92e3686561bf624ccc64ab320c96c9e9a263aa5
+
+commit 95a8058c1a90a27acbb91392ba206854abc85226
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Mar 1 02:08:50 2019 +0000
+
+    upstream: let PKCS11Provider=none do what users expect
+    
+    print PKCS11Provider instead of obsolete SmartcardDevice in config dump.
+    
+    bz#2974 ok dtucker@
+    
+    OpenBSD-Commit-ID: c303d6f0230a33aa2dd92dc9b68843d56a64f846
+
+commit 8e7bac35aa576d2fd7560836da83733e864ce649
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Wed Feb 27 19:37:01 2019 +0000
+
+    upstream: dup stdout/in for proxycommand=-, otherwise stdout might
+    
+    be redirected to /dev/null; ok djm@
+    
+    OpenBSD-Commit-ID: 97dfce4c47ed4055042de8ebde85b7d88793e595
+
+commit 9b61130fbd95d196bce81ebeca94a4cb7c0d5ba0
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Feb 23 08:20:43 2019 +0000
+
+    upstream: openssh-7.9 accidentally reused the server's algorithm lists
+    
+    in the client for KEX, ciphers and MACs. The ciphers and MACs were identical
+    between the client and server, but the error accidentially disabled the
+    diffie-hellman-group-exchange-sha1 KEX method.
+    
+    This fixes the client code to use the correct method list, but
+    because nobody complained, it also disables the
+    diffie-hellman-group-exchange-sha1 KEX method.
+    
+    Reported by nuxi AT vault24.org via bz#2697; ok dtucker
+    
+    OpenBSD-Commit-ID: e30c33a23c10fd536fefa120e86af1842e33fd57
+
+commit 37638c752041d591371900df820f070037878a2d
+Author: Corinna Vinschen <vinschen@redhat.com>
+Date:   Wed Feb 20 13:41:25 2019 +0100
+
+    Cygwin: implement case-insensitive Unicode user and group name matching
+    
+    The previous revert enabled case-insensitive user names again.  This
+    patch implements the case-insensitive user and group name matching.
+    To allow Unicode chars, implement the matcher using wchar_t chars in
+    Cygwin-specific code.  Keep the generic code changes as small as possible.
+    Cygwin: implement case-insensitive Unicode user and group name matching
+    
+    Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
+
+commit bed1d43698807a07bb4ddb93a46b0bd84b9970b3
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Feb 22 15:21:21 2019 +1100
+
+    Revert unintended parts of previous commit.
+
+commit f02afa350afac1b2f2d1413259a27a4ba1e2ca24
+Author: Corinna Vinschen <vinschen@redhat.com>
+Date:   Wed Feb 20 13:41:24 2019 +0100
+
+    Revert "[auth.c] On Cygwin, refuse usernames that have differences in case"
+    
+    This reverts commit acc9b29486dfd649dfda474e5c1a03b317449f1c.
+    
+    Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
+
+commit 4c55b674835478eb80a1a7aeae588aa654e2a433
+Author: Corinna Vinschen <vinschen@redhat.com>
+Date:   Sat Feb 16 14:13:43 2019 +0100
+
+    Add tags to .gitignore
+    
+    Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
+
+commit 625b62634c33eaef4b80d07529954fe5c6435fe5
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Feb 22 03:37:11 2019 +0000
+
+    upstream: perform removal of agent-forwarding directory in forward
+    
+    setup error path with user's privileged. This is a no-op as this code always
+    runs with user privilege now that we no longer support running sshd with
+    privilege separation disabled, but as long as the privsep skeleton is there
+    we should follow the rules.
+    MIME-Version: 1.0
+    Content-Type: text/plain; charset=UTF-8
+    Content-Transfer-Encoding: 8bit
+    
+    bz#2969 with patch from Erik Sjölund
+    
+    OpenBSD-Commit-ID: 2b708401a5a8d6133c865d7698d9852210dca846
+
+commit d9ecfaba0b2f1887d20e4368230632e709ca83be
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Mon Feb 18 07:02:34 2019 +0000
+
+    upstream: sync the description of ~/.ssh/config with djm's updated
+    
+    description in ssh.1; issue pointed out by andreas kahari
+    
+    ok dtucker djm
+    
+    OpenBSD-Commit-ID: 1b01ef0ae2c6328165150badae317ec92e52b01c
+
+commit 38e83e4f219c752ebb1560633b73f06f0392018b
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Feb 12 23:53:10 2019 +0000
+
+    upstream: fix regression in r1.302 reported by naddy@ - only the first
+    
+    public key from the agent was being attempted for use.
+    
+    OpenBSD-Commit-ID: 07116aea521a04888718b2157f1ca723b2f46c8d
+
+commit 5c68ea8da790d711e6dd5f4c30d089c54032c59a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Feb 11 09:44:42 2019 +0000
+
+    upstream: cleanup GSSAPI authentication context after completion of the
+    
+    authmethod. Move function-static GSSAPI state to the client Authctxt
+    structure. Make static a bunch of functions that aren't used outside this
+    file.
+    
+    Based on patch from Markus Schmidt <markus@blueflash.cc>; ok markus@
+    
+    OpenBSD-Commit-ID: 497fb792c0ddb4f1ba631b6eed526861f115dbe5
+
+commit a8c807f1956f81a92a758d3d0237d0ff06d0be5d
+Author: benno@openbsd.org <benno@openbsd.org>
+Date:   Sun Feb 10 16:35:41 2019 +0000
+
+    upstream: ssh-keygen -D pkcs11.so needs to initialize pkcs11
+    
+    interactive, so it can ask for the smartcards PIN. ok markus@
+    
+    OpenBSD-Commit-ID: 1be7ccf88f1876e0fc4d7c9b3f96019ac5655bab
+
+commit 3d896c157c722bc47adca51a58dca859225b5874
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Feb 10 11:15:52 2019 +0000
+
+    upstream: when checking that filenames sent by the server side
+    
+    match what the client requested, be prepared to handle shell-style brace
+    alternations, e.g. "{foo,bar}".
+    
+    "looks good to me" millert@ + in snaps for the last week courtesy
+    deraadt@
+    
+    OpenBSD-Commit-ID: 3b1ce7639b0b25b2248e3a30f561a548f6815f3e
+
+commit 318e4f8548a4f5c0c913f61e27d4fc21ffb1eaae
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Feb 10 11:10:57 2019 +0000
+
+    upstream: syslog when connection is dropped for attempting to run a
+    
+    command when ForceCommand=internal-sftp is in effect; bz2960; ok dtucker@
+    
+    OpenBSD-Commit-ID: 8c87fa66d7fc6c0fffa3a3c28e8ab5e8dde234b8
+
+commit 2ff2e19653b8c0798b8b8eff209651bdb1be2761
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Feb 8 14:53:35 2019 +1100
+
+    don't set $MAIL if UsePam=yes
+    
+    PAM typically specifies the user environment if it's enabled, so don't
+    second guess. bz#2937; ok dtucker@
+
+commit 03e92dd27d491fe6d1a54e7b2f44ef1b0a916e52
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Feb 8 14:50:36 2019 +1100
+
+    use same close logic for stderr as stdout
+    
+    Avoids sending SIGPIPE to child processes after their parent exits
+    if they attempt to write to stderr.
+    
+    Analysis and patch from JD Paul; patch reworked by Jakub Jelen and
+    myself. bz#2071; ok dtucker@
+
+commit 8c53d409baeeaf652c0c125a9b164edc9dbeb6de
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Tue Feb 5 11:35:56 2019 +0000
+
+    upstream: Adapt code in the non-USE_PIPES codepath to the new packet
+    
+    API. This code is not normally reachable since USE_PIPES is always defined.
+    bz#2961, patch from adrian.fita at gmail com.
+    
+    OpenBSD-Commit-ID: 8d8428d678d1d5eb4bb21921df34e8173e6d238a
+
+commit 7a7fdca78de4b4774950be056099e579ef595414
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Feb 4 23:37:54 2019 +0000
+
+    upstream: fix NULL-deref crash in PKCS#11 code when attempting
+    
+    login to a token requiring a PIN; reported by benno@ fix mostly by markus@
+    
+    OpenBSD-Commit-ID: 438d0b114b1b4ba25a9869733db1921209aa9a31
+
+commit cac302a4b42a988e54d32eb254b29b79b648dbf5
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Mon Feb 4 02:39:42 2019 +0000
+
+    upstream: Remove obsolete "Protocol" from commented out examples. Patch
+    
+    from samy.mahmoudi at gmail com.
+    
+    OpenBSD-Commit-ID: 16aede33dae299725a03abdac5dcb4d73f5d0cbf
+
+commit 483b3b638500fd498b4b529356e5a0e18cf76891
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Feb 1 03:52:23 2019 +0000
+
+    upstream: Save connection timeout and restore for 2nd and
+    
+    subsequent attempts, preventing them from having no timeout.  bz#2918, ok
+    djm@
+    
+    OpenBSD-Commit-ID: 4977f1d0521d9b6bba0c9a20d3d226cefac48292
+
+commit 5f004620fdc1b2108139300ee12f4014530fb559
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Wed Jan 30 19:51:15 2019 +0000
+
+    upstream: Add authors for public domain sntrup4591761 code;
+    
+    confirmed by Daniel J. Bernstein
+    
+    OpenBSD-Commit-ID: b4621f22b8b8ef13e063c852af5e54dbbfa413c1
+
+commit 2c21b75a7be6ebdcbceaebb43157c48dbb36f3d8
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Sun Jan 27 07:14:11 2019 +0000
+
+    upstream: add -T to usage();
+    
+    OpenBSD-Commit-ID: a7ae14d9436c64e1bd05022329187ea3a0ce1899
+
+commit 19a0f0529d3df04118da829528cac7ceff380b24
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Mon Jan 28 03:50:39 2019 +0000
+
+    upstream: The test sshd_config in in $OBJ.
+    
+    OpenBSD-Regress-ID: 1e5d908a286d8e7de3a15a0020c8857f3a7c9172
+
+commit 8fe25440206319d15b52d12b948a5dfdec14dca3
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Mon Jan 28 03:28:10 2019 +0000
+
+    upstream: Remove leftover debugging.
+    
+    OpenBSD-Regress-ID: 3d86c3d4867e46b35af3fd2ac8c96df0ffdcfeb9
+
+commit e30d32364d12c351eec9e14be6c61116f9d6cc90
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Mon Jan 28 00:12:36 2019 +0000
+
+    upstream: Enable ssh-dss for the agent test. Disable it for the
+    
+    certificate test.
+    
+    OpenBSD-Regress-ID: 388c1e03e1def539d350f139b37d69f12334668d
+
+commit ffdde469ed56249f5dc8af98da468dde35531398
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Mon Jan 28 00:08:26 2019 +0000
+
+    upstream: Count the number of key types instead of assuming there
+    
+    are only two.
+    
+    OpenBSD-Regress-ID: 0998702c41235782cf0beee396ec49b5056eaed9
+
+commit 1d05b4adcba08ab068466e5c08dee2f5417ec53a
+Author: Corinna Vinschen <vinschen@redhat.com>
+Date:   Sat Jan 26 23:42:40 2019 +0100
+
+    Cygwin: only tweak sshd_config file if it's new, drop creating sshd user
+    
+    The sshd_config tweaks were executed even if the old file was
+    still in place.  Fix that.  Also disable sshd user creation.
+    It's not used on Cygwin.
+
+commit 89843de0c4c733501f6b4f988098e6e06963df37
+Author: Corinna Vinschen <vinschen@redhat.com>
+Date:   Sat Jan 26 23:03:12 2019 +0100
+
+    Cygwin: Change service name to cygsshd
+    
+    Microsoft hijacked the sshd service name without asking.
+
+commit 2a9b3a2ce411d16cda9c79ab713c55f65b0ec257
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Sun Jan 27 06:30:53 2019 +0000
+
+    upstream: Generate all key supported key types and enable for keyscan
+    
+    test.
+    
+    OpenBSD-Regress-ID: 72f72ff49946c61bc949e1692dd9e3d71370891b
+
+commit 391ffc4b9d31fa1f4ad566499fef9176ff8a07dc
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 26 22:41:28 2019 +0000
+
+    upstream: check in scp client that filenames sent during
+    
+    remote->local directory copies satisfy the wildcard specified by the user.
+    
+    This checking provides some protection against a malicious server
+    sending unexpected filenames, but it comes at a risk of rejecting wanted
+    files due to differences between client and server wildcard expansion rules.
+    
+    For this reason, this also adds a new -T flag to disable the check.
+    
+    reported by Harry Sintonen
+    fix approach suggested by markus@;
+    has been in snaps for ~1wk courtesy deraadt@
+    
+    OpenBSD-Commit-ID: 00f44b50d2be8e321973f3c6d014260f8f7a8eda
+
+commit c2c18a39683db382a15b438632afab3f551d50ce
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 26 22:35:01 2019 +0000
+
+    upstream: make ssh-keyscan return a non-zero exit status if it
+    
+    finds no keys. bz#2903
+    
+    OpenBSD-Commit-ID: 89f1081fb81d950ebb48e6e73d21807b2723d488
+
+commit 05b9a466700b44d49492edc2aa415fc2e8913dfe
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Jan 24 17:00:29 2019 +0000
+
+    upstream: Accept the host key fingerprint as a synonym for "yes"
+    
+    when accepting an unknown host key.  This allows you to paste a fingerprint
+    obtained out of band into the yes/no prompt and have the client do the
+    comparison for you.  ok markus@ djm@
+    
+    OpenBSD-Commit-ID: 3c47d10b9f43d3d345e044fd9ec09709583a2767
+
+commit bdc6c63c80b55bcbaa66b5fde31c1cb1d09a41eb
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Jan 24 16:52:17 2019 +0000
+
+    upstream: Have progressmeter force an update at the beginning and
+    
+    end of each transfer.  Fixes the problem recently introduces where very quick
+    transfers do not display the progressmeter at all.  Spotted by naddy@
+    
+    OpenBSD-Commit-ID: 68dc46c259e8fdd4f5db3ec2a130f8e4590a7a9a
+
+commit 258e6ca003e47f944688ad8b8de087b58a7d966c
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Jan 24 02:42:23 2019 +0000
+
+    upstream: Check for both EAGAIN and EWOULDBLOCK. This is a no-op
+    
+    in OpenBSD (they are the same value) but makes things easier in -portable
+    where they may be distinct values.  "sigh ok" deraadt@
+    
+    (ID sync only, portable already had this change).
+    
+    OpenBSD-Commit-ID: 91f2bc7c0ecec905915ed59fa37feb9cc90e17d7
+
+commit 281ce042579b834cdc1e74314f1fb2eeb75d2612
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Jan 24 02:34:52 2019 +0000
+
+    upstream: Always initialize 2nd arg to hpdelim2. It populates that
+    
+    *ONLY IF* there's a delimiter.  If there's not (the common case) it checked
+    uninitialized memory, which usually passed, but if not would cause spurious
+    failures when the uninitialized memory happens to contain "/".  ok deraadt.
+    
+    OpenBSD-Commit-ID: 4291611eaf2a53d4c92f4a57c7f267c9f944e0d3
+
+commit d05ea255678d9402beda4416cd0360f3e5dfe938
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Wed Jan 23 21:50:56 2019 +0000
+
+    upstream: Remove support for obsolete host/port syntax.
+    
+    host/port was added in 2001 as an alternative to host:port syntax for
+    the benefit of IPv6 users.  These days there are establised standards
+    for this like [::1]:22 and the slash syntax is easily mistaken for CIDR
+    notation, which OpenSSH now supports for some things.  Remove the slash
+    notation from ListenAddress and PermitOpen.  bz#2335, patch from jjelen
+    at redhat.com, ok markus@
+    
+    OpenBSD-Commit-ID: fae5f4e23c51a368d6b2d98376069ac2b10ad4b7
+
+commit 177d6c80c557a5e060cd343a0c116a2f1a7f43db
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Wed Jan 23 20:48:52 2019 +0000
+
+    upstream: Remove duplicate word. bz#2958, patch from jjelen at
+    
+    redhat.com
+    
+    OpenBSD-Commit-ID: cca3965a8333f2b6aae48b79ec1d72f7a830dd2c
+
+commit be3e6cba95dffe5fcf190c713525b48c837e7875
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Wed Jan 23 09:49:00 2019 +0000
+
+    upstream: Remove 3 as a guess for possible generator during moduli
+    
+    generation. It's not mentioned in RFC4419 and it's not possible for
+    Sophie-Germain primes greater than 5.  bz#2330, from Christian Wittenhorst ,
+    ok djm@ tb@
+    
+    OpenBSD-Commit-ID: 1467652e6802ad3333b0959282d8d49dfe22c8cd
+
+commit 8976f1c4b2721c26e878151f52bdf346dfe2d54c
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Wed Jan 23 08:01:46 2019 +0000
+
+    upstream: Sanitize scp filenames via snmprintf. To do this we move
+    
+    the progressmeter formatting outside of signal handler context and have the
+    atomicio callback called for EINTR too.  bz#2434 with contributions from djm
+    and jjelen at redhat.com, ok djm@
+    
+    OpenBSD-Commit-ID: 1af61c1f70e4f3bd8ab140b9f1fa699481db57d8
+
+commit 6249451f381755f792c6b9e2c2f80cdc699c14e2
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Jan 24 10:00:20 2019 +1100
+
+    For broken read/readv comparisons, poll(RW).
+    
+    In the cases where we can't compare to read or readv function pointers
+    for some reason we currently ifdef out the poll() used to block while
+    waiting for reads or writes, falling back to busy waiting.  This restores
+    the poll() in this case, but has it always check for read or write,
+    removing an inline ifdef in the process.
+
+commit 5cb503dff4db251520e8bf7d23b9c97c06eee031
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Jan 24 09:55:16 2019 +1100
+
+    Include unistd.h for strmode().
+
+commit f236ca2741f29b5c443c0b2db3aa9afb9ad9befe
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Jan 24 09:50:58 2019 +1100
+
+    Also undef SIMPLEQ_FOREACH_SAFE.
+    
+    Prevents macro redefinition warning on at least NetBSD 6.1.
+
+commit be063945e4e7d46b1734d973bf244c350fae172a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Jan 23 04:51:02 2019 +0000
+
+    upstream: allow auto-incrementing certificate serial number for certs
+    
+    signed in a single commandline.
+    
+    OpenBSD-Commit-ID: 39881087641efb8cd83c7ec13b9c98280633f45b
+
+commit 851f80328931975fe68f71af363c4537cb896da2
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Jan 23 04:16:22 2019 +0000
+
+    upstream: move a bunch of global flag variables to main(); make the
+    
+    rest static
+    
+    OpenBSD-Commit-ID: fa431d92584e81fe99f95882f4c56b43fe3242dc
+
+commit 2265402dc7d701a9aca9f8a7b7b0fd45b65c479f
+Author: Damien Miller <djm@mindrot.org>
+Date:   Wed Jan 23 13:03:16 2019 +1100
+
+    depend
+
+commit 2c223878e53cc46def760add459f5f7c4fb43e35
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Jan 23 02:01:10 2019 +0000
+
+    upstream: switch mainloop from select(2) to poll(2); ok deraadt@
+    
+    OpenBSD-Commit-ID: 37645419a330037d297f6f0adc3b3663e7ae7b2e
+
+commit bb956eaa94757ad058ff43631c3a7d6c94d38c2f
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Jan 23 00:30:41 2019 +0000
+
+    upstream: pass most arguments to the KEX hash functions as sshbuf
+    
+    rather than pointer+length; ok markus@
+    
+    OpenBSD-Commit-ID: ef0c89c52ccc89817a13a5205725148a28492bf7
+
+commit d691588b8e29622c66abf8932362b522cf7f4051
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jan 22 22:58:50 2019 +0000
+
+    upstream: backoff reading messages from active connections when the
+    
+    input buffer is too full to read one, or if the output buffer is too full to
+    enqueue a response; feedback & ok dtucker@
+    
+    OpenBSD-Commit-ID: df3c5b6d57c968975875de40d8955cbfed05a6c8
+
+commit f99ef8de967949a1fc25a5c28263ea32736e5943
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jan 22 20:48:01 2019 +0000
+
+    upstream: add -m to usage(); reminded by jmc@
+    
+    OpenBSD-Commit-ID: bca476a5236e8f94210290b3e6a507af0434613e
+
+commit 41923ce06ac149453debe472238e0cca7d5a2e5f
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jan 22 12:03:58 2019 +0000
+
+    upstream: Correct some bugs in PKCS#11 token PIN handling at
+    
+    initial login, the attempt at reading the PIN could be skipped in some cases
+    especially on devices with integrated PIN readers.
+    
+    based on patch from Daniel Kucera in bz#2652; ok markus@
+    
+    OpenBSD-Commit-ID: fad70a61c60610afe8bb0db538c90e343e75e58e
+
+commit 2162171ad517501ba511fa9f8191945d01857bb4
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jan 22 12:00:50 2019 +0000
+
+    upstream: Support keys that set the CKA_ALWAYS_AUTHENTICATE by
+    
+    requring a fresh login after the C_SignInit operation.
+    
+    based on patch from Jakub Jelen in bz#2638; ok markus
+    
+    OpenBSD-Commit-ID: a76e66996ba7c0923b46b74d46d499b811786661
+
+commit 7a2cb18a215b2cb335da3dc99489c52a91f4925b
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jan 22 11:51:25 2019 +0000
+
+    upstream: Mention that configuration for the destination host is
+    
+    not applied to any ProxyJump/-J hosts. This has confused a few people...
+    
+    OpenBSD-Commit-ID: 03f4f641df6ca236c1bfc69836a256b873db868b
+
+commit ecd2f33cb772db4fa76776543599f1c1ab6f9fa0
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jan 22 11:40:42 2019 +0000
+
+    upstream: Include -m in the synopsis for a few more commands that
+    
+    support it
+    
+    Be more explicit in the description of -m about where it may be used
+    
+    Prompted by Jakub Jelen in bz2904
+    
+    OpenBSD-Commit-ID: 3b398ac5e05d8a6356710d0ff114536c9d71046c
+
+commit ff5d2cf4ca373bb4002eef395ed2cbe2ff0826c1
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jan 22 11:26:16 2019 +0000
+
+    upstream: print the full pubkey being attempted at loglevel >=
+    
+    debug2; bz2939
+    
+    OpenBSD-Commit-ID: ac0fe5ca1429ebf4d460bad602adc96de0d7e290
+
+commit 180b520e2bab33b566b4b0cbac7d5f9940935011
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jan 22 11:19:42 2019 +0000
+
+    upstream: clarify: ssh-keygen -e only writes public keys, never
+    
+    private
+    
+    OpenBSD-Commit-ID: 7de7ff6d274d82febf9feb641e2415ffd6a30bfb
+
+commit c45616a199c322ca674315de88e788f1d2596e26
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jan 22 11:00:15 2019 +0000
+
+    upstream: mention the new vs. old key formats in the introduction
+    
+    and give some hints on how keys may be converted or written in the old
+    format.
+    
+    OpenBSD-Commit-ID: 9c90a9f92eddc249e07fad1204d0e15c8aa13823
+
+commit fd8eb1383a34c986a00ef13d745ae9bd3ea21760
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Tue Jan 22 06:58:31 2019 +0000
+
+    upstream: tweak previous;
+    
+    OpenBSD-Commit-ID: d2a80e389da8e7ed71978643d8cbaa8605b597a8
+
+commit 68e924d5473c00057f8532af57741d258c478223
+Author: tb@openbsd.org <tb@openbsd.org>
+Date:   Mon Jan 21 23:55:12 2019 +0000
+
+    upstream: Forgot to add -J to the synopsis.
+    
+    OpenBSD-Commit-ID: 26d95e409a0b72526526fc56ca1caca5cc3d3c5e
+
+commit 622dedf1a884f2927a9121e672bd9955e12ba108
+Author: tb@openbsd.org <tb@openbsd.org>
+Date:   Mon Jan 21 22:50:42 2019 +0000
+
+    upstream: Add a -J option as a shortcut for -o Proxyjump= to scp(1)
+    
+    and sftp(1) to match ssh(1)'s interface.
+    
+    ok djm
+    
+    OpenBSD-Commit-ID: a75bc2d5f329caa7229a7e9fe346c4f41c2663fc
+
+commit c882d74652800150d538e22c80dd2bd3cdd5fae2
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Jan 22 20:38:40 2019 +1100
+
+    Allow building against OpenSSL dev (3.x) version.
+
+commit d5520393572eb24aa0e001a1c61f49b104396e45
+Author: Damien Miller <djm@mindrot.org>
+Date:   Tue Jan 22 10:50:40 2019 +1100
+
+    typo
+
+commit 2de9cec54230998ab10161576f77860a2559ccb7
+Author: Damien Miller <djm@mindrot.org>
+Date:   Tue Jan 22 10:49:52 2019 +1100
+
+    add missing header
+
+commit 533cfb01e49a2a30354e191669dc3159e03e99a7
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 22:18:24 2019 +0000
+
+    upstream: switch sntrup implementation source from supercop to
+    
+    libpqcrypto; the latter is almost identical but doesn't rely on signed
+    underflow to implement an optimised integer sort; from markus@
+    
+    OpenBSD-Commit-ID: cd09bbf0e0fcef1bedca69fdf7990dc360567cf8
+
+commit d50ab3cd6fb859888a26b4d4e333239b4f6bf573
+Author: Damien Miller <djm@mindrot.org>
+Date:   Tue Jan 22 00:02:23 2019 +1100
+
+    new files need includes.h
+
+commit c7670b091a7174760d619ef6738b4f26b2093301
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 12:53:35 2019 +0000
+
+    upstream: add "-v" flags to ssh-add and ssh-pkcs11-helper to turn up
+    
+    debug verbosity.
+    
+    Make ssh-agent turn on ssh-pkcs11-helper's verbosity when it is run
+    in debug mode ("ssh-agent -d"), so we get to see errors from the
+    PKCS#11 code.
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: 0a798643c6a92a508df6bd121253ba1c8bee659d
+
+commit 49d8c8e214d39acf752903566b105d06c565442a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 12:50:12 2019 +0000
+
+    upstream: adapt to changes in KEX APIs and file removals
+    
+    OpenBSD-Regress-ID: 54d6857e7c58999c7a6d40942ab0fed3529f43ca
+
+commit 35ecc53a83f8e8baab2e37549addfd05c73c30f1
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 12:35:20 2019 +0000
+
+    upstream: adapt to changes in KEX API and file removals
+    
+    OpenBSD-Regress-ID: 92cad022d3b0d11e08f3e0055d6a14b8f994c0d7
+
+commit 7d69aae64c35868cc4f644583ab973113a79480e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 12:29:35 2019 +0000
+
+    upstream: adapt to bignum1 API removal and bignum2 API change
+    
+    OpenBSD-Regress-ID: cea6ff270f3d560de86b355a87a2c95b55a5ca63
+
+commit beab553f0a9578ef9bffe28b2c779725e77b39ec
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 09:13:41 2019 +0000
+
+    upstream: remove hack to use non-system libcrypto
+    
+    OpenBSD-Regress-ID: ce72487327eee4dfae1ab0212a1f33871fe0809f
+
+commit 4dc06bd57996f1a46b4c3bababe0d09bc89098f7
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Jan 21 23:14:04 2019 +1100
+
+    depend
+
+commit 70edd73edc4df54e5eee50cd27c25427b34612f8
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 12:08:13 2019 +0000
+
+    upstream: fix reversed arguments to kex_load_hostkey(); manifested as
+    
+    errors in cert-hostkey.sh regress failures.
+    
+    OpenBSD-Commit-ID: 12dab63850b844f84d5a67e86d9e21a42fba93ba
+
+commit f1185abbf0c9108e639297addc77f8757ee00eb3
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 11:22:00 2019 +0000
+
+    upstream: forgot to cvs add this file in previous series of commits;
+    
+    grrr
+    
+    OpenBSD-Commit-ID: bcff316c3e7da8fd15333e05d244442c3aaa66b0
+
+commit 7bef390b625bdc080f0fd4499ef03cef60fca4fa
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 10:44:21 2019 +0000
+
+    upstream: nothing shall escape this purge
+    
+    OpenBSD-Commit-ID: 4795b0ff142b45448f7e15f3c2f77a947191b217
+
+commit aaca72d6f1279b842066e07bff797019efeb2c23
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 10:40:11 2019 +0000
+
+    upstream: rename kex->kem_client_pub -> kex->client_pub now that
+    
+    KEM has been renamed to kexgen
+    
+    from markus@ ok djm@
+    
+    OpenBSD-Commit-ID: fac6da5dc63530ad0da537db022a9a4cfbe8bed8
+
+commit 70867e1ca2eb08bbd494fe9c568df4fd3b35b867
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 10:38:54 2019 +0000
+
+    upstream: merge kexkem[cs] into kexgen
+    
+    from markus@ ok djm@
+    
+    OpenBSD-Commit-ID: 87d886b7f1812ff9355fda1435f6ea9b71a0ac89
+
+commit 71e67fff946396caa110a7964da23480757258ff
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 10:35:09 2019 +0000
+
+    upstream: pass values used in KEX hash computation as sshbuf
+    
+    rather than pointer+len
+    
+    suggested by me; implemented by markus@ ok me
+    
+    OpenBSD-Commit-ID: 994f33c464f4a9e0f1d21909fa3e379f5a0910f0
+
+commit 4b83e2a2cc0c12e671a77eaba1c1245894f4e884
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 10:33:49 2019 +0000
+
+    upstream: remove kex_derive_keys_bn wrapper; no unused since the
+    
+    DH-like KEX methods have moved to KEM
+    
+    from markus@ ok djm@
+    
+    OpenBSD-Commit-ID: bde9809103832f349545e4f5bb733d316db9a060
+
+commit 92dda34e373832f34a1944e5d9ebbebb184dedc1
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 10:29:56 2019 +0000
+
+    upstream: use KEM API for vanilla ECDH
+    
+    from markus@ ok djm@
+    
+    OpenBSD-Commit-ID: 6fbff96339a929835536b5730585d1d6057a352c
+
+commit b72357217cbe510a3ae155307a7be6b9181f1d1b
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Jan 21 23:11:21 2019 +1100
+
+    fixup missing ssherr.h
+
+commit 9c9c97e14fe190931f341876ad98213e1e1dc19f
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 10:28:01 2019 +0000
+
+    upstream: use KEM API for vanilla DH KEX
+    
+    from markus@ ok djm@
+    
+    OpenBSD-Commit-ID: af56466426b08a8be275412ae2743319e3d277c9
+
+commit 2f6a9ddbbf6ca8623c53c323ff17fb6d68d66970
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 10:24:09 2019 +0000
+
+    upstream: use KEM API for vanilla c25519 KEX
+    
+    OpenBSD-Commit-ID: 38d937b85ff770886379dd66a8f32ab0c1c35c1f
+
+commit dfd591618cdf2c96727ac0eb65f89cf54af0d97e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 10:20:12 2019 +0000
+
+    upstream: Add support for a PQC KEX/KEM:
+    
+    sntrup4591761x25519-sha512@tinyssh.org using the Streamlined NTRU Prime
+    4591^761 implementation from SUPERCOP coupled with X25519 as a stop-loss. Not
+    enabled by default.
+    
+    introduce KEM API; a simplified framework for DH-ish KEX methods.
+    
+    from markus@ feedback & ok djm@
+    
+    OpenBSD-Commit-ID: d687f76cffd3561dd73eb302d17a1c3bf321d1a7
+
+commit b1b2ff4ed559051d1035419f8f236275fa66d5d6
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 10:07:22 2019 +0000
+
+    upstream: factor out kex_verify_hostkey() - again, duplicated
+    
+    almost exactly across client and server for several KEX methods.
+    
+    from markus@ ok djm@
+    
+    OpenBSD-Commit-ID: 4e4a16d949dadde002a0aacf6d280a684e20829c
+
+commit bb39bafb6dc520cc097780f4611a52da7f19c3e2
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 10:05:09 2019 +0000
+
+    upstream: factor out kex_load_hostkey() - this is duplicated in
+    
+    both the client and server implementations for most KEX methods.
+    
+    from markus@ ok djm@
+    
+    OpenBSD-Commit-ID: 8232fa7c21fbfbcaf838313b0c166dc6c8762f3c
+
+commit dec5e9d33891e3bc3f1395d7db0e56fdc7f86dfc
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 10:03:37 2019 +0000
+
+    upstream: factor out kex_dh_compute_key() - it's shared between
+    
+    plain DH KEX and DH GEX in both the client and server implementations
+    
+    from markus@ ok djm@
+    
+    OpenBSD-Commit-ID: 12186e18791fffcd4642c82e7e0cfdd7ea37e2ec
+
+commit e93bd98eab79b9a78f64ee8dd4dffc4d3979c7ae
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 10:00:23 2019 +0000
+
+    upstream: factor out DH keygen; it's identical between the client
+    
+    and the server
+    
+    from markus@ ok djm@
+    
+    OpenBSD-Commit-ID: 2be57f6a0d44f1ab2c8de2b1b5d6f530c387fae9
+
+commit 5ae3f6d314465026d028af82609c1d49ad197655
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 09:55:52 2019 +0000
+
+    upstream: save the derived session id in kex_derive_keys() rather
+    
+    than making each kex method implementation do it.
+    
+    from markus@ ok djm@
+    
+    OpenBSD-Commit-ID: d61ade9c8d1e13f665f8663c552abff8c8a30673
+
+commit 7be8572b32a15d5c3dba897f252e2e04e991c307
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 09:54:11 2019 +0000
+
+    upstream: Make sshpkt_get_bignum2() allocate the bignum it is
+    
+    parsing rather than make the caller do it. Saves a lot of boilerplate code.
+    
+    from markus@ ok djm@
+    
+    OpenBSD-Commit-ID: 576bf784f9a240f5a1401f7005364e59aed3bce9
+
+commit 803178bd5da7e72be94ba5b4c4c196d4b542da4d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 09:52:25 2019 +0000
+
+    upstream: remove obsolete (SSH v.1) sshbuf_get/put_bignum1
+    
+    functions
+    
+    from markus@ ok djm@
+    
+    OpenBSD-Commit-ID: 0380b1b2d9de063de3c5a097481a622e6a04943e
+
+commit f3ebaffd8714be31d4345f90af64992de4b3bba2
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 09:49:37 2019 +0000
+
+    upstream: fix all-zero check in kexc25519_shared_key
+    
+    from markus@ ok djm@
+    
+    OpenBSD-Commit-ID: 60b1d364e0d9d34d1d1ef1620cb92e36cf06712d
+
+commit 9d1a9771d0ad3a83af733bf3d2650b53f43c269f
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Mon Jan 21 07:09:10 2019 +0000
+
+    upstream: - -T was added to the first synopsis by mistake - since
+    
+    "..." denotes optional, no need to surround it in []
+    
+    ok djm
+    
+    OpenBSD-Commit-ID: 918f6d8eed4e0d8d9ef5eadae1b8983d796f0e25
+
+commit 2f0bad2bf85391dbb41315ab55032ec522660617
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Jan 21 21:28:27 2019 +1100
+
+    Make --with-rpath take a flag instead of yes/no.
+    
+    Linkers need various flags for -rpath and similar, so make --with-rpath
+    take an optional flag argument which is passed to the linker.  ok djm@
+
+commit 23490a6c970ea1d03581a3b4208f2eb7a675f453
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Jan 21 15:05:43 2019 +1100
+
+    fix previous test
+
+commit b6dd3277f2c49f9584a2097bc792e8f480397e87
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Jan 21 13:50:17 2019 +1100
+
+    Wrap ECC static globals in EC_KEY_METHOD_NEW too.
+
+commit b2eb9db35b7191613f2f4b934d57b25938bb34b3
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Jan 21 12:53:40 2019 +1100
+
+    pass TEST_SSH_SSHPKCS11HELPER to regress tests
+
+commit ba58a529f45b3dae2db68607d8c54ae96e90e705
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Jan 21 12:31:29 2019 +1100
+
+    make agent-pkcs11 search harder for softhsm2.so
+
+commit 662be40c62339ab645113c930ce689466f028938
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 02:05:38 2019 +0000
+
+    upstream: always print the caller's error message in ossl_error(),
+    
+    even when there are no libcrypto errors to report.
+    
+    OpenBSD-Commit-ID: 09ebaa8f706e0eccedd209775baa1eee2ada806a
+
+commit ce46c3a077dfb4c531ccffcfff03f37775725b75
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 02:01:03 2019 +0000
+
+    upstream: get the ex_data (pkcs11_key object) back from the keys at
+    
+    the index at which it was inserted, rather than assuming index 0
+    
+    OpenBSD-Commit-ID: 1f3a6ce0346c8014e895e50423bef16401510aa8
+
+commit 0a5f2ea35626022299ece3c8817a1abe8cf37b3e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 01:05:00 2019 +0000
+
+    upstream: GSSAPI code got missed when converting to new packet API
+    
+    OpenBSD-Commit-ID: 37e4f06ab4a0f4214430ff462ba91acba28b7851
+
+commit 2efcf812b4c1555ca3aff744820a3b3bccd68298
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Jan 21 11:57:21 2019 +1100
+
+    Fix -Wunused when compiling PKCS#11 without ECDSA
+
+commit 3c0c657ed7cd335fc05c0852d88232ca7e92a5d9
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Jan 20 23:26:44 2019 +0000
+
+    upstream: allow override of ssh-pkcs11-helper binary via
+    
+    $TEST_SSH_SSHPKCS11HELPER from markus@
+    
+    OpenBSD-Regress-ID: 7382a3d76746f5a792d106912a5819fd5e49e469
+
+commit 760ae37b4505453c6fa4faf1aa39a8671ab053af
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Jan 20 23:25:25 2019 +0000
+
+    upstream: adapt agent-pkcs11.sh test to softhsm2 and add support
+    
+    for ECDSA keys
+    
+    work by markus@, ok djm@
+    
+    OpenBSD-Regress-ID: 1ebc2be0e88eff1b6d8be2f9c00cdc60723509fe
+
+commit b2ce8b31a1f974a13e6d12e0a0c132b50bc45115
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Jan 20 23:24:19 2019 +0000
+
+    upstream: add "extra:" target to run some extra tests that are not
+    
+    enabled by default (currently includes agent-pkcs11.sh); from markus@
+    
+    OpenBSD-Regress-ID: 9a969e1adcd117fea174d368dcb9c61eb50a2a3c
+
+commit 632976418d60b7193597bbc6ac7ca33981a41aab
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jan 21 00:47:34 2019 +0000
+
+    upstream: use ECDSA_SIG_set0() instead of poking signature values into
+    
+    structure directly; the latter works on LibreSSL but not on OpenSSL. From
+    portable.
+    
+    OpenBSD-Commit-ID: 5b22a1919d9cee907d3f8a029167f70a481891c6
+
+commit 5de6ac2bad11175135d9b819b3546db0ca0b4878
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Jan 21 11:44:19 2019 +1100
+
+    remove HAVE_DLOPEN that snuck in
+    
+    portable doesn't use this
+
+commit e2cb445d786f7572da2af93e3433308eaed1093a
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Jan 21 11:32:28 2019 +1100
+
+    conditionalise ECDSA PKCS#11 support
+    
+    Require EC_KEY_METHOD support in libcrypto, evidenced by presence
+    of EC_KEY_METHOD_new() function.
+
+commit fcb1b0937182d0137a3c357c89735d0dc5869d54
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Jan 20 23:12:35 2019 +0000
+
+    upstream: we use singleton pkcs#11 RSA_METHOD and EC_KEY_METHOD
+    
+    now, so there is no need to keep a copy of each in the pkcs11_key object.
+    
+    work by markus@, ok djm@
+    
+    OpenBSD-Commit-ID: 43b4856516e45c0595f17a8e95b2daee05f12faa
+
+commit 6529409e85890cd6df7e5e81d04e393b1d2e4b0b
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Jan 20 23:11:11 2019 +0000
+
+    upstream: KNF previous; from markus@
+    
+    OpenBSD-Commit-ID: 3dfe35e25b310c3968b1e4e53a0cb1d03bda5395
+
+commit 58622a8c82f4e2aad630580543f51ba537c1f39e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Jan 20 23:10:33 2019 +0000
+
+    upstream: use OpenSSL's RSA reference counting hooks to
+    
+    implicitly clean up pkcs11_key objects when their owning RSA object's
+    reference count drops to zero. Simplifies the cleanup path and makes it more
+    like ECDSA's
+    
+    work by markus@, ok djm@
+    
+    OpenBSD-Commit-ID: 74b9c98f405cd78f7148e9e4a4982336cd3df25c
+
+commit f118542fc82a3b3ab0360955b33bc5a271ea709f
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Jan 20 23:08:24 2019 +0000
+
+    upstream: make the PKCS#11 RSA code more like the new PKCS#11
+    
+    ECDSA code: use a single custom RSA_METHOD instead of a method per key
+    
+    suggested by me, but markus@ did all the work.
+    ok djm@
+    
+    OpenBSD-Commit-ID: 8aafcebe923dc742fc5537a995cee549d07e4b2e
+
+commit 445cfce49dfc904c6b8ab25afa2f43130296c1a5
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Jan 20 23:05:52 2019 +0000
+
+    upstream: fix leak of ECDSA pkcs11_key objects
+    
+    work by markus, ok djm@
+    
+    OpenBSD-Commit-ID: 9fc0c4f1d640aaa5f19b8d70f37ea19b8ad284a1
+
+commit 8a2467583f0b5760787273796ec929190c3f16ee
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Jan 20 23:03:26 2019 +0000
+
+    upstream: use EVP_PKEY_get0_EC_KEY() instead of direct access of
+    
+    EC_KEY internals as that won't work on OpenSSL
+    
+    work by markus@, feedback and ok djm@
+    
+    OpenBSD-Commit-ID: 4a99cdb89fbd6f5155ef8c521c99dc66e2612700
+
+commit 24757c1ae309324e98d50e5935478655be04e549
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Jan 20 23:01:59 2019 +0000
+
+    upstream: cleanup PKCS#11 ECDSA pubkey loading: the returned
+    
+    object should never have a DER header
+    
+    work by markus; feedback and ok djm@
+    
+    OpenBSD-Commit-ID: b617fa585eddbbf0b1245b58b7a3c4b8d613db17
+
+commit 749aef30321595435ddacef2f31d7a8f2b289309
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Jan 20 23:00:12 2019 +0000
+
+    upstream: cleanup unnecessary code in ECDSA pkcs#11 signature
+    
+    work by markus@, feedback and ok djm@
+    
+    OpenBSD-Commit-ID: affa5ca7d58d59fbd16169f77771dcdbd2b0306d
+
+commit 0c50992af49b562970dd0ba3f8f151f1119e260e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Jan 20 22:57:45 2019 +0000
+
+    upstream: cleanup pkcs#11 client code: use sshkey_new in instead
+    
+    of stack- allocating a sshkey
+    
+    work by markus@, ok djm@
+    
+    OpenBSD-Commit-ID: a048eb6ec8aa7fa97330af927022c0da77521f91
+
+commit 854bd8674ee5074a239f7cadf757d55454802e41
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Jan 20 22:54:30 2019 +0000
+
+    upstream: allow override of the pkcs#11 helper binary via
+    
+    $SSH_PKCS11_HELPER; needed for regress tests.
+    
+    work by markus@, ok me
+    
+    OpenBSD-Commit-ID: f78d8185500bd7c37aeaf7bd27336db62f0f7a83
+
+commit 93f02107f44d63a016d8c23ebd2ca9205c495c48
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Jan 20 22:51:37 2019 +0000
+
+    upstream: add support for ECDSA keys in PKCS#11 tokens
+    
+    Work by markus@ and Pedro Martelletto, feedback and ok me@
+    
+    OpenBSD-Commit-ID: a37d651e221341376636056512bddfc16efb4424
+
+commit aa22c20e0c36c2fc610cfcc793b0d14079c38814
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Jan 20 22:03:29 2019 +0000
+
+    upstream: add option to test whether keys in an agent are usable,
+    
+    by performing a signature and a verification using each key "ssh-add -T
+    pubkey [...]"
+    
+    work by markus@, ok djm@
+    
+    OpenBSD-Commit-ID: 931b888a600b6a883f65375bd5f73a4776c6d19b
+
+commit a36b0b14a12971086034d53c0c3dfbad07665abe
+Author: tb@openbsd.org <tb@openbsd.org>
+Date:   Sun Jan 20 02:01:59 2019 +0000
+
+    upstream: Fix BN_is_prime_* calls in SSH, the API returns -1 on
+    
+    error.
+    
+    Found thanks to BoringSSL's commit 53409ee3d7595ed37da472bc73b010cd2c8a5ffd
+    by David Benjamin.
+    
+    ok djm, dtucker
+    
+    OpenBSD-Commit-ID: 1ee832be3c44b1337f76b8562ec6d203f3b072f8
+
+commit ec4776bb01dd8d61fddc7d2a31ab10bf3d3d829a
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Sun Jan 20 01:12:40 2019 +0000
+
+    upstream: DH-GEX min value is now specified in RFC8270. ok djm@
+    
+    OpenBSD-Commit-ID: 1229d0feb1d0ecefe05bf67a17578b263e991acc
+
+commit c90a7928c4191303e76a8c58b9008d464287ae1b
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Jan 21 09:22:36 2019 +1100
+
+    Check for cc before gcc.
+    
+    If cc is something other than gcc and is the system compiler prefer using
+    that, unless otherwise told via $CC.  ok djm@
+
+commit 9b655dc9c9a353f0a527f0c6c43a5e35653c9503
+Author: Damien Miller <djm@mindrot.org>
+Date:   Sun Jan 20 14:55:27 2019 +1100
+
+    last bits of old packet API / active_state global
+
+commit 3f0786bbe73609ac96e5a0d91425ee21129f8e04
+Author: Damien Miller <djm@mindrot.org>
+Date:   Sun Jan 20 10:22:18 2019 +1100
+
+    remove PAM dependencies on old packet API
+    
+    Requires some caching of values, because the PAM code isn't
+    always called with packet context.
+
+commit 08f66d9f17e12c1140d1f1cf5c4dce67e915d3cc
+Author: Damien Miller <djm@mindrot.org>
+Date:   Sun Jan 20 09:58:45 2019 +1100
+
+    remove vestiges of old packet API from loginrec.c
+
+commit c327813ea1d740e3e367109c17873815aba1328e
+Author: Damien Miller <djm@mindrot.org>
+Date:   Sun Jan 20 09:45:38 2019 +1100
+
+    depend
+
+commit 135e302cfdbe91817294317c337cc38c3ff01cba
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 19 22:30:52 2019 +0000
+
+    upstream: fix error in refactor: use ssh_packet_disconnect() instead of
+    
+    sshpkt_error(). The first one logs the error and exits (what we want) instead
+    of just logging and blundering on.
+    
+    OpenBSD-Commit-ID: 39f51b43641dce9ce0f408ea6c0e6e077e2e91ae
+
+commit 245c6a0b220b58686ee35bc5fc1c359e9be2faaa
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 19 21:45:31 2019 +0000
+
+    upstream: remove last traces of old packet API!
+    
+    with & ok markus@
+    
+    OpenBSD-Commit-ID: 9bd10437026423eb8245636ad34797a20fbafd7d
+
+commit 04c091fc199f17dacf8921df0a06634b454e2722
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 19 21:43:56 2019 +0000
+
+    upstream: remove last references to active_state
+    
+    with & ok markus@
+    
+    OpenBSD-Commit-ID: 78619a50ea7e4ca2f3b54d4658b3227277490ba2
+
+commit ec00f918b8ad90295044266c433340a8adc93452
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 19 21:43:07 2019 +0000
+
+    upstream: convert monitor.c to new packet API
+    
+    with & ok markus@
+    
+    OpenBSD-Commit-ID: 61ecd154bd9804461a0cf5f495a29d919e0014d5
+
+commit 6350e0316981489d4205952d6904d6fedba5bfe0
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 19 21:42:30 2019 +0000
+
+    upstream: convert sshd.c to new packet API
+    
+    with & ok markus@
+    
+    OpenBSD-Commit-ID: ea569d3eaf9b5cf1bad52779fbfa5fa0b28af891
+
+commit a5e2ad88acff2b7d131ee6d5dc5d339b0f8c6a6d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 19 21:41:53 2019 +0000
+
+    upstream: convert session.c to new packet API
+    
+    with & ok markus@
+    
+    OpenBSD-Commit-ID: fae817207e23099ddd248960c984f7b7f26ea68e
+
+commit 3a00a921590d4c4b7e96df11bb10e6f9253ad45e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 19 21:41:18 2019 +0000
+
+    upstream: convert auth.c to new packet API
+    
+    with & ok markus@
+    
+    OpenBSD-Commit-ID: 7e10359f614ff522b52a3f05eec576257794e8e4
+
+commit 7ec5cb4d15ed2f2c5c9f5d00e6b361d136fc1e2d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 19 21:40:48 2019 +0000
+
+    upstream: convert serverloop.c to new packet API
+    
+    with & ok markus@
+    
+    OpenBSD-Commit-ID: c92dd19b55457541478f95c0d6b318426d86d885
+
+commit 64c9598ac05332d1327cbf55334dee4172d216c4
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 19 21:40:21 2019 +0000
+
+    upstream: convert the remainder of sshconnect2.c to new packet
+    
+    API
+    
+    with & ok markus@
+    
+    OpenBSD-Commit-ID: 0986d324f2ceb5e8a12ac21c1bb10b3b4b1e0f71
+
+commit bc5e1169d101d16e3a5962a928db2bc49a8ef5a3
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 19 21:39:12 2019 +0000
+
+    upstream: convert the remainder of clientloop.c to new packet API
+    
+    with & ok markus@
+    
+    OpenBSD-Commit-ID: ce2fbbacb86a290f31da1e7bf04cddf2bdae3d1e
+
+commit 5ebce136a6105f084db8f0d7ee41981d42daec40
+Author: Damien Miller <djm@mindrot.org>
+Date:   Sun Jan 20 09:44:53 2019 +1100
+
+    upstream: convert auth2.c to new packet API
+    
+    OpenBSD-Commit-ID: ed831bb95ad228c6791bc18b60ce7a2edef2c999
+
+commit 172a592a53ebe8649c4ac0d7946e6c08eb151af6
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 19 21:37:48 2019 +0000
+
+    upstream: convert servconf.c to new packet API
+    
+    with & ok markus@
+    
+    OpenBSD-Commit-ID: 126553aecca302c9e02fd77e333b9cb217e623b4
+
+commit 8cc7a679d29cf6ecccfa08191e688c7f81ef95c2
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 19 21:37:13 2019 +0000
+
+    upstream: convert channels.c to new packet API
+    
+    with & ok markus@
+    
+    OpenBSD-Commit-ID: 0b8279b56113cbd4011fc91315c0796b63dc862c
+
+commit 06232038c794c7dfcb087be0ab0b3e65b09fd396
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 19 21:36:38 2019 +0000
+
+    upstream: convert sshconnect.c to new packet API
+    
+    with & ok markus@
+    
+    OpenBSD-Commit-ID: 222337cf6c96c347f1022d976fac74b4257c061f
+
+commit 25b2ed667216314471bb66752442c55b95792dc3
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 19 21:36:06 2019 +0000
+
+    upstream: convert ssh.c to new packet API
+    
+    with & ok markus@
+    
+    OpenBSD-Commit-ID: eb146878b24e85c2a09ee171afa6797c166a2e21
+
+commit e3128b38623eef2fa8d6e7ae934d3bd08c7e973e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 19 21:35:25 2019 +0000
+
+    upstream: convert mux.c to new packet API
+    
+    with & ok markus@
+    
+    OpenBSD-Commit-ID: 4e3893937bae66416e984b282d8f0f800aafd802
+
+commit ed1df7226caf3a943a36d580d4d4e9275f8a61ee
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 19 21:34:45 2019 +0000
+
+    upstream: convert sshconnect2.c to new packet API
+    
+    with & ok markus@
+    
+    OpenBSD-Commit-ID: 1cb869e0d6e03539f943235641ea070cae2ebc58
+
+commit 23f22a4aaa923c61ec49a99ebaa383656e87fa40
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 19 21:33:57 2019 +0000
+
+    upstream: convert clientloop.c to new packet API
+    
+    with & ok markus@
+    
+    OpenBSD-Commit-ID: 497b36500191f452a22abf283aa8d4a9abaee7fa
+
+commit ad60b1179c9682ca5aef0b346f99ef68cbbbc4e5
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 19 21:33:13 2019 +0000
+
+    upstream: allow sshpkt_fatal() to take a varargs format; we'll
+    
+    use this to give packet-related fatal error messages more context (esp. the
+    remote endpoint) ok markus@
+    
+    OpenBSD-Commit-ID: de57211f9543426b515a8a10a4f481666b2b2a50
+
+commit 0fa174ebe129f3d0aeaf4e2d1dd8de745870d0ff
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jan 19 21:31:32 2019 +0000
+
+    upstream: begin landing remaining refactoring of packet parsing
+    
+    API, started almost exactly six years ago.
+    
+    This change stops including the old packet_* API by default and makes
+    each file that requires the old API include it explicitly. We will
+    commit file-by-file refactoring to remove the old API in consistent
+    steps.
+    
+    with & ok markus@
+    
+    OpenBSD-Commit-ID: 93c98a6b38f6911fd1ae025a1ec57807fb4d4ef4
+
+commit 4ae7f80dfd02f2bde912a67c9f338f61e90fa79f
+Author: tb@openbsd.org <tb@openbsd.org>
+Date:   Sat Jan 19 04:15:56 2019 +0000
+
+    upstream: Print an \r in front of the password prompt so parts of
+    
+    a password that was entered too early are likely clobbered by the prompt.
+    Idea from doas.
+    
+    from and ok djm
+    "i like it" deraadt
+    
+    OpenBSD-Commit-ID: 5fb97c68df6d8b09ab37f77bca1d84d799c4084e
+
+commit a6258e5dc314c7d504ac9f0fbc3be96475581dbe
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Jan 18 11:09:01 2019 +1100
+
+    Add minimal fchownat and fchmodat implementations.
+    
+    Fixes builds on at least OS X Lion, NetBSD 6 and Solaris 10.
+
+commit 091093d25802b87d3b2b09f2c88d9f33e1ae5562
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Jan 18 12:11:42 2019 +1300
+
+    Add a minimal implementation of utimensat().
+    
+    Some systems (eg older OS X) do not have utimensat, so provide minimal
+    implementation in compat layer.  Fixes build on at least El Capitan.
+
+commit 609644027dde1f82213699cb6599e584c7efcb75
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jan 1 22:20:16 2019 +0000
+
+    upstream: regress bits for banner processing refactor (this test was
+    
+    depending on ssh returning a particular error message for banner parsing
+    failure)
+    
+    reminded by bluhm@
+    
+    OpenBSD-Regress-ID: f24fc303d40931157431df589b386abf5e1be575
+
+commit f47d72ddad75b93d3cbc781718b0fa9046c03df8
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Jan 17 04:45:09 2019 +0000
+
+    upstream: tun_fwd_ifnames variable should b
+    
+    =?UTF-8?q?e=20extern;=20from=20Hanno=20B=C3=B6ck?=
+    MIME-Version: 1.0
+    Content-Type: text/plain; charset=UTF-8
+    Content-Transfer-Encoding: 8bit
+    
+    OpenBSD-Commit-ID: d53dede6e521161bf04d39d09947db6253a38271
+
+commit 943d0965263cae1c080ce5a9d0b5aa341885e55d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Jan 17 04:20:53 2019 +0000
+
+    upstream: include time.h for time(3)/nanosleep(2); from Ian
+    
+    McKellar
+    
+    OpenBSD-Commit-ID: 6412ccd06a88f65b207a1089345f51fa1244ea51
+
+commit dbb4dec6d5d671b5e9d67ef02162a610ad052068
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Jan 17 01:50:24 2019 +0000
+
+    upstream: many of the global variables in this file can be made static;
+    
+    patch from Markus Schmidt
+    
+    OpenBSD-Commit-ID: f3db619f67beb53257b21bac0e92b4fb7d5d5737
+
+commit 60d8c84e0887514c99c9ce071965fafaa1c3d34a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Jan 16 23:23:45 2019 +0000
+
+    upstream: Add "-h" flag to sftp chown/chgrp/chmod commands to
+    
+    request they do not follow symlinks. Requires recently-committed
+    lsetstat@openssh.com extension on the server side.
+    
+    ok markus@ dtucker@
+    
+    OpenBSD-Commit-ID: f93bb3f6f7eb2fb7ef1e59126e72714f1626d604
+
+commit dbbc7e0eab7262f34b8e0cd6efecd1c77b905ed0
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Jan 16 23:22:10 2019 +0000
+
+    upstream: add support for a "lsetstat@openssh.com" extension. This
+    
+    replicates the functionality of the existing SSH2_FXP_SETSTAT operation but
+    does not follow symlinks. Based on a patch from Bert Haverkamp in bz#2067 but
+    with more attribute modifications supported.
+    
+    ok markus@ dtucker@
+    
+    OpenBSD-Commit-ID: f7234f6e90db19655d55d936a115ee4ccb6aaf80
+
+commit 4a526941d328fc3d97068c6a4cbd9b71b70fe5e1
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jan 4 03:27:50 2019 +0000
+
+    upstream: eliminate function-static attempt counters for
+    
+    passwd/kbdint authmethods by moving them to the client authctxt; Patch from
+    Markus Schmidt, ok markus@
+    
+    OpenBSD-Commit-ID: 4df4404a5d5416eb056f68e0e2f4fa91ba3b3f7f
+
+commit 8a8183474c41bd6cebaa917346b549af2239ba2f
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jan 4 03:23:00 2019 +0000
+
+    upstream: fix memory leak of ciphercontext when rekeying; bz#2942
+    
+    Patch from Markus Schmidt; ok markus@
+    
+    OpenBSD-Commit-ID: 7877f1b82e249986f1ef98d0ae76ce987d332bdd
+
+commit 5bed70afce0907b6217418d0655724c99b683d93
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jan 1 23:10:53 2019 +0000
+
+    upstream: static on global vars, const on handler tables that contain
+    
+    function pointers; from Mike Frysinger
+    
+    OpenBSD-Commit-ID: 7ef2305e50d3caa6326286db43cf2cfaf03960e0
+
+commit 007a88b48c97d092ed2f501bbdcb70d9925277be
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Dec 27 23:02:11 2018 +0000
+
+    upstream: Request RSA-SHA2 signatures for
+    
+    rsa-sha2-{256|512}-cert-v01@openssh.com cert algorithms; ok markus@
+    
+    OpenBSD-Commit-ID: afc6f7ca216ccd821656d1c911d2a3deed685033
+
+commit eb347d086c35428c47fe52b34588cbbc9b49d9a6
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Dec 27 03:37:49 2018 +0000
+
+    upstream: ssh_packet_set_state() now frees ssh->kex implicitly, so
+    
+    don't do explicit kex_free() beforehand
+    
+    OpenBSD-Regress-ID: f2f73bad47f62a2040ccba0a72cadcb12eda49cf
+
+commit bb542f0cf6f7511a22a08c492861e256a82376a9
+Author: tedu@openbsd.org <tedu@openbsd.org>
+Date:   Sat Dec 15 00:50:21 2018 +0000
+
+    upstream: remove unused and problematic sudo clean. ok espie
+    
+    OpenBSD-Regress-ID: ca90c20a15a85b661e13e98b80c10e65cd662f7b
+
+commit 0a843d9a0e805f14653a555f5c7a8ba99d62c12d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Dec 27 03:25:24 2018 +0000
+
+    upstream: move client/server SSH-* banners to buffers under
+    
+    ssh->kex and factor out the banner exchange. This eliminates some common code
+    from the client and server.
+    
+    Also be more strict about handling \r characters - these should only
+    be accepted immediately before \n (pointed out by Jann Horn).
+    
+    Inspired by a patch from Markus Schmidt.
+    (lots of) feedback and ok markus@
+    
+    OpenBSD-Commit-ID: 1cc7885487a6754f63641d7d3279b0941890275b
+
+commit 434b587afe41c19391821e7392005068fda76248
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Dec 7 04:36:09 2018 +0000
+
+    upstream: Fix calculation of initial bandwidth limits. Account for
+    
+    written bytes before the initial timer check so that the first buffer written
+    is accounted.  Set the threshold after which the timer is checked such that
+    the limit starts being computed as soon as possible, ie after the second
+    buffer is written.  This prevents an initial burst of traffic and provides a
+    more accurate bandwidth limit.  bz#2927, ok djm.
+    
+    OpenBSD-Commit-ID: ff3ef76e4e43040ec198c2718d5682c36b255cb6
+
+commit a6a0788cbbe8dfce2819ee43b09c80725742e21c
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Dec 7 03:39:40 2018 +0000
+
+    upstream: only consider the ext-info-c extension during the initial
+    
+    KEX. It shouldn't be sent in subsequent ones, but if it is present we should
+    ignore it.
+    
+    This prevents sshd from sending a SSH_MSG_EXT_INFO for REKEX for buggy
+    these clients. Reported by Jakub Jelen via bz2929; ok dtucker@
+    
+    OpenBSD-Commit-ID: 91564118547f7807030ec537480303e2371902f9
+
+commit 63bba57a32c5bb6158d57cf4c47022daf89c14a0
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Dec 7 03:33:18 2018 +0000
+
+    upstream: fix option letter pasto in previous
+    
+    OpenBSD-Commit-ID: e26c8bf2f2a808f3c47960e1e490d2990167ec39
+
+commit 737e4edd82406595815efadc28ed5161b8b0c01a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Dec 7 03:32:26 2018 +0000
+
+    upstream: mention that the ssh-keygen -F (find host in
+    
+    authorized_keys) and -R (remove host from authorized_keys) options may accept
+    either a bare hostname or a [hostname]:port combo. bz#2935
+    
+    OpenBSD-Commit-ID: 5535cf4ce78375968b0d2cd7aa316fa3eb176780
+
+commit 8a22ffaa13391cfe5b40316d938fe0fb931e9296
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Dec 7 15:41:16 2018 +1100
+
+    expose $SSH_CONNECTION in the PAM environment
+    
+    This makes the connection 4-tuple available to PAM modules that
+    wish to use it in decision-making. bz#2741
+
+commit a784fa8c7a7b084d63bae82ccfea902131bb45c5
+Author: Kevin Adler <kadler@us.ibm.com>
+Date:   Wed Dec 12 22:12:45 2018 -0600
+
+    Don't pass loginmsg by address now that it's an sshbuf*
+    
+    In 120a1ec74, loginmsg was changed from the legacy Buffer type
+    to struct sshbuf*, but it missed changing calls to
+    sys_auth_allowed_user and sys_auth_record_login which passed
+    loginmsg by address. Now that it's a pointer, just pass it directly.
+    
+    This only affects AIX, unless there are out of tree users.
+
+commit 285310b897969a63ef224d39e7cc2b7316d86940
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Dec 7 02:31:20 2018 +0000
+
+    upstream: no need to allocate channels_pre/channels_post in
+    
+    channel_init_channels() as we do it anyway in channel_handler_init() that we
+    call at the end of the function. Fix from Markus Schmidt via bz#2938
+    
+    OpenBSD-Commit-ID: 74893638af49e3734f1e33a54af1b7ea533373ed
+
+commit 87d6cf1cbc91df6815db8fe0acc7c910bc3d18e4
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 30 02:24:52 2018 +0000
+
+    upstream: don't attempt to connect to empty SSH_AUTH_SOCK; bz#293
+    
+    OpenBSD-Commit-ID: 0e8fc8f19f14b21adef7109e0faa583d87c0e929
+
+commit 91b19198c3f604f5eef2c56dbe36f29478243141
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Nov 28 06:00:38 2018 +0000
+
+    upstream: don't truncate user or host name in "user@host's
+    
+    OpenBSD-Commit-ID: e6ca01a8d58004b7f2cac0b1b7ce8f87e425e360
+
+commit dd0cf6318d9b4b3533bda1e3bc021b2cd7246b7a
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Fri Nov 23 06:58:28 2018 +0000
+
+    upstream: tweak previous;
+    
+    OpenBSD-Commit-ID: 08f096922eb00c98251501c193ff9e83fbb5de4f
+
+commit 8a85f5458d1c802471ca899c97f89946f6666e61
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sun Nov 25 21:44:05 2018 +1100
+
+    Include stdio.h for FILE if needed.
+
+commit 16fb23f25454991272bfe4598cc05d20fcd25116
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sun Nov 25 14:05:57 2018 +1100
+
+    Reverse order of OpenSSL init functions.
+    
+    Try the new init function (OPENSSL_init_crypto) before falling back to
+    the old one (OpenSSL_add_all_algorithms).
+
+commit 98f878d2272bf8dff21f2a0265d963c29e33fed2
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sun Nov 25 14:05:08 2018 +1100
+
+    Improve OpenSSL_add_all_algorithms check.
+    
+    OpenSSL_add_all_algorithms() may be a macro so check for that too.
+
+commit 9e34e0c59ab04514f9de9934a772283f7f372afe
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 23 05:08:07 2018 +0000
+
+    upstream: add a ssh_config "Match final" predicate
+    
+    Matches in same pass as "Match canonical" but doesn't require
+    hostname canonicalisation be enabled. bz#2906 ok markus
+    
+    OpenBSD-Commit-ID: fba1dfe9f6e0cabcd0e2b3be13f7a434199beffa
+
+commit 4da58d58736b065b1182b563d10ad6765d811c6d
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Nov 23 02:53:57 2018 +0000
+
+    upstream: Remove now-unneeded ifdef SIGINFO around handler since it is
+    
+    now always used for SIGUSR1 even when SIGINFO is not defined.  This will make
+    things simpler in -portable.
+    
+    OpenBSD-Regress-ID: 4ff0265b335820b0646d37beb93f036ded0dc43f
+
+commit c721d5877509875c8515df0215fa1dab862013bc
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Nov 23 14:11:20 2018 +1100
+
+    Move RANDOM_SEED_SIZE outside ifdef.
+    
+    RANDOM_SEED_SIZE is used by both the OpenSSL and non-OpenSSL code
+    This fixes the build with configureed --without-openssl.
+
+commit deb51552c3ce7ce72c8d0232e4f36f2e7c118c7d
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Nov 22 19:59:28 2018 +1100
+
+    Resync with OpenBSD by pulling in an ifdef SIGINFO.
+
+commit 28c7b2cd050f4416bfcf3869a20e3ea138aa52fe
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Nov 23 10:45:20 2018 +1100
+
+    fix configure test for OpenSSL version
+    
+    square brackets in case statements may be eaten by autoconf.
+    
+    Report and fix from Filipp Gunbin; tweaked by naddy@
+
+commit 42c5ec4b97b6a1bae70f323952d0646af16ce710
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Nov 23 10:40:06 2018 +1100
+
+    refactor libcrypto initialisation
+    
+    Don't call OpenSSL_add_all_algorithms() unless OpenSSL actually
+    supports it.
+    
+    Move all libcrypto initialisation to a single function, and call that
+    from seed_rng() that is called early in each tool's main().
+    
+    Prompted by patch from Rosen Penev
+
+commit 5b60b6c02009547a3e2a99d4886965de2a4719da
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Nov 22 08:59:11 2018 +0000
+
+    upstream: Output info on SIGUSR1 as well as
+    
+    SIGINFO to resync with portable.  (ID sync only).
+    
+    OpenBSD-Regress-ID: 699d153e2de22dce51a1b270c40a98472d1a1b16
+
+commit e4ae345dc75b34fd870c2e8690d831d2c1088eb7
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Nov 22 08:48:32 2018 +0000
+
+    upstream: Append pid to temp files in /var/run and set a cleanup
+    
+    trap for them. This allows multiple instances of tests to run without
+    colliding.
+    
+    OpenBSD-Regress-ID: 57add105ecdfc54752d8003acdd99eb68c3e0b4c
+
+commit f72d0f52effca5aa20a193217346615ecd3eed53
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Wed Oct 31 11:09:27 2018 +0000
+
+    upstream: UsePrivilegeSeparation no is deprecated
+    
+    test "yes" and "sandbox".
+    
+    OpenBSD-Regress-ID: 80e685ed8990766527dc629b1affc09a75bfe2da
+
+commit 35d0e5fefc419bddcbe09d7fc163d8cd3417125b
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Oct 17 23:28:05 2018 +0000
+
+    upstream: add some knobs:
+    
+    UNITTEST_FAST?= no     # Skip slow tests (e.g. less intensive fuzzing).
+    UNITTEST_SLOW?= no     # Include slower tests (e.g. more intensive fuzzing).
+    UNITTEST_VERBOSE?= no  # Verbose test output (inc. per-test names).
+    
+    useful if you want to run the tests as a smoke test to exercise the
+    functionality without waiting for all the fuzzers to run.
+    
+    OpenBSD-Regress-ID: e04d82ebec86068198cd903acf1c67563c57315e
+
+commit c1941293d9422a14dda372b4c21895e72aa7a063
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Nov 22 15:52:26 2018 +1100
+
+    Resync Makefile.inc with upstream.
+    
+    It's unused in -portable, but having it out of sync makes other syncs
+    fail to apply.
+
+commit 928f1231f65f88cd4c73e6e0edd63d2cf6295d77
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Nov 19 04:12:32 2018 +0000
+
+    upstream: silence (to log level debug2) failure messages when
+    
+    loading the default hostkeys. Hostkeys explicitly specified in the
+    configuration or on the command-line are still reported as errors, and
+    failure to load at least one host key remains a fatal error.
+    MIME-Version: 1.0
+    Content-Type: text/plain; charset=UTF-8
+    Content-Transfer-Encoding: 8bit
+    
+    Based on patch from Dag-Erling Smørgrav via
+    https://github.com/openssh/openssh-portable/pull/103
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: ffc2e35a75d1008effaf05a5e27425041c27b684
+
+commit 7fca94edbe8ca9f879da9fdd2afd959c4180f4c7
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Sun Nov 18 22:43:29 2018 +0000
+
+    upstream: Fix inverted logic for redirecting ProxyCommand stderr to
+    
+    /dev/null. Fixes mosh in proxycommand mode that was broken by the previous
+    ProxyCommand change that was reported by matthieu@. ok djm@ danj@
+    
+    OpenBSD-Commit-ID: c6fc9641bc250221a0a81c6beb2e72d603f8add6
+
+commit ccef7c4faf914993b53035cd2b25ce02ab039c9d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 16 06:17:38 2018 +0000
+
+    upstream: redirect stderr of ProxyCommands to /dev/null when ssh is
+    
+    started with ControlPersist; based on patch from Steffen Prohaska
+    
+    OpenBSD-Commit-ID: 1bcaa14a03ae80369d31021271ec75dce2597957
+
+commit 15182fd96845a03216d7ac5a2cf31c4e77e406e3
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 16 06:10:29 2018 +0000
+
+    upstream: make grandparent-parent-child sshbuf chains robust to
+    
+    use-after-free faults if the ancestors are freed before the descendents.
+    Nothing in OpenSSH uses this deallocation pattern. Reported by Jann Horn
+    
+    OpenBSD-Commit-ID: d93501d1d2734245aac802a252b9bb2eccdba0f2
+
+commit 2a35862e664afde774d4a72497d394fe7306ccb5
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 16 03:26:01 2018 +0000
+
+    upstream: use path_absolute() for pathname checks; from Manoj Ampalam
+    
+    OpenBSD-Commit-ID: 482ce71a5ea5c5f3bc4d00fd719481a6a584d925
+
+commit d0d1dfa55be1c5c0d77ab3096b198a64235f936d
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Nov 16 14:11:44 2018 +1100
+
+    Test for OPENSSL_init_crypto before using.
+    
+    Check for the presence of OPENSSL_init_crypto and all the flags we want
+    before trying to use it (bz#2931).
+
+commit 6010c0303a422a9c5fa8860c061bf7105eb7f8b2
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 16 03:03:10 2018 +0000
+
+    upstream: disallow empty incoming filename or ones that refer to the
+    
+    current directory; based on report/patch from Harry Sintonen
+    
+    OpenBSD-Commit-ID: f27651b30eaee2df49540ab68d030865c04f6de9
+
+commit aaed635e3a401cfcc4cc97f33788179c458901c3
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 16 02:46:20 2018 +0000
+
+    upstream: fix bug in client that was keeping a redundant ssh-agent
+    
+    socket around for the life of the connection; bz#2912; reported by Simon
+    Tatham; ok dtucker@
+    
+    OpenBSD-Commit-ID: 4ded588301183d343dce3e8c5fc1398e35058478
+
+commit e76135e3007f1564427b2956c628923d8dc2f75a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 16 02:43:56 2018 +0000
+
+    upstream: fix bug in HostbasedAcceptedKeyTypes and
+    
+    PubkeyAcceptedKeyTypes options. If only RSA-SHA2 siganture types were
+    specified, then authentication would always fail for RSA keys as the monitor
+    checks only the base key (not the signature algorithm) type against
+    *AcceptedKeyTypes. bz#2746; reported by Jakub Jelen; ok dtucker
+    
+    OpenBSD-Commit-ID: 117bc3dc54578dbdb515a1d3732988cb5b00461b
+
+commit 5c1a63562cac0574c226224075b0829a50b48c9d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 16 02:30:20 2018 +0000
+
+    upstream: support a prefix of '@' to suppress echo of sftp batch
+    
+    commands; bz#2926; ok dtucker@
+    
+    OpenBSD-Commit-ID: 9d635636bc84aeae796467e059f7634de990a79d
+
+commit 90ef45f7aac33eaf55ec344e101548a01e570f29
+Author: schwarze@openbsd.org <schwarze@openbsd.org>
+Date:   Tue Nov 13 07:22:45 2018 +0000
+
+    upstream: fix markup error (missing blank before delimiter); from
+    
+    Mike Frysinger <vapier at gentoo dot org>
+    
+    OpenBSD-Commit-ID: 1bc5392f795ca86318d695e0947eaf71a5a4f6d9
+
+commit 960e7c672dc106f3b759c081de3edb4d1138b36e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 9 02:57:58 2018 +0000
+
+    upstream: typo in error message; caught by Debian lintian, via
+    
+    Colin Watson
+    
+    OpenBSD-Commit-ID: bff614c7bd1f4ca491a84e9b5999f848d0d66758
+
+commit 81f1620c836e6c79c0823ba44acca605226a80f1
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Nov 9 02:56:22 2018 +0000
+
+    upstream: correct local variable name; from yawang AT microsoft.com
+    
+    OpenBSD-Commit-ID: a0c228390856a215bb66319c89cb3959d3af8c87
+
+commit 1293740e800fa2e5ccd38842a2e4970c6f3b9831
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Wed Oct 31 11:20:05 2018 +0000
+
+    upstream: Import new moduli.
+    
+    OpenBSD-Commit-ID: c07772f58028fda683ee6abd41c73da3ff70d403
+
+commit 46925ae28e53fc9add336a4fcdb7ed4b86c3591c
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Oct 26 01:23:03 2018 +0000
+
+    upstream: mention ssh-ed25519-cert-v01@openssh.com in list of cert
+    
+    key type at start of doc
+    
+    OpenBSD-Commit-ID: b46b0149256d67f05f2d5d01e160634ed1a67324
+
+commit 8d8340e2c215155637fe19cb1a837f71b2d55f7b
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Nov 16 13:32:13 2018 +1100
+
+    Remove fallback check for /usr/local/ssl.
+    
+    If configure could not find a working OpenSSL installation it would
+    fall back to checking in /usr/local/ssl.  This made sense back when
+    systems did not ship with OpenSSL, but most do and OpenSSL 1.1 doesn't
+    use that as a default any more.  The fallback behaviour also meant
+    that if you pointed --with-ssl-dir at a specific directory and it
+    didn't work, it would silently use either the system libs or the ones
+    in /usr/local/ssl.  If you want to use /usr/local/ssl you'll need to
+    pass configure --with-ssl-dir=/usr/local/ssl.  ok djm@
+
+commit ce93472134fb22eff73edbcd173a21ae38889331
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Nov 16 12:44:01 2018 +1100
+
+    Fix check for OpenSSL 1.0.1 exactly.
+    
+    Both INSTALL and configure.ac claim OpenSSL >= 1.0.1 is supported; fix
+    compile-time check for 1.0.1 to match.
+
+commit f2970868f86161a22b2c377057fa3891863a692a
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sun Nov 11 15:58:20 2018 +1100
+
+    Improve warnings in cygwin service setup.
+    
+    bz#2922, patch from vinschen at redhat.com.
+
+commit bd2d54fc1eee84bf87158a1277a50e6c8a303339
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sun Nov 11 15:54:54 2018 +1100
+
+    Remove hardcoded service name in cygwin setup.
+    
+    bz#2922, patch from Christian.Lupien at USherbrooke.ca, sanity check
+    by vinschen at redhat.com.
+
+commit d0153c77bf7964e694f1d26c56c41a571b8e9466
+Author: Dag-Erling Smørgrav <des@des.no>
+Date:   Tue Oct 9 23:03:40 2018 +0200
+
+    AC_CHECK_SIZEOF() no longer needs a second argument.
+
+commit 9b47b083ca9d866249ada9f02dbd57c87b13806e
+Author: Manoj Ampalam <manojamp@microsoft.com>
+Date:   Thu Nov 8 22:41:59 2018 -0800
+
+    Fix error message w/out nistp521.
+    
+    Correct error message when OpenSSL doesn't support certain ECDSA key
+    lengths.
+
+commit 624d19ac2d56fa86a22417c35536caceb3be346f
+Author: Eneas U de Queiroz <cote2004-github@yahoo.com>
+Date:   Tue Oct 9 16:17:42 2018 -0300
+
+    fix compilation with openssl built without ECC
+    
+    ECDSA code in openssh-compat.h and libressl-api-compat.c needs to be
+    guarded by OPENSSL_HAS_ECC
+    
+    Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
+
+commit 1801cd11d99d05a66ab5248c0555f55909a355ce
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Nov 8 15:03:11 2018 +1100
+
+    Simplify OpenSSL 1.1 function checks.
+    
+    Replace AC_SEARCH_LIBS checks for OpenSSL 1.1 functions with a single
+    AC_CHECK_FUNCS.  ok djm@
+
+commit bc32f118d484e4d71d2a0828fd4eab7e4176c9af
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Nov 5 17:31:24 2018 +1100
+
+    Fix pasto for HAVE_EVP_CIPHER_CTX_SET_IV.
+    
+    Prevents unnecessary redefinition.  Patch from mforney at mforney.org.
+
+commit 3719df60c66abc4b47200d41f571d67772f293ba
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Oct 31 22:21:03 2018 +1100
+
+    Import new moduli.
+
+commit 595605d4abede475339d6a1f07a8cc674c11d1c3
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sun Oct 28 15:18:13 2018 +1100
+
+    Update check for minimum OpenSSL version.
+
+commit 6ab75aba340d827140d7ba719787aabaf39a0355
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sun Oct 28 15:16:31 2018 +1100
+
+    Update required OpenSSL versions to match current.
+
+commit c801b0e38eae99427f37869370151b78f8e15c5d
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sun Oct 28 14:34:12 2018 +1100
+
+    Use detected version functions in openssl compat.
+    
+    Use detected functions in compat layer instead of guessing based on
+    versions.  Really fixes builds with LibreSSL, not just configure.
+
+commit 262d81a259d4aa1507c709ec9d5caa21c7740722
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Oct 27 16:45:59 2018 +1100
+
+    Check for the existence of openssl version funcs.
+    
+    Check for the existence of openssl version functions and use the ones
+    detected instead of trying to guess based on the int32 version
+    identifier.  Fixes builds with LibreSSL.
+
+commit 406a24b25d6a2bdd70cacd16de7e899dcb2a8829
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Oct 26 13:43:28 2018 +1100
+
+    fix builds on OpenSSL <= 1.0.x
+    
+    I thought OpenSSL 1.0.x offered the new-style OpenSSL_version_num() API
+    to obtain version number, but they don't.
+
+commit 859754bdeb41373d372e36b5dc89c547453addb3
+Author: Damien Miller <djm@mindrot.org>
+Date:   Tue Oct 23 17:10:41 2018 +1100
+
+    remove remaining references to SSLeay
+    
+    Prompted by Rosen Penev
+
+commit b9fea45a68946c8dfeace72ad1f6657c18f2a98a
+Author: Damien Miller <djm@mindrot.org>
+Date:   Tue Oct 23 17:10:35 2018 +1100
+
+    regen depend
+
+commit a65784c9f9c5d00cf1a0e235090170abc8d07c73
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Oct 23 05:56:35 2018 +0000
+
+    upstream: refer to OpenSSL not SSLeay;
+    
+    we're old, but we don't have to act it
+    
+    OpenBSD-Commit-ID: 9ca38d11f8ed19e61a55108d1e892d696cee08ec
+
+commit c0a35265907533be10ca151ac797f34ae0d68969
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Oct 22 11:22:50 2018 +1100
+
+    fix compile for openssl 1.0.x w/ --with-ssl-engine
+    
+    bz#2921, patch from cotequeiroz
+
+commit 31b49525168245abe16ad49d7b7f519786b53a38
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Oct 22 20:05:18 2018 +1100
+
+    Include openssl compatibility.
+    
+    Patch from rosenp at gmail.com via openssh-unix-dev.
+
+commit a4fc253f5f44f0e4c47aafe2a17d2c46481d3c04
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Oct 19 03:12:42 2018 +0000
+
+    upstream: when printing certificate contents "ssh-keygen -Lf
+    
+    /path/certificate", include the algorithm that the CA used to sign the cert.
+    
+    OpenBSD-Commit-ID: 1ea20b5048a851a7a0758dcb9777a211a2c0dddd
+
+commit 83b3d99d2b47321b7ebb8db6f6ea04f3808bc069
+Author: florian@openbsd.org <florian@openbsd.org>
+Date:   Mon Oct 15 11:28:50 2018 +0000
+
+    upstream: struct sockaddr_storage is guaranteed to be large enough,
+    
+    no need to check the size. OK kn, deraadt
+    
+    OpenBSD-Commit-ID: 0aa56e92eb49c79f495b31a5093109ec5841f439
+
+commit aede1c34243a6f7feae2fb2cb686ade5f9be6f3d
+Author: Damien Miller <djm@mindrot.org>
+Date:   Wed Oct 17 11:01:20 2018 +1100
+
+    Require OpenSSL 1.1.x series 1.1.0g or greater
+    
+    Previous versions have a bug with EVP_CipherInit() when passed a
+    NULL EVP_CIPHER, per https://github.com/openssl/openssl/pull/4613
+    
+    ok dtucker@
+
+commit 08300c211409c212e010fe2e2f2883e573a04ce2
+Author: Damien Miller <djm@mindrot.org>
+Date:   Wed Oct 17 08:12:02 2018 +1100
+
+    unbreak compilation with --with-ssl-engine
+    
+    Missing last argument to OPENSSL_init_crypto()
+
+commit 1673274aee67ce0eb6f00578b6f3d2bcbd58f937
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Oct 16 14:45:57 2018 +1100
+
+    Remove gcc spectre mitigation flags.
+    
+    Current impementions of the gcc spectre mitigation flags cause
+    miscompilations when combined with other flags and do not provide much
+    protection.  Found by fweimer at redhat.com, ok djm@
+
+commit 4e23deefd7959ef83c73ed9cce574423438f6133
+Author: Damien Miller <djm@mindrot.org>
+Date:   Tue Oct 16 10:51:52 2018 +1100
+
+    Avoid deprecated OPENSSL_config when using 1.1.x
+    
+    OpenSSL 1.1.x soft-deprecated OPENSSL_config in favour of
+    OPENSSL_init_crypto; pointed out by Jakub Jelen
+
+commit 797cdd9c8468ed1125ce60d590ae3f1397866af4
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Oct 12 16:58:47 2018 +1100
+
+    Don't avoid our *sprintf replacements.
+    
+    Don't let systems with broken printf(3) avoid our replacements
+    via asprintf(3)/vasprintf(3) calling libc internally.  From djm@
+
+commit e526127cbd2f8ad88fb41229df0c9b850c722830
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Oct 12 16:43:35 2018 +1100
+
+    Check if snprintf understands %zu.
+    
+    If the platforms snprintf and friends don't understand %zu, use the
+    compat replacement.  Prevents segfaults on those platforms.
+
+commit cf39f875191708c5f2f1a3c1c9019f106e74aea3
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Oct 12 09:48:05 2018 +1100
+
+    remove stale link, tweak
+
+commit a7205e68decf7de2005810853b4ce6b222b65e2a
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Oct 12 09:47:20 2018 +1100
+
+    update version numbers ahead of release
+
+commit 1a4a9cf80f5b92b9d1dadd0bfa8867c04d195391
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Oct 11 03:48:04 2018 +0000
+
+    upstream: don't send new-style rsa-sha2-*-cert-v01@openssh.com names to
+    
+    older OpenSSH that can't handle them. spotted by Adam Eijdenberg; ok dtucker
+    
+    OpenBSD-Commit-ID: 662bbc402e3d7c9b6c322806269698106a6ae631
+
+commit dc8ddcdf1a95e011c263486c25869bb5bf4e30ec
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Oct 11 13:08:59 2018 +1100
+
+    update depends
+
+commit 26841ac265603fd2253e6832e03602823dbb4022
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Oct 11 13:02:11 2018 +1100
+
+    some more duplicated key algorithm lines
+    
+    From Adam Eijdenberg
+
+commit 5d9d17603bfbb620195a4581025052832b4c4adc
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Oct 11 11:56:36 2018 +1100
+
+    fix duplicated algorithm specification lines
+    
+    Spotted by Adam Eijdenberg
+
+commit ebfafd9c7a5b2a7fb515ee95dbe0e44e11d0a663
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Oct 11 00:52:46 2018 +0000
+
+    upstream: typo in plain RSA algorithm counterpart names for
+    
+    certificates; spotted by Adam Eijdenberg; ok dtucker@
+    
+    OpenBSD-Commit-ID: bfcdeb6f4fc9e7607f5096574c8f118f2e709e00
+
+commit c29b111e7d87c2324ff71c80653dd8da168c13b9
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Oct 11 11:29:35 2018 +1100
+
+    check pw_passwd != NULL here too
+    
+    Again, for systems with broken NIS implementations.
+    
+    Prompted by coolbugcheckers AT gmail.com
+
+commit fe8e8f349a553ef4c567acd418aac769a82b7729
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Oct 11 11:03:15 2018 +1100
+
+    check for NULL return from shadow_pw()
+    
+    probably unreachable on this platform; pointed out by
+    coolbugcheckers AT gmail.com
+
+commit acc59cbe7a1fb169e1c3caba65a39bd74d6e030d
+Author: deraadt@openbsd.org <deraadt@openbsd.org>
+Date:   Wed Oct 10 16:43:49 2018 +0000
+
+    upstream: introducing openssh 7.9
+    
+    OpenBSD-Commit-ID: 42d526a9fe01a40dd299ac58014d3349adf40e25
+
+commit 12731158c75c8760a8bea06350eeb3e763fe1a07
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Oct 11 10:29:29 2018 +1100
+
+    supply callback to PEM_read_bio_PrivateKey
+    
+    OpenSSL 1.1.0i has changed the behaviour of their PEM APIs,
+    so that empty passphrases are interpreted differently. This
+    probabalistically breaks loading some keys, because the PEM format
+    is terrible and doesn't include a proper MAC.
+    
+    Avoid this by providing a basic callback to avoid passing empty
+    passphrases to OpenSSL in cases where one is required.
+    
+    Based on patch from Jakub Jelen in bz#2913; ok dtucker@
+
+commit d1d301a1dd5d6cc3a9ed93ab7ab09dda4cb456e0
+Author: Damien Miller <djm@mindrot.org>
+Date:   Wed Oct 10 14:57:00 2018 +1100
+
+    in pick_salt() avoid dereference of NULL passwords
+    
+    Apparently some NIS implementations can leave pw->pw_passwd (or the
+    shadow equivalent) NULL.
+    
+    bz#2909; based on patch from Todd Eigenschink
+
+commit edbb6febccee084d212fdc0cb05b40cb1c646ab1
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Oct 9 05:42:23 2018 +0000
+
+    upstream: Treat all PEM_read_bio_PrivateKey() errors when a passphrase
+    
+    is specified as "incorrect passphrase" instead of trying to choose between
+    that and "invalid format".
+    
+    libcrypto can return ASN1 parsing errors rather than the expected
+    decrypt error in certain infrequent cases when trying to decrypt/parse
+    PEM private keys when supplied with an invalid passphrase.
+    
+    Report and repro recipe from Thomas Deutschmann in bz#2901
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: b1d4cd92395f9743f81c0d23aab2524109580870
+
+commit 2581333d564d8697837729b3d07d45738eaf5a54
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date:   Fri Oct 5 14:26:09 2018 +0000
+
+    upstream: Support using service names for port numbers.
+    
+    * Try to resolve a port specification with getservbyname(3) if a
+     numeric conversion fails.
+    * Make the "Port" option in ssh_config handle its argument as a
+     port rather than a plain integer.
+    
+    ok dtucker@ deraadt@
+    
+    OpenBSD-Commit-ID: e7f03633133205ab3dfbc67f9df7475fabae660d
+
+commit e0d6501e86734c48c8c503f81e1c0926e98c5c4c
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Oct 4 07:47:35 2018 +0000
+
+    upstream: when the peer sends a channel-close message, make sure we
+    
+    close the local extended read fd (stderr) along with the regular read fd
+    (stdout). Avoids weird stuck processed in multiplexing mode.
+    
+    Report and analysis by Nelson Elhage and Geoffrey Thomas in bz#2863
+    
+    ok dtucker@ markus@
+    
+    OpenBSD-Commit-ID: a48a2467fe938de4de69d2e7193d5fa701f12ae9
+
+commit 6f1aabb128246f445e33b8844fad3de9cb1d18cb
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Oct 4 01:04:52 2018 +0000
+
+    upstream: factor out channel status formatting from
+    
+    channel_open_message() so we can use it in other debug messages
+    
+    OpenBSD-Commit-ID: 9c3903ca28fcabad57f566c9d0045b41ab7d52ba
+
+commit f1dd179e122bdfdb7ca3072d9603607740efda05
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Oct 4 00:10:11 2018 +0000
+
+    upstream: include a little more information about the status and
+    
+    disposition of channel's extended (stderr) fd; makes debugging some things a
+    bit easier. No behaviour change.
+    
+    OpenBSD-Commit-ID: 483eb6467dc7d5dbca8eb109c453e7a43075f7ce
+
+commit 2d1428b11c8b6f616f070f2ecedce12328526944
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Oct 4 00:04:41 2018 +0000
+
+    upstream: explicit_bzero here to be consistent with other kex*.c;
+    
+    report from coolbugcheckers AT gmail.com
+    
+    OpenBSD-Commit-ID: a90f146c5b5f5b1408700395e394f70b440856cb
+
+commit 5eff5b858e717e901e6af6596306a114de9f79f2
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Oct 3 06:38:35 2018 +0000
+
+    upstream: Allow ssh_config IdentityAgent directive to accept
+    
+    environment variable names as well as explicit paths. ok dtucker@
+    
+    OpenBSD-Commit-ID: 2f0996e103876c53d8c9dd51dcce9889d700767b
+
+commit a46ac4d86b25414d78b632e8173578b37e5f8a83
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Oct 2 12:51:58 2018 +0000
+
+    upstream: mention INFO@openssh.com for sending SIGINFO
+    
+    OpenBSD-Commit-ID: 132471eeb0df658210afd27852fe65131b26e900
+
+commit ff3a411cae0b484274b7900ef52ff4dad3e12876
+Author: Damien Miller <djm@mindrot.org>
+Date:   Tue Oct 2 22:49:40 2018 +1000
+
+    only support SIGINFO on systems with SIGINFO
+
+commit cd98925c6405e972dc9f211afc7e75e838abe81c
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Oct 2 12:40:07 2018 +0000
+
+    upstream: Add server support for signalling sessions via the SSH
+    
+    channel/ session protocol. Signalling is only supported to sesssions that are
+    not subsystems and were not started with a forced command.
+    
+    Long requested in bz#1424
+    
+    Based on a patch from markus@ and reworked by dtucker@;
+    ok markus@ dtucker@
+    
+    OpenBSD-Commit-ID: 4bea826f575862eaac569c4bedd1056a268be1c3
+
+commit dba50258333f2604a87848762af07ba2cc40407a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Sep 26 07:32:44 2018 +0000
+
+    upstream: remove big ugly TODO comment from start of file. Some of
+    
+    the mentioned tasks are obsolete and, of the remainder, most are already
+    captured in PROTOCOL.mux where they better belong
+    
+    OpenBSD-Commit-ID: 16d9d76dee42a5bb651c9d6740f7f0ef68aeb407
+
+commit 92b61a38ee9b765f5049f03cd1143e13f3878905
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Sep 26 07:30:05 2018 +0000
+
+    upstream: Document mux proxy mode; added by Markus in openssh-7.4
+    
+    Also add a little bit of information about the overall packet format
+    
+    OpenBSD-Commit-ID: bdb6f6ea8580ef96792e270cae7857786ad84a95
+
+commit 9d883a1ce4f89b175fd77405ff32674620703fb2
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Sep 26 01:48:57 2018 +0000
+
+    upstream: s/process_mux_master/mux_master_process/ in mux master
+    
+    function names,
+    
+    Gives better symmetry with the existing mux_client_*() names and makes
+    it more obvious when a message comes from the master vs client (they
+    are interleved in ControlMaster=auto mode).
+    
+    no functional change beyond prefixing a could of log messages with
+    __func__ where they were previously lacking.
+    
+    OpenBSD-Commit-ID: b01f7c3fdf92692e1713a822a89dc499333daf75
+
+commit c2fa53cd6462da82d3a851dc3a4a3f6b920337c8
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Sep 22 14:41:24 2018 +1000
+
+    Remove unused variable in _ssh_compat_fflush.
+
+commit d1b3540c21212624af907488960d703c7d987b42
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Sep 20 18:08:43 2018 +1000
+
+    Import updated moduli.
+
+commit b5e412a8993ad17b9e1141c78408df15d3d987e1
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Sep 21 12:46:22 2018 +0000
+
+    upstream: Allow ssh_config ForwardX11Timeout=0 to disable the
+    
+    timeout and allow X11 connections in untrusted mode indefinitely. ok dtucker@
+    
+    OpenBSD-Commit-ID: ea1ceed3f540b48e5803f933e59a03b20db10c69
+
+commit cb24d9fcc901429d77211f274031653476864ec6
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Sep 21 12:23:17 2018 +0000
+
+    upstream: when compiled with GSSAPI support, cache supported method
+    
+    OIDs by calling ssh_gssapi_prepare_supported_oids() regardless of whether
+    GSSAPI authentication is enabled in the main config.
+    
+    This avoids sandbox violations for configurations that enable GSSAPI
+    auth later, e.g.
+    
+    Match user djm
+            GSSAPIAuthentication yes
+    
+    bz#2107; ok dtucker@
+    
+    OpenBSD-Commit-ID: a5dd42d87c74e27cfb712b15b0f97ab20e0afd1d
+
+commit bbc8af72ba68da014d4de6e21a85eb5123384226
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Sep 21 12:20:12 2018 +0000
+
+    upstream: In sshkey_in_file(), ignore keys that are considered for
+    
+    being too short (i.e. SSH_ERR_KEY_LENGTH). These keys will not be considered
+    to be "in the file". This allows key revocation lists to contain short keys
+    without the entire revocation list being considered invalid.
+    
+    bz#2897; ok dtucker
+    
+    OpenBSD-Commit-ID: d9f3d857d07194a42ad7e62889a74dc3f9d9924b
+
+commit 383a33d160cefbfd1b40fef81f72eadbf9303a66
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Sep 21 03:11:36 2018 +0000
+
+    upstream: Treat connections with ProxyJump specified the same as ones
+    
+    with a ProxyCommand set with regards to hostname canonicalisation (i.e. don't
+    try to canonicalise the hostname unless CanonicalizeHostname is set to
+    'always').
+    
+    Patch from Sven Wegener via bz#2896
+    
+    OpenBSD-Commit-ID: 527ff501cf98bf65fb4b29ed0cb847dda10f4d37
+
+commit 0cbed248ed81584129b67c348dbb801660f25a6a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Sep 20 23:40:16 2018 +0000
+
+    upstream: actually make CASignatureAlgorithms available as a config
+    
+    option
+    
+    OpenBSD-Commit-ID: 93fa7ff58314ed7b1ab7744090a6a91232e6ae52
+
+commit 62528870c0ec48cd86a37dd7320fb85886c3e6ee
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Sep 20 08:07:03 2018 +0000
+
+    upstream: Import updated moduli.
+    
+    OpenBSD-Commit-ID: 04431e8e7872f49a2129bf080a6b73c19d576d40
+
+commit e6933a2ffa0659d57f3c7b7c457b2c62b2a84613
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Thu Sep 20 06:58:48 2018 +0000
+
+    upstream: reorder CASignatureAlgorithms, and add them to the
+    
+    various -o lists; ok djm
+    
+    OpenBSD-Commit-ID: ecb88baecc3c54988b4d1654446ea033da359288
+
+commit aa083aa9624ea7b764d5a81c4c676719a1a3e42b
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Sep 20 03:31:49 2018 +0000
+
+    upstream: fix "ssh -Q sig" to show correct signature algorithm list
+    
+    (it was erroneously showing certificate algorithms); prompted by markus@
+    
+    OpenBSD-Commit-ID: 1cdee002f2f0c21456979deeb887fc889afb154d
+
+commit ecac7e1f7add6b28874959a11f2238d149dc2c07
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Sep 20 03:30:44 2018 +0000
+
+    upstream: add CASignatureAlgorithms option for the client, allowing
+    
+    it to specify which signature algorithms may be used by CAs when signing
+    certificates. Useful if you want to ban RSA/SHA1; ok markus@
+    
+    OpenBSD-Commit-ID: 9159e5e9f67504829bf53ff222057307a6e3230f
+
+commit 86e5737c39153af134158f24d0cab5827cbd5852
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Sep 20 03:28:06 2018 +0000
+
+    upstream: Add sshd_config CASignatureAlgorithms option to allow
+    
+    control over which signature algorithms a CA may use when signing
+    certificates. In particular, this allows a sshd to ban certificates signed
+    with RSA/SHA1.
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: b05c86ef8b52b913ed48d54a9b9c1a7714d96bac
+
+commit f80e68ea7d62e2dfafc12f1a60ab544ae4033a0f
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Sep 19 02:03:02 2018 +0000
+
+    upstream: Make "ssh-add -q" do what it says on the tin: silence
+    
+    output from successful operations.
+    
+    Based on patch from Thijs van Dijk; ok dtucker@ deraadt@
+    
+    OpenBSD-Commit-ID: c4f754ecc055c10af166116ce7515104aa8522e1
+
+commit 5e532320e9e51de720d5f3cc2596e95d29f6e98f
+Author: millert@openbsd.org <millert@openbsd.org>
+Date:   Mon Sep 17 15:40:14 2018 +0000
+
+    upstream: When choosing a prime from the moduli file, avoid
+    
+    re-using the linenum variable for something that is not a line number to
+    avoid the confusion that resulted in the bug in rev. 1.64.  This also lets us
+    pass the actual linenum to parse_prime() so the error messages include the
+    correct line number.  OK markus@ some time ago.
+    
+    OpenBSD-Commit-ID: 4d8e5d3e924d6e8eb70053e3defa23c151a00084
+
+commit cce8cbe0ed7d1ba3a575310e0b63c193326ae616
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Sep 15 19:44:06 2018 +1000
+
+    Fix openssl-1.1 fallout for --without-openssl.
+    
+    ok djm@
+
+commit 149519b9f201dac755f3cba4789f4d76fecf0ee1
+Author: Damien Miller <djm@mindrot.org>
+Date:   Sat Sep 15 19:37:48 2018 +1000
+
+    add futex(2) syscall to seccomp sandbox
+    
+    Apparently needed for some glibc/openssl combinations.
+    
+    Patch from Arkadiusz Miśkiewicz
+
+commit 4488ae1a6940af704c4dbf70f55bf2f756a16536
+Author: Damien Miller <djm@mindrot.org>
+Date:   Sat Sep 15 19:36:55 2018 +1000
+
+    really add source for authopt_fuzz this time
+
+commit 9201784b4a257c8345fbd740bcbdd70054885707
+Author: Damien Miller <djm@mindrot.org>
+Date:   Sat Sep 15 19:35:40 2018 +1000
+
+    remove accidentally checked-in authopt_fuzz binary
+
+commit beb9e522dc7717df08179f9e59f36b361bfa14ab
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Sep 14 05:26:27 2018 +0000
+
+    upstream: second try, deals properly with missing and private-only
+    
+    Use consistent format in debug log for keys readied, offered and
+    received during public key authentication.
+    
+    This makes it a little easier to see what is going on, as each message
+    now contains (where available) the key filename, its type and fingerprint,
+    and whether the key is hosted in an agent or a token.
+    
+    OpenBSD-Commit-ID: f1c6a8e9cfc4e108c359db77f24f9a40e1e25ea7
+
+commit 6bc5a24ac867bfdc3ed615589d69ac640f51674b
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Sep 14 15:16:34 2018 +1000
+
+    fuzzer harness for authorized_keys option parsing
+
+commit 6c8b82fc6929b6a9a3f645151b6ec26c5507d9ef
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Sep 14 04:44:04 2018 +0000
+
+    upstream: revert following; deals badly with agent keys
+    
+    revision 1.285
+    date: 2018/09/14 04:17:12;  author: djm;  state: Exp;  lines: +47 -26;  commitid: lflGFcNb2X2HebaK;
+    Use consistent format in debug log for keys readied, offered and
+    received during public key authentication.
+    
+    This makes it a little easier to see what is going on, as each message
+    now contains the key filename, its type and fingerprint, and whether
+    the key is hosted in an agent or a token.
+    
+    OpenBSD-Commit-ID: e496bd004e452d4b051f33ed9ae6a54ab918f56d
+
+commit 6da046f9c3374ce7e269ded15d8ff8bc45017301
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Sep 14 04:17:44 2018 +0000
+
+    upstream: garbage-collect moribund ssh_new_private() API.
+    
+    OpenBSD-Commit-ID: 7c05bf13b094093dfa01848a9306c82eb6e95f6c
+
+commit 1f24ac5fc05252ceb1c1d0e8cab6a283b883c780
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Sep 14 04:17:12 2018 +0000
+
+    upstream: Use consistent format in debug log for keys readied,
+    
+    offered and received during public key authentication.
+    
+    This makes it a little easier to see what is going on, as each message
+    now contains the key filename, its type and fingerprint, and whether
+    the key is hosted in an agent or a token.
+    
+    OpenBSD-Commit-ID: 2a01d59285a8a7e01185bb0a43316084b4f06a1f
+
+commit 488c9325bb7233e975dbfbf89fa055edc3d3eddc
+Author: millert@openbsd.org <millert@openbsd.org>
+Date:   Thu Sep 13 15:23:32 2018 +0000
+
+    upstream: Fix warnings caused by user_from_uid() and group_from_gid()
+    
+    now returning const char *.
+    
+    OpenBSD-Commit-ID: b5fe571ea77cfa7b9035062829ab05eb87d7cc6f
+
+commit 0aa1f230846ebce698e52051a107f3127024a05a
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Sep 14 10:31:47 2018 +1000
+
+    allow SIGUSR1 as synonym for SIGINFO
+    
+    Lets users on those unfortunate operating systems that lack SIGINFO
+    still be able to obtain progress information from unit tests :)
+
+commit d64e78526596f098096113fcf148216798c327ff
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Sep 13 19:05:48 2018 +1000
+
+    add compat header
+
+commit a3fd8074e2e2f06602e25618721f9556c731312c
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Sep 13 09:03:20 2018 +0000
+
+    upstream: missed a bit of openssl-1.0.x API in this unittest
+    
+    OpenBSD-Regress-ID: a73a54d7f7381856a3f3a2d25947bee7a9a5dbc9
+
+commit 86e0a9f3d249d5580390daf58e015e68b01cef10
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Sep 13 05:06:51 2018 +0000
+
+    upstream: use only openssl-1.1.x API here too
+    
+    OpenBSD-Regress-ID: ae877064597c349954b1b443769723563cecbc8f
+
+commit 48f54b9d12c1c79fba333bc86d455d8f4cda8cfc
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Sep 13 12:13:50 2018 +1000
+
+    adapt -portable to OpenSSL 1.1x API
+    
+    Polyfill missing API with replacement functions extracted from LibreSSL
+
+commit 86112951d63d48839f035b5795be62635a463f99
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Sep 13 12:12:42 2018 +1000
+
+    forgot to stage these test files in commit d70d061
+
+commit 482d23bcacdd3664f21cc82a5135f66fc598275f
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Sep 13 02:08:33 2018 +0000
+
+    upstream: hold our collective noses and use the openssl-1.1.x API in
+    
+    OpenSSH; feedback and ok tb@ jsing@ markus@
+    
+    OpenBSD-Commit-ID: cacbcac87ce5da0d3ca7ef1b38a6f7fb349e4417
+
+commit d70d061828730a56636ab6f1f24fe4a8ccefcfc1
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Sep 12 01:36:45 2018 +0000
+
+    upstream: Include certs with multiple RSA signature variants in
+    
+    test data Ensure that cert->signature_key is populated correctly
+    
+    OpenBSD-Regress-ID: 56e68f70fe46cb3a193ca207385bdb301fd6603a
+
+commit f803b2682992cfededd40c91818b653b5d923ef5
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Sep 12 01:23:48 2018 +0000
+
+    upstream: test revocation by explicit hash and by fingerprint
+    
+    OpenBSD-Regress-ID: 079c18a9ab9663f4af419327c759fc1e2bc78fd8
+
+commit 2de78bc7da70e1338b32feeefcc6045cf49efcd4
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Sep 12 01:22:43 2018 +0000
+
+    upstream: s/sshkey_demote/sshkey_from_private/g
+    
+    OpenBSD-Regress-ID: 782bde7407d94a87aa8d1db7c23750e09d4443c4
+
+commit 41c115a5ea1cb79a6a3182773c58a23f760e8076
+Author: Damien Miller <djm@mindrot.org>
+Date:   Wed Sep 12 16:50:01 2018 +1000
+
+    delete the correct thing; kexfuzz binary
+
+commit f0fcd7e65087db8c2496f13ed39d772f8e38b088
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Sep 12 06:18:59 2018 +0000
+
+    upstream: fix edit mistake; spotted by jmc@
+    
+    OpenBSD-Commit-ID: dd724e1c52c9d6084f4cd260ec7e1b2b138261c6
+
+commit 4cc259bac699f4d2a5c52b92230f9e488c88a223
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Sep 12 01:34:02 2018 +0000
+
+    upstream: add SSH_ALLOWED_CA_SIGALGS - the default list of
+    
+    signature algorithms that are allowed for CA signatures. Notably excludes
+    ssh-dsa.
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: 1628e4181dc8ab71909378eafe5d06159a22deb4
+
+commit ba9e788315b1f6a350f910cb2a9e95b2ce584e89
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Sep 12 01:32:54 2018 +0000
+
+    upstream: add sshkey_check_cert_sigtype() that checks a
+    
+    cert->signature_type against a supplied whitelist; ok markus
+    
+    OpenBSD-Commit-ID: caadb8073292ed7a9535e5adc067d11d356d9302
+
+commit a70fd4ad7bd9f2ed223ff635a3d41e483057f23b
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Sep 12 01:31:30 2018 +0000
+
+    upstream: add cert->signature_type field and keep it in sync with
+    
+    certificate signature wrt loading and certification operations; ok markus@
+    
+    OpenBSD-Commit-ID: e8b8b9f76b66707a0cd926109c4383db8f664df3
+
+commit 357128ac48630a9970e3af0e6ff820300a28da47
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Sep 12 01:30:10 2018 +0000
+
+    upstream: Add "ssh -Q sig" to allow listing supported signature
+    
+    algorithms ok markus@
+    
+    OpenBSD-Commit-ID: 7a8c6eb6c249dc37823ba5081fce64876d10fe2b
+
+commit 9405c6214f667be604a820c6823b27d0ea77937d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Sep 12 01:21:34 2018 +0000
+
+    upstream: allow key revocation by SHA256 hash and allow ssh-keygen
+    
+    to create KRLs using SHA256/base64 key fingerprints; ok markus@
+    
+    OpenBSD-Commit-ID: a0590fd34e7f1141f2873ab3acc57442560e6a94
+
+commit 50e2687ee0941c0ea216d6ffea370ffd2c1f14b9
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Sep 12 01:19:12 2018 +0000
+
+    upstream: log certificate fingerprint in authentication
+    
+    success/failure message (previously we logged only key ID and CA key
+    fingerprint).
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: a8ef2d172b7f1ddbcce26d6434b2de6d94f6c05d
+
+commit de37ca909487d23e5844aca289b3f5e75d3f1e1f
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Sep 7 04:26:56 2018 +0000
+
+    upstream: Add FALLTHROUGH comments where appropriate. Patch from
+    
+    jjelen at redhat via bz#2687.
+    
+    OpenBSD-Commit-ID: c48eb457be697a19d6d2950c6d0879f3ccc851d3
+
+commit 247766cd3111d5d8c6ea39833a3257ca8fb820f2
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Sep 7 01:42:54 2018 +0000
+
+    upstream: ssh -MM requires confirmation for all operations that
+    
+    change the multiplexing state, not just new sessions.
+    
+    mention that confirmation is checked via ssh-askpass
+    
+    OpenBSD-Commit-ID: 0f1b45551ebb9cc5c9a4fe54ad3b23ce90f1f5c2
+
+commit db8bb80e3ac1bcb3e1305d846cd98c6b869bf03f
+Author: mestre@openbsd.org <mestre@openbsd.org>
+Date:   Tue Aug 28 12:25:53 2018 +0000
+
+    upstream: fix misplaced parenthesis inside if-clause. it's harmless
+    
+    and the only issue is showing an unknown error (since it's not defined)
+    during fatal(), if it ever an error occurs inside that condition.
+    
+    OK deraadt@ markus@ djm@
+    
+    OpenBSD-Commit-ID: acb0a8e6936bfbe590504752d01d1d251a7101d8
+
+commit 086cc614f550b7d4f100c95e472a6b6b823938ab
+Author: mestre@openbsd.org <mestre@openbsd.org>
+Date:   Tue Aug 28 12:17:45 2018 +0000
+
+    upstream: fix build with DEBUG_PK enabled
+    
+    OK dtucker@
+    
+    OpenBSD-Commit-ID: ec1568cf27726e9638a0415481c20c406e7b441c
+
+commit 2678833013e97f8b18f09779b7f70bcbf5eb2ab2
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Sep 7 14:41:53 2018 +1000
+
+    Handle ngroups>_SC_NGROUPS_MAX.
+    
+    Based on github pull request #99 from Darren Maffat at Oracle: Solaris'
+    getgrouplist considers _SC_NGROUPS_MAX more of a guideline and can return
+    a larger number of groups.  In this case, retry getgrouplist with a
+    larger array and defer allocating groups_byname.  ok djm@
+
+commit 039bf2a81797b8f3af6058d34005a4896a363221
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Sep 7 14:06:57 2018 +1000
+
+    Initial len for the fmt=NULL case.
+    
+    Patch from jjelen at redhat via bz#2687.  (OpenSSH never calls
+    setproctitle with a null format so len is always initialized).
+
+commit ea9c06e11d2e8fb2f4d5e02f8a41e23d2bd31ca9
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Sep 7 14:01:39 2018 +1000
+
+    Include stdlib.h.
+    
+    Patch from jjelen at redhat via bz#2687.
+
+commit 9617816dbe73ec4d65075f4d897443f63a97c87f
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Aug 27 13:08:01 2018 +1000
+
+    document some more regress control env variables
+    
+    Specifically SKIP_UNIT, USE_VALGRING and LTESTS. Sort the list of
+    environment variables.
+    
+    Based on patch from Jakub Jelen
+
+commit 71508e06fab14bc415a79a08f5535ad7bffa93d9
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Aug 23 15:41:42 2018 +1000
+
+    shorten temporary SSH_REGRESS_TMP path
+    
+    Previous path was exceeding max socket length on at least one platform (OSX)
+
+commit 26739cf5bdc9030a583b41ae5261dedd862060f0
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Aug 23 13:06:02 2018 +1000
+
+    rebuild dependencies
+
+commit ff729025c7463cf5d0a8d1ca1823306e48c6d4cf
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Aug 23 13:03:32 2018 +1000
+
+    fix path in distclean target
+    
+    Patch from Jakub Jelen
+
+commit 7fef173c28f7462dcd8ee017fdf12b5073f54c02
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Aug 23 03:01:08 2018 +0000
+
+    upstream: memleak introduced in r1.83; from Colin Watson
+    
+    OpenBSD-Commit-ID: 5c019104c280cbd549a264a7217b67665e5732dc
+
+commit b8ae02a2896778b8984c7f51566c7f0f56fa8b56
+Author: schwarze@openbsd.org <schwarze@openbsd.org>
+Date:   Tue Aug 21 13:56:27 2018 +0000
+
+    upstream: AIX reports the CODESET as "ISO8859-1" in the POSIX locale.
+    
+    Treating that as a safe encoding is OK because even when other systems return
+    that string for real ISO8859-1, it is still safe in the sense that it is
+    ASCII-compatible and stateless.
+    
+    Issue reported by Val dot Baranov at duke dot edu.  Additional
+    information provided by Michael dot Felt at felt dot demon dot nl.
+    Tested by Michael Felt on AIX 6.1 and by Val Baranov on AIX 7.1.
+    Tweak and OK djm@.
+    
+    OpenBSD-Commit-ID: 36f1210e0b229817d10eb490d6038f507b8256a7
+
+commit bc44ee088ad269d232e514f037c87ada4c2fd3f0
+Author: Tim Rice <tim@multitalents.net>
+Date:   Tue Aug 21 08:57:24 2018 -0700
+
+            modified:   openbsd-compat/port-uw.c
+            remove obsolete and un-needed include
+
+commit 829fc28a9c54e3f812ee7248c7a3e31eeb4f0b3a
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Aug 20 15:57:29 2018 +1000
+
+    Missing unistd.h for regress/mkdtemp.c
+
+commit c8313e492355a368a91799131520d92743d8d16c
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Aug 17 05:45:20 2018 +1000
+
+    update version numbers in anticipation of release
+
+commit 477b49a34b89f506f4794b35e3c70b3e2e83cd38
+Author: Corinna Vinschen <vinschen@redhat.com>
+Date:   Mon Aug 13 17:08:51 2018 +0200
+
+    configure: work around GCC shortcoming on Cygwin
+    
+    Cygwin's latest 7.x GCC allows to specify -mfunction-return=thunk
+    as well as -mindirect-branch=thunk on the command line, albeit
+    producing invalid code, leading to an error at link stage.
+    
+    The check in configure.ac only checks if the option is present,
+    but not if it produces valid code.
+    
+    This patch fixes it by special-casing Cygwin.  Another solution
+    may be to change these to linker checks.
+    
+    Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
+
+commit b0917945efa374be7648d67dbbaaff323ab39edc
+Author: Corinna Vinschen <vinschen@redhat.com>
+Date:   Mon Aug 13 17:05:05 2018 +0200
+
+    cygwin: add missing stdarg.h include
+    
+    Further header file standarization in Cygwin uncovered a lazy
+    indirect include in bsd-cygwin_util.c
+    
+    Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
+
+commit c3903c38b0fd168ab3d925c2b129d1a599593426
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Aug 13 02:41:05 2018 +0000
+
+    upstream: revert compat.[ch] section of the following change. It
+    
+    causes double-free under some circumstances.
+    
+    --
+    
+    date: 2018/07/31 03:07:24;  author: djm;  state: Exp;  lines: +33 -18;  commitid: f7g4UI8eeOXReTPh;
+    fix some memory leaks spotted by Coverity via Jakub Jelen in bz#2366
+    feedback and ok dtucker@
+    
+    OpenBSD-Commit-ID: 1e77547f60fdb5e2ffe23e2e4733c54d8d2d1137
+
+commit 1b9dd4aa15208100fbc3650f33ea052255578282
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Aug 12 20:19:13 2018 +0000
+
+    upstream: better diagnosics on alg list assembly errors; ok
+    
+    deraadt@ markus@
+    
+    OpenBSD-Commit-ID: 5a557e74b839daf13cc105924d2af06a1560faee
+
+commit e36a5f61b0f5bebf6d49c215d228cd99dfe86e28
+Author: Damien Miller <djm@mindrot.org>
+Date:   Sat Aug 11 18:08:45 2018 -0700
+
+    Some AIX fixes; report from Michael Felt
+
+commit 2f4766ceefe6657c5ad5fe92d13c411872acae0e
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Aug 10 01:35:49 2018 +0000
+
+    upstream: The script that cooks up PuTTY format host keys does not
+    
+    understand the new key format so convert back to old format to create the
+    PuTTY key and remove it once done.
+    
+    OpenBSD-Regress-ID: 2a449a18846c3a144bc645135b551ba6177e38d3
+
+commit e1b26ce504662a5d5b991091228984ccfd25f280
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Aug 10 00:44:01 2018 +0000
+
+    upstream: improve
+    
+    OpenBSD-Commit-ID: 40d839db0977b4e7ac8b647b16d5411d4faf2f60
+
+commit 7c712966a3139622f7fb55045368d05de4e6782c
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Aug 10 00:42:29 2018 +0000
+
+    upstream: Describe pubkey format, prompted by bz#2853
+    
+    While I'm here, describe and link to the remaining local PROTOCOL.*
+    docs that weren't already mentioned (PROTOCOL.key, PROTOCOL.krl and
+    PROTOCOL.mux)
+    
+    OpenBSD-Commit-ID: 2a900f9b994ba4d53e7aeb467d44d75829fd1231
+
+commit ef100a2c5a8ed83afac0b8f36520815803da227a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Aug 10 00:27:15 2018 +0000
+
+    upstream: fix numbering
+    
+    OpenBSD-Commit-ID: bc7a1764dff23fa4c5ff0e3379c9c4d5b63c9596
+
+commit ed7bd5d93fe14c7bd90febd29b858ea985d14d45
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Aug 8 01:16:01 2018 +0000
+
+    upstream: Use new private key format by default. This format is
+    
+    suported by OpenSSH >= 6.5 (released January 2014), so it should be supported
+    by most OpenSSH versions in active use.
+    
+    It is possible to convert new-format private keys to the older
+    format using "ssh-keygen -f /path/key -pm PEM".
+    
+    ok deraadt dtucker
+    
+    OpenBSD-Commit-ID: e3bd4f2509a2103bfa2f710733426af3ad6d8ab8
+
+commit 967226a1bdde59ea137e8f0df871854ff7b91366
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Aug 4 00:55:06 2018 +0000
+
+    upstream: invalidate dh->priv_key after freeing it in error path;
+    
+    avoids unlikely double-free later. Reported by Viktor Dukhovni via
+    https://github.com/openssh/openssh-portable/pull/96 feedback jsing@ tb@
+    
+    OpenBSD-Commit-ID: e317eb17c3e05500ae851f279ef6486f0457c805
+
+commit 74287f5df9966a0648b4a68417451dd18f079ab8
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jul 31 03:10:27 2018 +0000
+
+    upstream: delay bailout for invalid authentic
+    
+    =?UTF-8?q?ating=20user=20until=20after=20the=20packet=20containing=20the?=
+    =?UTF-8?q?=20request=20has=20been=20fully=20parsed.=20Reported=20by=20Dar?=
+    =?UTF-8?q?iusz=20Tytko=20and=20Micha=C5=82=20Sajdak;=20ok=20deraadt?=
+    MIME-Version: 1.0
+    Content-Type: text/plain; charset=UTF-8
+    Content-Transfer-Encoding: 8bit
+    
+    OpenBSD-Commit-ID: b4891882fbe413f230fe8ac8a37349b03bd0b70d
+
+commit 1a66079c0669813306cc69e5776a4acd9fb49015
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jul 31 03:07:24 2018 +0000
+
+    upstream: fix some memory leaks spotted by Coverity via Jakub Jelen
+    
+    in bz#2366 feedback and ok dtucker@
+    
+    OpenBSD-Commit-ID: 8402bbae67d578bedbadb0ce68ff7c5a136ef563
+
+commit 87f08be054b7eeadbb9cdeb3fb4872be79ccf218
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Jul 20 13:18:28 2018 +1000
+
+    Remove support for S/Key
+    
+    Most people will 1) be using modern multi-factor authentication methods
+    like TOTP/OATH etc and 2) be getting support for multi-factor
+    authentication via PAM or BSD Auth.
+
+commit 5d14019ba2ff54acbfd20a6b9b96bb860a8c7c31
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Fri Jul 27 12:03:17 2018 +0000
+
+    upstream: avoid expensive channel_open_message() calls; ok djm@
+    
+    OpenBSD-Commit-ID: aea3b5512ad681cd8710367d743e8a753d4425d9
+
+commit e655ee04a3cb7999dbf9641b25192353e2b69418
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Jul 27 05:34:42 2018 +0000
+
+    upstream: Now that ssh can't be setuid, remove the
+    
+    original_real_uid and original_effective_uid globals and replace with calls
+    to plain getuid(). ok djm@
+    
+    OpenBSD-Commit-ID: 92561c0cd418d34e6841e20ba09160583e27b68c
+
+commit 73ddb25bae4c33a0db361ac13f2e3a60d7c6c4a5
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Jul 27 05:13:02 2018 +0000
+
+    upstream: Remove uid checks from low port binds. Now that ssh
+    
+    cannot be setuid and sshd always has privsep on, we can remove the uid checks
+    for low port binds and just let the system do the check. We leave a sanity
+    check for the !privsep case so long as the code is stil there.  with & ok
+    djm@
+    
+    OpenBSD-Commit-ID: 9535cfdbd1cd54486fdbedfaee44ce4367ec7ca0
+
+commit c12033e102760d043bc5c98e6c8180e4d331b0df
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Jul 27 03:55:22 2018 +0000
+
+    upstream: ssh(1) no longer supports being setuid root. Remove reference
+    
+    to crc32 which went with protocol 1.  Pointed out by deraadt@.
+    
+    OpenBSD-Commit-ID: f8763c25fd96ed91dd1abdab5667fd2e27e377b6
+
+commit 4492e2ec4e1956a277ef507f51d66e5c2aafaaf8
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Jul 27 14:15:28 2018 +1000
+
+    correct snprintf truncation check in closefrom()
+    
+    Truncation cannot happen unless the system has set PATH_MAX to some
+    nonsensically low value.
+    
+    bz#2862, patch from Daniel Le
+
+commit 149cab325a8599a003364ed833f878449c15f259
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Jul 27 13:46:06 2018 +1000
+
+    Include stdarg.h in mkdtemp for va_list.
+
+commit 6728f31bdfdc864d192773c32465b1860e23f556
+Author: deraadt@openbsd.org <deraadt@openbsd.org>
+Date:   Wed Jul 25 17:12:35 2018 +0000
+
+    upstream: Don't redefine Makefile choices which come correct from
+    
+    bsd.*.mk ok markus
+    
+    OpenBSD-Commit-ID: 814b2f670df75759e1581ecef530980b2b3d7e0f
+
+commit 21fd477a855753c1a8e450963669e28e39c3b5d2
+Author: deraadt@openbsd.org <deraadt@openbsd.org>
+Date:   Wed Jul 25 13:56:23 2018 +0000
+
+    upstream: fix indent; Clemens Goessnitzer
+    
+    OpenBSD-Commit-ID: b5149a6d92b264d35f879d24608087b254857a83
+
+commit 8e433c2083db8664c41499ee146448ea7ebe7dbf
+Author: beck@openbsd.org <beck@openbsd.org>
+Date:   Wed Jul 25 13:10:56 2018 +0000
+
+    upstream: Use the caller provided (copied) pwent struct in
+    
+    load_public_identity_files instead of calling getpwuid() again and discarding
+    the argument. This prevents a client crash where tilde_expand_filename calls
+    getpwuid() again before the pwent pointer is used. Issue noticed and reported
+    by Pierre-Olivier Martel <pom@apple.com> ok djm@ deraadt@
+    
+    OpenBSD-Commit-ID: a067d74b5b098763736c94cc1368de8ea3f0b157
+
+commit e2127abb105ae72b6fda64fff150e6b24b3f1317
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Mon Jul 23 19:53:55 2018 +0000
+
+    upstream: oops, failed to notice that SEE ALSO got messed up;
+    
+    OpenBSD-Commit-ID: 61c1306542cefdc6e59ac331751afe961557427d
+
+commit ddf1b797c2d26bbbc9d410aa4f484cbe94673587
+Author: kn@openbsd.org <kn@openbsd.org>
+Date:   Mon Jul 23 19:02:49 2018 +0000
+
+    upstream: Point to glob in section 7 for the actual list of special
+    
+    characters instead the C API in section 3.
+    
+    OK millert jmc nicm, "the right idea" deraadt
+    
+    OpenBSD-Commit-ID: a74fd215488c382809e4d041613aeba4a4b1ffc6
+
+commit 01c98d9661d0ed6156e8602b650f72eed9fc4d12
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Sun Jul 22 12:16:59 2018 +0000
+
+    upstream: Switch authorized_keys example from ssh-dss to ssh-rsa
+    
+    since the former is no longer enabled by default.  Pointed out by Daniel A.
+    Maierhofer, ok jmc
+    
+    OpenBSD-Commit-ID: 6a196cef53d7524e0c9b58cdbc1b5609debaf8c7
+
+commit 472269f8fe19343971c2d08f504ab5cbb8234b33
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jul 20 05:01:10 2018 +0000
+
+    upstream: slightly-clearer description for AuthenticationMethods - the
+    
+    lists have comma-separated elements; bz#2663 from Hans Meier
+    
+    OpenBSD-Commit-ID: 931c983d0fde4764d0942fb2c2b5017635993b5a
+
+commit c59aca8adbdf7f5597084ad360a19bedb3f80970
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Jul 20 14:53:42 2018 +1000
+
+    Create control sockets in clean temp directories
+    
+    Adds a regress/mkdtemp tool and uses it to create empty temp
+    directories for tests needing control sockets.
+    
+    Patch from Colin Watson via bz#2660; ok dtucker
+
+commit 6ad8648e83e4f4ace37b742a05c2a6b6b872514e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jul 20 03:46:34 2018 +0000
+
+    upstream: remove unused zlib.h
+    
+    OpenBSD-Commit-ID: 8d274a9b467c7958df12668b49144056819f79f1
+
+commit 3ba6e6883527fe517b6e4a824876e2fe62af22fc
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Jul 19 23:03:16 2018 +0000
+
+    upstream: Fix typo in comment. From Alexandru Iacob via github.
+    
+    OpenBSD-Commit-ID: eff4ec07c6c8c5483533da43a4dda37d72ef7f1d
+
+commit c77bc73c91bc656e343a1961756e09dd1b170820
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Jul 20 13:48:51 2018 +1000
+
+    Explicitly include openssl before zlib.
+    
+    Some versions of OpenSSL have "free_func" in their headers, which zlib
+    typedefs.  Including openssl after zlib (eg via sshkey.h) results in
+    "syntax error before `free_func'", which this fixes.
+
+commit 95d41e90eafcd1286a901e8e361e4a37b98aeb52
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Thu Jul 19 10:28:47 2018 +0000
+
+    upstream: Deprecate UsePrivilegedPort now that support for running
+    
+    ssh(1) setuid has been removed, remove supporting code and clean up
+    references to it in the man pages
+    
+    We have not shipped ssh(1) the setuid bit since 2002.  If ayone
+    really needs to make connections from a low port number this can
+    be implemented via a small setuid ProxyCommand.
+    
+    ok markus@ jmc@ djm@
+    
+    OpenBSD-Commit-ID: d03364610b7123ae4c6792f5274bd147b6de717e
+
+commit 258dc8bb07dfb35a46e52b0822a2c5b7027df60a
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Wed Jul 18 11:34:04 2018 +0000
+
+    upstream: Remove support for running ssh(1) setuid and fatal if
+    
+    attempted. Do not link uidwap.c into ssh any more.  Neuters
+    UsePrivilegedPort, which will be marked as deprecated shortly. ok markus@
+    djm@
+    
+    OpenBSD-Commit-ID: c4ba5bf9c096f57a6ed15b713a1d7e9e2e373c42
+
+commit ac590760b251506b0a152551abbf8e8d6dc2f527
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Mon Jul 16 22:25:01 2018 +0000
+
+    upstream: Slot 0 in the hostbased key array was previously RSA1,
+    
+    but that is now gone and the slot is unused so remove it.  Remove two
+    now-unused macros, and add an array bounds check to the two remaining ones
+    (array is statically sized, so mostly a safety check on future changes). ok
+    markus@
+    
+    OpenBSD-Commit-ID: 2e4c0ca6cc1d8daeccead2aa56192a3f9d5e1e7a
+
+commit 26efc2f5df0e3bcf6a6bbdd0506fd682d60c2145
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Mon Jul 16 11:05:41 2018 +0000
+
+    upstream: Remove support for loading HostBasedAuthentication keys
+    
+    directly in ssh(1) and always use ssh-keysign.  This removes one of the few
+    remaining reasons why ssh(1) might be setuid.  ok markus@
+    
+    OpenBSD-Commit-ID: 97f01e1448707129a20d75f86bad5d27c3cf0b7d
+
+commit 3eb7f1038d17af7aea3c2c62d1e30cd545607640
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jul 16 07:06:50 2018 +0000
+
+    upstream: keep options.identity_file_userprovided array in sync when we
+    
+    load keys, fixing some spurious error messages; ok markus
+    
+    OpenBSD-Commit-ID: c63e3d5200ee2cf9e35bda98de847302566c6a00
+
+commit 2f131e1b34502aa19f345e89cabf6fa3fc097f09
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jul 16 03:09:59 2018 +0000
+
+    upstream: memleak in unittest; found by valgrind
+    
+    OpenBSD-Regress-ID: 168c23b0fb09fc3d0b438628990d3fd9260a8a5e
+
+commit de2997a4cf22ca0a524f0e5b451693c583e2fd89
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jul 16 03:09:13 2018 +0000
+
+    upstream: memleaks; found by valgrind
+    
+    OpenBSD-Commit-ID: 6c3ba22be53e753c899545f771e8399fc93cd844
+
+commit 61cc0003eb37fa07603c969c12b7c795caa498f3
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Jul 14 16:49:01 2018 +1000
+
+    Undef a few new macros in sys-queue.h.
+    
+    Prevents macro redefinition warnings on OSX.
+
+commit 30a2c213877a54a44dfdffb6ca8db70be5b457e0
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Jul 13 13:40:20 2018 +1000
+
+    Include unistd.h for geteuid declaration.
+
+commit 1dd32c23f2a85714dfafe2a9cc516971d187caa4
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Jul 13 13:38:10 2018 +1000
+
+    Fallout from buffer conversion in AUDIT_EVENTS.
+    
+    Supply missing "int r" and fix error path for sshbuf_new().
+
+commit 7449c178e943e5c4f6c8416a4e41d93b70c11c9e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jul 13 02:13:50 2018 +0000
+
+    upstream: make this use ssh_proxy rather than starting/stopping a
+    
+    daemon for each testcase
+    
+    OpenBSD-Regress-ID: 608b7655ea65b1ba8fff5a13ce9caa60ef0c8166
+
+commit dbab02f9208d9baa134cec1d007054ec82b96ca9
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jul 13 02:13:19 2018 +0000
+
+    upstream: fix leaks in unit test; with this, all unit tests are
+    
+    leak free (as far as valgrind can spot anyway)
+    
+    OpenBSD-Regress-ID: b824d8b27998365379963440e5d18b95ca03aa17
+
+commit 2f6accff5085eb79b0dbe262d8b85ed017d1a51c
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Jul 13 11:39:25 2018 +1000
+
+    Enable leak checks for unit tests with valgrind
+    
+    Leave the leak checking on unconditionally when running with valgrind.
+    The unit tests are leak-free and I want them to stay that way.
+
+commit e46cfbd9db5e907b821bf4fd0184d4dab99815ee
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Jul 13 11:38:59 2018 +1000
+
+    increase timeout to match cfgmatch.sh
+    
+    lets test pass under valgrind (on my workstation at least)
+
+commit 6aa1bf475cf3e7a2149acc5a1e80e904749f064c
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Jul 12 14:54:18 2018 +1000
+
+    rm regress/misc/kexfuzz/*.o in distclean target
+
+commit eef1447ddb559c03725a23d4aa6d03f40e8b0049
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Jul 12 14:49:26 2018 +1000
+
+    repair !WITH_OPENSSL build
+
+commit 4d3b2f36fd831941d1627ac587faae37b6d3570f
+Author: Damien Miller <djm@mindrot.org>
+Date:   Thu Jul 12 14:49:14 2018 +1000
+
+    missing headers
+
+commit 3f420a692b293921216549c1099c2e46ff284eae
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Jul 12 14:57:46 2018 +1000
+
+    Remove key.h from portable files too.
+    
+    Commit 5467fbcb removed key.h so stop including it in portable files
+    too.  Fixes builds on lots of platforms.
+
+commit e2c4af311543093f16005c10044f7e06af0426f0
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Jul 12 04:35:25 2018 +0000
+
+    upstream: remove prototype to long-gone function
+    
+    OpenBSD-Commit-ID: 0414642ac7ce01d176b9f359091a66a8bbb640bd
+
+commit 394a842e60674bf8ee5130b9f15b01452a0b0285
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Wed Jul 11 18:55:11 2018 +0000
+
+    upstream: treat ssh_packet_write_wait() errors as fatal; ok djm@
+    
+    OpenBSD-Commit-ID: f88ba43c9d54ed2d911218aa8d3f6285430629c3
+
+commit 5467fbcb09528ecdcb914f4f2452216c24796790
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Wed Jul 11 18:53:29 2018 +0000
+
+    upstream: remove legacy key emulation layer; ok djm@
+    
+    OpenBSD-Commit-ID: 2b1f9619259e222bbd4fe9a8d3a0973eafb9dd8d
+
+commit 5dc4c59d5441a19c99e7945779f7ec9051126c25
+Author: martijn@openbsd.org <martijn@openbsd.org>
+Date:   Wed Jul 11 08:19:35 2018 +0000
+
+    upstream: s/wuth/with/ in comment
+    
+    OpenBSD-Commit-ID: 9de41468afd75f54a7f47809d2ad664aa577902c
+
+commit 1c688801e9dd7f9889fb2a29bc2b6fbfbc35a11f
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Jul 11 12:12:38 2018 +1000
+
+    Include stdlib.h for declaration of free.
+    
+    Fixes build with -Werror on at least Fedora and probably others.
+
+commit fccfa239def497615f92ed28acc57cfe63da3666
+Author: Damien Miller <djm@mindrot.org>
+Date:   Wed Jul 11 10:19:56 2018 +1000
+
+    VALGRIND_CHECK_LEAKS logic was backwards :(
+
+commit 416287d45fcde0a8e66eee8b99aa73bd58607588
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Jul 11 10:10:26 2018 +1000
+
+    Fix sshbuf_new error path in skey.
+
+commit 7aab109b8b90a353c1af780524f1ac0d3af47bab
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Jul 11 10:06:18 2018 +1000
+
+    Supply missing third arg in skey.
+    
+    During the change to the new buffer api the third arg to
+    sshbuf_get_cstring was ommitted.  Fixes build when configured with skey.
+
+commit 380320bb72cc353a901790ab04b6287fd335dc4a
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Jul 11 10:03:34 2018 +1000
+
+    Supply some more missing "int r" in skey
+
+commit d20720d373d8563ee737d1a45dc5e0804d622dbc
+Author: Damien Miller <djm@mindrot.org>
+Date:   Wed Jul 11 09:56:36 2018 +1000
+
+    disable valgrind memleak checking by default
+    
+    Add VALGRIND_CHECK_LEAKS knob to turn it back on.
+
+commit 79c9d35018f3a5e30ae437880b669aa8636cd3cd
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Jul 11 09:54:00 2018 +1000
+
+    Supply missing "int r" in skey code.
+
+commit 984bacfaacbbe31c35191b828fb5b5b2f0362c36
+Author: sf@openbsd.org <sf@openbsd.org>
+Date:   Tue Jul 10 09:36:58 2018 +0000
+
+    upstream: re-remove some pre-auth compression bits
+    
+    This time, make sure to not remove things that are necessary for
+    pre-auth compression on the client. Add a comment that pre-auth
+    compression is still supported in the client.
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: 282c6fec7201f18a5c333bbb68d9339734d2f784
+
+commit 120a1ec74e8d9d29f4eb9a27972ddd22351ddef9
+Author: Damien Miller <djm@mindrot.org>
+Date:   Tue Jul 10 19:39:52 2018 +1000
+
+    Adapt portable to legacy buffer API removal
+
+commit 0f3958c1e6ffb8ea4ba27e2a97a00326fce23246
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jul 10 09:13:30 2018 +0000
+
+    upstream: kerberos/gssapi fixes for buffer removal
+    
+    OpenBSD-Commit-ID: 1cdf56fec95801e4563c47f21696f04cd8b60c4c
+
+commit c74ae8e7c45f325f3387abd48fa7dfef07a08069
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jul 10 06:45:29 2018 +0000
+
+    upstream: buffer.[ch] and bufaux.c are no more
+    
+    OpenBSD-Commit-ID: d1a1852284e554f39525eb4d4891b207cfb3d3a0
+
+commit a881e5a133d661eca923fb0633a03152ab2b70b2
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jul 10 06:43:52 2018 +0000
+
+    upstream: one mention of Buffer that almost got away :)
+    
+    OpenBSD-Commit-ID: 30d7c27a90b4544ad5dfacf654595710cd499f02
+
+commit 49f47e656b60bcd1d1db98d88105295f4b4e600d
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Mon Jul 9 21:59:10 2018 +0000
+
+    upstream: replace cast with call to sshbuf_mutable_ptr(); ok djm@
+    
+    OpenBSD-Commit-ID: 4dfe9d29fa93d9231645c89084f7217304f7ba29
+
+commit cb30cd47041edb03476be1c8ef7bc1f4b69d1555
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Mon Jul 9 21:56:06 2018 +0000
+
+    upstream: remove legacy buffer API emulation layer; ok djm@
+    
+    OpenBSD-Commit-ID: 2dd5dc17cbc23195be4299fa93be2707a0e08ad9
+
+commit 235c7c4e3bf046982c2d8242f30aacffa01073d1
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Mon Jul 9 21:53:45 2018 +0000
+
+    upstream: sshd: switch monitor to sshbuf API; lots of help & ok
+    
+    djm@
+    
+    OpenBSD-Commit-ID: d89bd02d33974fd35ca0b8940d88572227b34a48
+
+commit b8d9214d969775e409e1408ecdf0d58fad99b344
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Mon Jul 9 21:37:55 2018 +0000
+
+    upstream: sshd: switch GSSAPI to sshbuf API; ok djm@
+    
+    OpenBSD-Commit-ID: e48449ab4be3f006f7ba33c66241b7d652973e30
+
+commit c7d39ac8dc3587c5f05bdd5bcd098eb5c201c0c8
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Mon Jul 9 21:35:50 2018 +0000
+
+    upstream: sshd: switch authentication to sshbuf API; ok djm@
+    
+    OpenBSD-Commit-ID: 880aa06bce4b140781e836bb56bec34873290641
+
+commit c3cb7790e9efb14ba74b2d9f543ad593b3d55b31
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Mon Jul 9 21:29:36 2018 +0000
+
+    upstream: sshd: switch config to sshbuf API; ok djm@
+    
+    OpenBSD-Commit-ID: 72b02017bac7feac48c9dceff8355056bea300bd
+
+commit 2808d18ca47ad3d251836c555f0e22aaca03d15c
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Mon Jul 9 21:26:02 2018 +0000
+
+    upstream: sshd: switch loginmsg to sshbuf API; ok djm@
+    
+    OpenBSD-Commit-ID: f3cb4e54bff15c593602d95cc43e32ee1a4bac42
+
+commit 89dd615b8b531979be63f05f9d5624367c9b28e6
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Mon Jul 9 21:20:26 2018 +0000
+
+    upstream: ttymodes: switch to sshbuf API; ok djm@
+    
+    OpenBSD-Commit-ID: 5df340c5965e822c9da21e19579d08dea3cbe429
+
+commit f4608a7065480516ab46214f554e5f853fb7870f
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Mon Jul 9 21:18:10 2018 +0000
+
+    upstream: client: switch mux to sshbuf API; with & ok djm@
+    
+    OpenBSD-Commit-ID: 5948fb98d704f9c4e075b92edda64e0290b5feb2
+
+commit cecee2d607099a7bba0a84803e2325d15be4277b
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Mon Jul 9 21:03:30 2018 +0000
+
+    upstream: client: switch to sshbuf API; ok djm@
+    
+    OpenBSD-Commit-ID: 60cb0356114acc7625ab85105f6f6a7cd44a8d05
+
+commit ff55f4ad898137d4703e7a2bcc81167dfe8e9324
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Mon Jul 9 20:39:28 2018 +0000
+
+    upstream: pkcs11: switch to sshbuf API; ok djm@
+    
+    OpenBSD-Commit-ID: 98cc4e800f1617c51caf59a6cb3006f14492db79
+
+commit 168b46f405d6736960ba7930389eecb9b6710b7e
+Author: sf@openbsd.org <sf@openbsd.org>
+Date:   Mon Jul 9 13:37:10 2018 +0000
+
+    upstream: Revert previous two commits
+    
+    It turns out we still support pre-auth compression on the client.
+    Therefore revert the previous two commits:
+    
+    date: 2018/07/06 09:06:14;  author: sf;  commitid: yZVYKIRtUZWD9CmE;
+     Rename COMP_DELAYED to COMP_ZLIB
+    
+     Only delayed compression is supported nowadays.
+    
+     ok markus@
+    
+    date: 2018/07/06 09:05:01;  author: sf;  commitid: rEGuT5UgI9f6kddP;
+     Remove leftovers from pre-authentication compression
+    
+     Support for this has been removed in 2016.
+     COMP_DELAYED will be renamed in a later commit.
+    
+     ok markus@
+    
+    OpenBSD-Commit-ID: cdfef526357e4e1483c86cf599491b2dafb77772
+
+commit ab39267fa1243d02b6c330615539fc4b21e17dc4
+Author: sf@openbsd.org <sf@openbsd.org>
+Date:   Fri Jul 6 09:06:14 2018 +0000
+
+    upstream: Rename COMP_DELAYED to COMP_ZLIB
+    
+    Only delayed compression is supported nowadays.
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: 5b1dbaf3d9a4085aaa10fec0b7a4364396561821
+
+commit 95db395d2e56a6f868193aead6cadb2493f036c6
+Author: sf@openbsd.org <sf@openbsd.org>
+Date:   Fri Jul 6 09:05:01 2018 +0000
+
+    upstream: Remove leftovers from pre-authentication compression
+    
+    Support for this has been removed in 2016.
+    COMP_DELAYED will be renamed in a later commit.
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: 6a99616c832627157113fcb0cf5a752daf2e6b58
+
+commit f28a4d5cd24c4aa177e96b4f96957991e552cb70
+Author: sf@openbsd.org <sf@openbsd.org>
+Date:   Fri Jul 6 09:03:02 2018 +0000
+
+    upstream: Remove unused ssh_packet_start_compression()
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: 9d34cf2f59aca5422021ae2857190578187dc2b4
+
+commit 872517ddbb72deaff31d4760f28f2b0a1c16358f
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Jul 6 13:32:02 2018 +1000
+
+    Defer setting bufsiz in getdelim.
+    
+    Do not write to bufsiz until we are sure the malloc has succeeded,
+    in case any callers rely on it (which they shouldn't).  ok djm@
+
+commit 3deb56f7190a414dc264e21e087a934fa1847283
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Jul 5 13:32:01 2018 +1000
+
+    Fix other callers of read_environment_file.
+    
+    read_environment_file recently gained an extra argument   Some platform
+    specific code also calls it so add the argument to those too.  Fixes
+    build on Solaris and AIX.
+
+commit 314908f451e6b2d4ccf6212ad246fa4619c721d3
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Jul 4 13:51:45 2018 +0000
+
+    upstream: deal with API rename: match_filter_list() =>
+    
+    match_filter_blacklist()
+    
+    OpenBSD-Regress-ID: 2da342be913efeb51806351af906fab01ba4367f
+
+commit 89f54cdf6b9cf1cf5528fd33897f1443913ddfb4
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Jul 4 13:51:12 2018 +0000
+
+    upstream: exercise new expansion behaviour of
+    
+    PubkeyAcceptedKeyTypes and, by proxy, test kex_assemble_names()
+    
+    ok markus@
+    
+    OpenBSD-Regress-ID: 292978902e14d5729aa87e492dd166c842f72736
+
+commit 187633f24c71564e970681c8906df5a6017dcccf
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jul 3 13:53:26 2018 +0000
+
+    upstream: add a comment that could have saved me 45 minutes of wild
+    
+    goose chasing
+    
+    OpenBSD-Regress-ID: d469b29ffadd3402c090e21b792d627d46fa5297
+
+commit 312d2f2861a2598ed08587cb6c45c0e98a85408f
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Jul 4 13:49:31 2018 +0000
+
+    upstream: repair PubkeyAcceptedKeyTypes (and friends) after RSA
+    
+    signature work - returns ability to add/remove/specify algorithms by
+    wildcard.
+    
+    Algorithm lists are now fully expanded when the server/client configs
+    are finalised, so errors are reported early and the config dumps
+    (e.g. "ssh -G ...") now list the actual algorithms selected.
+    
+    Clarify that, while wildcards are accepted in algorithm lists, they
+    aren't full pattern-lists that support negation.
+    
+    (lots of) feedback, ok markus@
+    
+    OpenBSD-Commit-ID: a8894c5c81f399a002f02ff4fe6b4fa46b1f3207
+
+commit 303af5803bd74bf05d375c04e1a83b40c30b2be5
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jul 3 11:43:49 2018 +0000
+
+    upstream: some magic for RSA-SHA2 checks
+    
+    OpenBSD-Regress-ID: e5a9b11368ff6d86e7b25ad10ebe43359b471cd4
+
+commit 7d68e262944c1fff1574600fe0e5e92ec8b398f5
+Author: Damien Miller <djm@mindrot.org>
+Date:   Tue Jul 3 23:27:11 2018 +1000
+
+    depend
+
+commit b4d4eda633af433d20232cbf7e855ceac8b83fe5
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jul 3 13:20:25 2018 +0000
+
+    upstream: some finesse to fix RSA-SHA2 certificate authentication
+    
+    for certs hosted in ssh-agent
+    
+    OpenBSD-Commit-ID: e5fd5edd726137dda2d020e1cdebc464110a010f
+
+commit d78b75df4a57e0f92295f24298e5f2930e71c172
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jul 3 13:07:58 2018 +0000
+
+    upstream: check correct variable; unbreak agent keys
+    
+    OpenBSD-Commit-ID: c36981fdf1f3ce04966d3310826a3e1e6233d93e
+
+commit 2f30300c5e15929d0e34013f38d73e857f445e12
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jul 3 11:42:12 2018 +0000
+
+    upstream: crank version number to 7.8; needed for new compat flag
+    
+    for prior version; part of RSA-SHA2 strictification, ok markus@
+    
+    OpenBSD-Commit-ID: 84a11fc0efd2674c050712336b5093f5d408e32b
+
+commit 4ba0d54794814ec0de1ec87987d0c3b89379b436
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jul 3 11:39:54 2018 +0000
+
+    upstream: Improve strictness and control over RSA-SHA2 signature
+    
+    In ssh, when an agent fails to return a RSA-SHA2 signature when
+    requested and falls back to RSA-SHA1 instead, retry the signature to
+    ensure that the public key algorithm sent in the SSH_MSG_USERAUTH
+    matches the one in the signature itself.
+    
+    In sshd, strictly enforce that the public key algorithm sent in the
+    SSH_MSG_USERAUTH message matches what appears in the signature.
+    
+    Make the sshd_config PubkeyAcceptedKeyTypes and
+    HostbasedAcceptedKeyTypes options control accepted signature algorithms
+    (previously they selected supported key types). This allows these
+    options to ban RSA-SHA1 in favour of RSA-SHA2.
+    
+    Add new signature algorithms "rsa-sha2-256-cert-v01@openssh.com" and
+    "rsa-sha2-512-cert-v01@openssh.com" to force use of RSA-SHA2 signatures
+    with certificate keys.
+    
+    feedback and ok markus@
+    
+    OpenBSD-Commit-ID: c6e9f6d45eed8962ad502d315d7eaef32c419dde
+
+commit 95344c257412b51199ead18d54eaed5bafb75617
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jul 3 10:59:35 2018 +0000
+
+    upstream: allow sshd_config PermitUserEnvironment to accept a
+    
+    pattern-list of whitelisted environment variable names in addition to yes|no.
+    
+    bz#1800, feedback and ok markus@
+    
+    OpenBSD-Commit-ID: 77dc2b468e0bf04b53f333434ba257008a1fdf24
+
+commit 6f56fe4b9578b0627667f8bce69d4d938a88324c
+Author: millert@openbsd.org <millert@openbsd.org>
+Date:   Tue Jun 26 11:23:59 2018 +0000
+
+    upstream: Fix "WARNING: line 6 disappeared in /etc/moduli, giving up"
+    
+    when choosing a prime.  An extra increment of linenum snuck in as part of the
+    conversion to getline().  OK djm@ markus@
+    
+    OpenBSD-Commit-ID: 0019225cb52ed621b71cd9f19ee2e78e57e3dd38
+
+commit 1eee79a11c1b3594f055b01e387c49c9a6e80005
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Mon Jul 2 14:13:30 2018 +0000
+
+    upstream: One ampersand is enough to backgroud an process. OpenBSD
+    
+    doesn't seem to mind, but some platforms in -portable object to the second.
+    
+    OpenBSD-Regress-ID: d6c3e404871764343761dc25c3bbe29c2621ff74
+
+commit 6301e6c787d4e26bfae1119ab4f747bbcaa94e44
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Jul 2 21:16:58 2018 +1000
+
+    Add implementation of getline.
+    
+    Add getline for the benefit of platforms that don't have it.  Sourced
+    from NetBSD (OpenBSD's implementation is a little too chummy with the
+    internals of FILE).
+
+commit 84623e0037628f9992839063151f7a9f5f13099a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jun 26 02:02:36 2018 +0000
+
+    upstream: whitespace
+    
+    OpenBSD-Commit-ID: 9276951caf4daf555f6d262e95720e7f79244572
+
+commit 90e51d672711c19a36573be1785caf35019ae7a8
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Jun 25 22:28:33 2018 +0000
+
+    upstream: fix NULL dereference in open_listen_match_tcpip()
+    
+    OpenBSD-Commit-ID: c968c1d29e392352383c0f9681fcc1e93620c4a9
+
+commit f535ff922a67d9fcc5ee69d060d1b21c8bb01d14
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Tue Jun 19 05:36:57 2018 +0000
+
+    upstream: spelling;
+    
+    OpenBSD-Commit-ID: db542918185243bea17202383a581851736553cc
+
+commit 80e199d6175904152aafc5c297096c3e18297691
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jun 19 03:02:17 2018 +0000
+
+    upstream: test PermitListen with bare port numbers
+    
+    OpenBSD-Regress-ID: 4b50a02dfb0ccaca08247f3877c444126ba901b3
+
+commit 87ddd676da0f3abd08b778b12b53b91b670dc93c
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Jun 19 02:59:41 2018 +0000
+
+    upstream: allow bare port numbers to appear in PermitListen directives,
+    
+    e.g.
+    
+    PermitListen 2222 8080
+    
+    is equivalent to:
+    
+    PermitListen *:2222 *:8080
+    
+    Some bonus manpage improvements, mostly from markus@
+    
+    "looks fine" markus@
+    
+    OpenBSD-Commit-ID: 6546b0cc5aab7f53d65ad0a348ca0ae591d6dd24
+
+commit 26f96ca10ad0ec5da9b05b99de1e1ccea15a11be
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jun 15 07:01:11 2018 +0000
+
+    upstream: invalidate supplemental group cache used by
+    
+    temporarily_use_uid() when the target uid differs; could cause failure to
+    read authorized_keys under some configurations. patch by Jakub Jelen via
+    bz2873; ok dtucker, markus
+    
+    OpenBSD-Commit-ID: 48a345f0ee90f6c465a078eb5e89566b23abd8a1
+
+commit 89a85d724765b6b82e0135ee5a1181fdcccea9c6
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Jun 10 23:45:41 2018 +0000
+
+    upstream: unbreak SendEnv; patch from tb@
+    
+    OpenBSD-Commit-ID: fc808daced813242563b80976e1478de95940056
+
+commit acf4260f0951f89c64e1ebbc4c92f451768871ad
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Sat Jun 9 06:36:31 2018 +0000
+
+    upstream: sort previous;
+    
+    OpenBSD-Commit-ID: 27d80d8b8ca99bc33971dee905e8ffd0053ec411
+
+commit 1678d4236451060b735cb242d2e26e1ac99f0947
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jun 9 03:18:11 2018 +0000
+
+    upstream: slightly better wording re handing of $TERM, from Jakub
+    
+    Jelen via bz2386
+    
+    OpenBSD-Commit-ID: 14bea3f069a93c8be66a7b97794255a91fece964
+
+commit 28013759f09ed3ebf7e8335e83a62936bd7a7f47
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jun 9 03:03:10 2018 +0000
+
+    upstream: add a SetEnv directive for sshd_config to allow an
+    
+    administrator to explicitly specify environment variables set in sessions
+    started by sshd. These override the default environment and any variables set
+    by user configuration (PermitUserEnvironment, etc), but not the SSH_*
+    variables set by sshd itself.
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: b6a96c0001ccd7dd211df6cae9e961c20fd718c0
+
+commit 7082bb58a2eb878d23ec674587c742e5e9673c36
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jun 9 03:01:12 2018 +0000
+
+    upstream: add a SetEnv directive to ssh_config that allows setting
+    
+    environment variables for the remote session (subject to the server accepting
+    them)
+    
+    refactor SendEnv to remove the arbitrary limit of variable names.
+    
+    ok markus@
+    
+    OpenBSD-Commit-ID: cfbb00d9b0e10c1ffff1d83424351fd961d1f2be
+
+commit 3b9798bda15bd3f598f5ef07595d64e23504da91
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Jun 9 02:58:02 2018 +0000
+
+    upstream: reorder child environment preparation so that variables
+    
+    read from ~/.ssh/environment (if enabled) do not override SSH_* variables set
+    by the server.
+    
+    OpenBSD-Commit-ID: 59f9d4c213cdcef2ef21f4b4ae006594dcf2aa7a
+
+commit 0368889f82f63c82ff8db9f8c944d89e7c657db4
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jun 8 03:35:36 2018 +0000
+
+    upstream: fix incorrect expansion of %i in
+    
+    load_public_identity_files(); reported by Roumen Petrov
+    
+    OpenBSD-Commit-ID: a827289e77149b5e0850d72a350c8b0300e7ef25
+
+commit 027607fc2db6a0475a3380f8d95c635482714cb0
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jun 8 01:55:40 2018 +0000
+
+    upstream: fix some over-long lines and __func__ up some debug
+    
+    messages
+    
+    OpenBSD-Commit-ID: c70a60b4c8207d9f242fc2351941ba50916bb267
+
+commit 6ff6fda705bc204456a5fa12518dde6e8790bb02
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Thu Jun 7 11:26:14 2018 +0000
+
+    upstream: tweak previous;
+    
+    OpenBSD-Commit-ID: f98f16af10b28e24bcecb806cb71ea994b648fd6
+
+commit f2c06ab8dd90582030991f631a2715216bf45e5a
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Jun 8 17:43:36 2018 +1000
+
+    Remove ability to override $LD.
+    
+    Since autoconf always uses $CC to link C programs, allowing users to
+    override LD caused mismatches between what LD_LINK_IFELSE thought worked
+    and what ld thought worked.  If you do need to do this kind of thing you
+    need to set a compiler flag such as gcc's -fuse-ld in LDFLAGS.
+
+commit e1542a80797b4ea40a91d2896efdcc76a57056d2
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Jun 8 13:55:59 2018 +1000
+
+    Better detection of unsupported compiler options.
+    
+    Should prevent "unsupported -Wl,-z,retpoline" warnings during linking.
+    ok djm@
+
+commit 57379dbd013ad32ee3f9989bf5f5741065428360
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Jun 7 14:29:43 2018 +0000
+
+    upstream: test the correct configuration option name
+    
+    OpenBSD-Regress-ID: 492279ea9f65657f97a970e0e7c7fd0b339fee23
+
+commit 6d41815e202fbd6182c79780b6cc90e1ec1c9981
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Jun 7 09:26:42 2018 +0000
+
+    upstream: some permitlisten fixes from markus@ that I missed in my
+    
+    insomnia-fueled commits last night
+    
+    OpenBSD-Commit-ID: 26f23622e928996086e85b1419cc1c0f136e359c
+
+commit 4319f7a868d86d435fa07112fcb6153895d03a7f
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Jun 7 04:46:34 2018 +0000
+
+    upstream: permitlisten/PermitListen unit test from Markus
+    
+    OpenBSD-Regress-ID: ab12eb42f0e14926980441cf7c058a6d1d832ea5
+
+commit fa09076410ffc2d34d454145af23c790d728921e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Jun 7 04:31:51 2018 +0000
+
+    upstream: fix regression caused by recent permitlisten option commit:
+    
+    authorized_keys lines that contained permitopen/permitlisten were being
+    treated as invalid.
+    
+    OpenBSD-Commit-ID: 7ef41d63a5a477b405d142dc925b67d9e7aaa31b
+
+commit 7f90635216851f6cb4bf3999e98b825f85d604f8
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Wed Jun 6 18:29:18 2018 +0000
+
+    upstream: switch config file parsing to getline(3) as this avoids
+    
+    static limits noted by gerhard@; ok dtucker@, djm@
+    
+    OpenBSD-Commit-ID: 6d702eabef0fa12e5a1d75c334a8c8b325298b5c
+
+commit 392db2bc83215986a91c0b65feb0e40e7619ce7e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Jun 6 18:25:33 2018 +0000
+
+    upstream: regress test for PermitOpen
+    
+    OpenBSD-Regress-ID: ce8b5f28fc039f09bb297fc4a92319e65982ddaf
+
+commit 803d896ef30758135e2f438bdd1a0be27989e018
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Jun 6 18:24:15 2018 +0000
+
+    upstream: man bits for permitlisten authorized_keys option
+    
+    OpenBSD-Commit-ID: 86910af8f781a4ac5980fea125442eb25466dd78
+
+commit 04df43208b5b460d7360e1598f876b92a32f5922
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Jun 6 18:24:00 2018 +0000
+
+    upstream: man bits for PermitListen
+    
+    OpenBSD-Commit-ID: 35b200cba4e46a16a4db6a80ef11838ab0fad67c
+
+commit 93c06ab6b77514e0447fe4f1d822afcbb2a9be08
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Jun 6 18:23:32 2018 +0000
+
+    upstream: permitlisten option for authorized_keys; ok markus@
+    
+    OpenBSD-Commit-ID: 8650883018d7aa893173d703379e4456a222c672
+
+commit 115063a6647007286cc8ca70abfd2a7585f26ccc
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Jun 6 18:22:41 2018 +0000
+
+    upstream: Add a PermitListen directive to control which server-side
+    
+    addresses may be listened on when the client requests remote forwarding (ssh
+    -R).
+    
+    This is the converse of the existing PermitOpen directive and this
+    includes some refactoring to share much of its implementation.
+    
+    feedback and ok markus@
+    
+    OpenBSD-Commit-ID: 15a931238c61a3f2ac74ea18a98c933e358e277f
+
+commit 7703ae5f5d42eb302ded51705166ff6e19c92892
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Jun 6 16:04:29 2018 +1000
+
+    Use ssh-keygen -A to generate missing host keys.
+    
+    Instead of testing for each specific key type, use ssh-keygen -A to
+    generate any missing host key types.
+
+commit e8d59fef1098e24f408248dc64e5c8efa5d01f3c
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Fri Jun 1 06:23:10 2018 +0000
+
+    upstream: add missing punctuation after %i in ssh_config.5, and
+    
+    make the grammatical format in sshd_config.5 match that in ssh_config.5;
+    
+    OpenBSD-Commit-ID: e325663b9342f3d556e223e5306e0d5fa1a74fa0
+
+commit a1f737d6a99314e291a87856122cb4dbaf64c641
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Fri Jun 1 05:52:26 2018 +0000
+
+    upstream: oops - further adjustment to text neccessary;
+    
+    OpenBSD-Commit-ID: 23585576c807743112ab956be0fb3c786bdef025
+
+commit 294028493471e0bd0c7ffe55dc0c0a67cba6ec41
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Fri Jun 1 05:50:18 2018 +0000
+
+    upstream: %U needs to be escaped; tweak text;
+    
+    OpenBSD-Commit-ID: 30887b73ece257273fb619ab6f4e86dc92ddc15e
+
+commit e5019da3c5a31e6e729a565f2b886a80c4be96cc
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Jun 1 04:31:48 2018 +0000
+
+    upstream: Apply umask to all incoming files and directories not
+    
+    just files. This makes sure it gets applied to directories too, and prevents
+    a race where files get chmodded after creation.  bz#2839, ok djm@
+    
+    OpenBSD-Commit-ID: 3168ee6c7c39093adac4fd71039600cfa296203b
+
+commit a1dcafc41c376332493b9385ee39f9754dc145ec
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jun 1 03:52:37 2018 +0000
+
+    upstream: Adapt to extra default verboisity from ssh-keygen when
+    
+    searching for and hashing known_hosts entries in a single operation
+    (ssh-keygen -HF ...) Patch from Anton Kremenetsky
+    
+    OpenBSD-Regress-ID: 519585a4de35c4611285bd6a7272766c229b19dd
+
+commit 76f314c75dffd4a55839d50ee23622edad52c168
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue May 22 00:22:49 2018 +0000
+
+    upstream: Add TEST_SSH_FAIL_FATAL variable, to force all failures
+    
+    to instantly abort the test. Useful in capturing clean logs for individual
+    failure cases.
+    
+    OpenBSD-Regress-ID: feba18cf338c2328b9601bd4093cabdd9baa3af1
+
+commit 065c8c055df8d83ae7c92e5e524a579d87668aab
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri May 11 03:51:06 2018 +0000
+
+    upstream: Clean up comment.
+    
+    OpenBSD-Regress-ID: 6adb35f384d447e7dcb9f170d4f0d546d3973e10
+
+commit 01b048c8eba3b021701bd0ab26257fc82903cba8
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jun 1 04:21:29 2018 +0000
+
+    upstream: whitespace
+    
+    OpenBSD-Commit-ID: e5edb5e843ddc9b73a8e46518899be41d5709add
+
+commit 854ae209f992465a276de0b5f10ef770510c2418
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jun 1 04:05:29 2018 +0000
+
+    upstream: make ssh_remote_ipaddr() capable of being called after
+    
+    the ssh->state has been torn down; bz#2773
+    
+    OpenBSD-Commit-ID: 167f12523613ca3d16d7716a690e7afa307dc7eb
+
+commit 3e088aaf236ef35beeef3c9be93fd53700df5861
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jun 1 03:51:34 2018 +0000
+
+    upstream: return correct exit code when searching for and hashing
+    
+    known_hosts entries in a single operation (ssh-keygen -HF hostname); bz2772
+    Report and fix from Anton Kremenetsky
+    
+    OpenBSD-Commit-ID: ac10ca13eb9bb0bc50fcd42ad11c56c317437b58
+
+commit 9c935dd9bf05628826ad2495d3e8bdf3d3271c21
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jun 1 03:33:53 2018 +0000
+
+    upstream: make UID available as a %-expansion everywhere that the
+    
+    username is available currently. In the client this is via %i, in the server
+    %U (since %i was already used in the client in some places for this, but used
+    for something different in the server); bz#2870, ok dtucker@
+    
+    OpenBSD-Commit-ID: c7e912b0213713316cb55db194b3a6415b3d4b95
+
+commit d8748b91d1d6c108c0c260ed41fa55f37b9ef34b
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Jun 1 03:11:49 2018 +0000
+
+    upstream: prefer argv0 to "ssh" when re-executing ssh for ProxyJump
+    
+    directive; bz2831, feedback and ok dtucker@
+    
+    OpenBSD-Commit-ID: 3cec709a131499fbb0c1ea8a0a9e0b0915ce769e
+
+commit fbb4b5fd4f8e0bb89732670a01954e18b69e15ba
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri May 25 07:11:01 2018 +0000
+
+    upstream: Do not ban PTY allocation when a sshd session is restricted
+    
+    because the user password is expired as it breaks password change dialog.
+    
+    regression in openssh-7.7 reported by Daniel Wagner
+    
+    OpenBSD-Commit-ID: 9fc09c584c6f1964b00595e3abe7f83db4d90d73
+
+commit f6a59a22b0c157c4c4e5fd7232f868138223be64
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri May 25 04:25:46 2018 +0000
+
+    upstream: Fix return value confusion in several functions (readdir,
+    
+    download and fsync). These should return -1 on error, not a sftp status code.
+    
+    patch from Petr Cerny in bz#2871
+    
+    OpenBSD-Commit-ID: 651aa0220ad23c9167d9297a436162d741f97a09
+
+commit 1da5934b860ac0378d52d3035b22b6670f6a967e
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri May 25 03:20:59 2018 +0000
+
+    upstream: If select() fails in ssh_packet_read_seqnr go directly to
+    
+    the error path instead of trying to read from the socket on the way out,
+    which resets errno and causes the true error to be misreported.  ok djm@
+    
+    OpenBSD-Commit-ID: 2614edaadbd05a957aa977728aa7a030af7c6f0a
+
+commit 4ef75926ef517d539f2c7aac3188b09f315c86a7
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri May 25 13:36:58 2018 +1000
+
+    Permit getuid()/geteuid() syscalls.
+    
+    Requested for Linux/s390; patch from Eduardo Barretto via bz#2752;
+    ok dtucker
+
+commit 4b22fd8ecefd059a66140be67f352eb6145a9d88
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue May 22 00:13:26 2018 +0000
+
+    upstream: support ProxyJump=none to disable ProxyJump
+    
+    functionality; bz#2869 ok dtucker@
+    
+    OpenBSD-Commit-ID: 1c06ee08eb78451b5837fcfd8cbebc5ff3a67a01
+
+commit f41bcd70f55b4f0fc4d8e1039cb361ac922b23fb
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Tue May 15 05:40:11 2018 +0000
+
+    upstream: correct keyowrd name (permitemptypasswords); from brendan
+    
+    macdonell
+    
+    OpenBSD-Commit-ID: ef1bdbc936b2ea693ee37a4c20a94d4d43f5fda3
+
+commit f18bc97151340127859634d20d79fd39ec8a7f39
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri May 11 04:01:11 2018 +0000
+
+    upstream: Emphasise that -w implicitly sets Tunnel=point-to-point
+    
+    and that users should specify an explicit Tunnel directive if they don't want
+    this. bz#2365.
+    
+    OpenBSD-Commit-ID: 1a8d9c67ae213ead180481900dbbb3e04864560d
+
+commit 32e4e94e1511fe0020fbfbb62399d31b2d22a801
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon May 14 14:40:08 2018 +1000
+
+    sync fmt_scaled.c
+    
+    revision 1.17
+    date: 2018/05/14 04:39:04;  author: djm;  state: Exp;  lines: +5 -2;
+    commitid: 53zY8GjViUBnWo8Z;
+    constrain fractional part to [0-9] (less confusing to static analysis); ok ian@
+
+commit 54268d589e85ecc43d3eba8d83f327bdada9d696
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri May 11 14:04:40 2018 +1000
+
+    fix key-options.sh on platforms without openpty(3)
+    
+    Skip the pty tests if the platform lacks openpty(3) and has to chown(2)
+    the pty device explicitly. This typically requires root permissions that
+    this test lacks.
+    
+    bz#2856 ok dtucker@
+
+commit b2140a739be4c3b43cc1dc08322dca39a1e39d20
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri May 11 03:38:51 2018 +0000
+
+    upstream: implement EMFILE mitigation for ssh-agent: remember the
+    
+    fd rlimit and stop accepting new connections when it is exceeded (with some
+    grace). Accept is resumed when enough connections are closed.
+    
+    bz#2576. feedback deraadt; ok dtucker@
+    
+    OpenBSD-Commit-ID: 6a85d9cec7b85741961e7116a49f8dae777911ea
+
+commit fdba503fdfc647ee8a244002f1581e869c1f3d90
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri May 11 03:22:55 2018 +0000
+
+    upstream: Explicit cast when snprintf'ing an uint64. Prevents
+    
+    warnings on platforms where int64 is long not long long.  ok djm@
+    
+    OpenBSD-Commit-ID: 9c5359e2fbfce11dea2d93f7bc257e84419bd001
+
+commit e7751aa4094d51a9bc00778aa8d07e22934c55ee
+Author: bluhm@openbsd.org <bluhm@openbsd.org>
+Date:   Thu Apr 26 14:47:03 2018 +0000
+
+    upstream: Since the previous commit, ssh regress test sftp-chroot was
+    
+    failing. The sftp program terminated with the wrong exit code as sftp called
+    fatal() instad of exit(0).  So when the sigchld handler waits for the child,
+    remember that it was found.  Then don't expect that main() can wait again. OK
+    dtucker@
+    
+    OpenBSD-Commit-ID: bfafd940c0de5297940c71ddf362053db0232266
+
+commit 7c15301841e2e9d37cae732400de63ae9c0961d6
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sun Apr 29 17:54:12 2018 +1000
+
+    Use includes.h instead of config.h.
+    
+    This ensures it picks up the definition of DEF_WEAK, the lack of which
+    can cause compile errors in some cases (eg modern AIX).  From
+    michael at felt.demon.nl.
+
+commit cec338967a666b7c8ad8b88175f2faeddf268116
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Apr 19 09:53:14 2018 +1000
+
+    Omit 3des-cbc if OpenSSL built without DES.
+    
+    Patch from hongxu.jia at windriver.com, ok djm@
+
+commit a575ddd58835759393d2dddd16ebe5abdb56485e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Apr 16 22:50:44 2018 +0000
+
+    upstream: Disable SSH2_MSG_DEBUG messages for Twisted Conch clients
+    
+    without version numbers since they choke on them under some circumstances.
+    https://twistedmatrix.com/trac/ticket/9422 via Colin Watson
+    
+    Newer Conch versions have a version number in their ident string and
+    handle debug messages okay. https://twistedmatrix.com/trac/ticket/9424
+    
+    OpenBSD-Commit-ID: 6cf7be262af0419c58ddae11324d9c0dc1577539
+
+commit 390c7000a8946db565b66eab9e52fb11948711fa
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Apr 14 21:50:41 2018 +0000
+
+    upstream: don't free the %C expansion, it's used later for
+    
+    LocalCommand
+    
+    OpenBSD-Commit-ID: 857b5cb37b2d856bfdfce61289a415257a487fb1
+
+commit 3455f1e7c48e2e549192998d330214975b9b1dc7
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Apr 13 05:04:12 2018 +0000
+
+    upstream: notify user immediately when underlying ssh process dies;
+    
+    patch from Thomas Kuthan in bz2719; ok dtucker@
+    
+    OpenBSD-Commit-ID: 78fac88c2f08054d1fc5162c43c24162b131cf78
+
+commit 1c5b4bc827f4abc3e65888cda061ad5edf1b8c7c
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Apr 13 16:23:57 2018 +1000
+
+    Allow nanosleep in preauth privsep child.
+    
+    The new timing attack mitigation code uses nanosleep in the preauth
+    codepath, allow in systrace andbox too.
+
+commit 0e73428038d5ecfa5d2a28cff26661502a7aff4e
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Apr 13 16:06:29 2018 +1000
+
+    Allow nanosleep in preauth privsep child.
+    
+    The new timing attack mitigation code uses nanosleep in the preauth
+    codepath, allow in sandbox.
+
+commit e9d910b0289c820852f7afa67f584cef1c05fe95
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Apr 13 03:57:26 2018 +0000
+
+    upstream: Defend against user enumeration timing attacks. This
+    
+    establishes a minimum time for each failed authentication attempt (5ms) and
+    adds a per-user constant derived from a host secret (0-4ms).  Based on work
+    by joona.kannisto at tut.fi, ok markus@ djm@.
+    
+    OpenBSD-Commit-ID: b7845b355bb7381703339c8fb0e57e81a20ae5ca
+
+commit d97874cbd909eb706886cd0cdd418f812c119ef9
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Apr 13 13:43:55 2018 +1000
+
+    Using "==" in shell tests is not portable.
+    
+    Patch from rsbecker at nexbridge.com.
+
+commit cfb1d9bc76734681e3dea532a1504fcd466fbe91
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Apr 13 13:38:06 2018 +1000
+
+    Fix tunnel forwarding broken in 7.7p1
+    
+    bz2855, ok dtucker@
+
+commit afa6e79b76fb52a0c09a29688b5c0d125eb08302
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Apr 13 13:31:42 2018 +1000
+
+    prefer to use getrandom() for PRNG seeding
+    
+    Only applies when built --without-openssl. Thanks Jann Horn for
+    reminder.
+
+commit 575fac34a97f69bc217b235f81de9f8f433eceed
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Apr 13 13:13:33 2018 +1000
+
+    Revert $REGRESSTMP changes.
+    
+    Revert 3fd2d229 and subsequent changes as they turned out to be a
+    portability hassle.
+
+commit 10479cc2a4acd6faaf643eb305233b49d70c31c1
+Author: Damien Miller <djm@mindrot.org>
+Date:   Tue Apr 10 10:19:02 2018 +1000
+
+    Many typo fixes from Karsten Weiss
+    
+    Spotted using https://github.com/lucasdemarchi/codespell
+
+commit 907da2f88519b34189fd03fac96de0c52d448233
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Apr 10 00:14:10 2018 +0000
+
+    upstream: more typos spotted by Karsten Weiss using codespell
+    
+    OpenBSD-Regress-ID: d906a2aea0663810a658b7d0bc61a1d2907d4d69
+
+commit 37e5f4a7ab9a8026e5fc2f47dafb0f1b123d39e9
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Apr 10 00:13:27 2018 +0000
+
+    upstream: make this a bit more portable-friendly
+    
+    OpenBSD-Regress-ID: 62f7b9e055e8dfaab92b3825f158beeb4ca3f963
+
+commit 001aa55484852370488786bd40e9fdad4b465811
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Tue Apr 10 00:10:49 2018 +0000
+
+    upstream: lots of typos in comments/docs. Patch from Karsten Weiss
+    
+    after checking with codespell tool
+    (https://github.com/lucasdemarchi/codespell)
+    
+    OpenBSD-Commit-ID: 373222f12d7ab606598a2d36840c60be93568528
+
+commit 260ede2787fe80b18b8d5920455b4fb268519c7d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Apr 9 23:54:49 2018 +0000
+
+    upstream: don't kill ssh-agent's listening socket entriely if we
+    
+    fail to accept a connection; bz#2837, patch from Lukas Kuster
+    
+    OpenBSD-Commit-ID: 52413f5069179bebf30d38f524afe1a2133c738f
+
+commit ebc8b4656f9b0f834a642a9fb3c9fbca86a61838
+Author: tj@openbsd.org <tj@openbsd.org>
+Date:   Mon Apr 9 20:41:22 2018 +0000
+
+    upstream: the UseLogin option was removed, so remove it here too.
+    
+    ok dtucker
+    
+    OpenBSD-Commit-ID: 7080be73a64d68e21f22f5408a67a0ba8b1b6b06
+
+commit 3e36f281851fc8e9c996b33f108b2ae167314fbe
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Sun Apr 8 07:36:02 2018 +0000
+
+    upstream: tweak previous;
+    
+    OpenBSD-Commit-ID: 2b9c23022ea7b9dddb62864de4e906000f9d7474
+
+commit 8368571efd6693c5c57f850e23a2372acf3f865f
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Sat Apr 7 13:50:10 2018 +0000
+
+    upstream: tweak previous;
+    
+    OpenBSD-Commit-ID: 38e347b6f8e888f5e0700d01abb1eba7caa154f9
+
+commit 555294a7279914ae6795b71bedf4e6011b7636df
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Apr 6 13:02:39 2018 +0000
+
+    upstream: Allow "SendEnv -PATTERN" to clear environment variables
+    
+    previously labeled for sendind. bz#1285 ok dtucker@
+    
+    OpenBSD-Commit-ID: f6fec9e3d0f366f15903094fbe1754cb359a0df9
+
+commit 40f5f03544a07ebd2003b443d42e85cb51d94d59
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Apr 6 04:15:45 2018 +0000
+
+    upstream: relax checking of authorized_keys environment="..."
+    
+    options to allow underscores in variable names (regression introduced in
+    7.7). bz2851, ok deraadt@
+    
+    OpenBSD-Commit-ID: 69690ffe0c97ff393f2c76d25b4b3d2ed4e4ac9c
+
+commit 30fd7f9af0f553aaa2eeda5a1f53f26cfc222b5e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Apr 6 03:51:27 2018 +0000
+
+    upstream: add a couple of missed options to the config dump; patch
+    
+    from Jakub Jelen via bz2835
+    
+    OpenBSD-Commit-ID: 5970adadf6ef206bee0dddfc75d24c2019861446
+
+commit 8d6829be324452d2acd282d5f8ceb0adaa89a4de
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Apr 6 03:34:27 2018 +0000
+
+    upstream: ssh does not accept -oInclude=... on the commandline, the
+    
+    Include keyword is for configuration files only. bz#2840, patch from Jakub
+    Jelen
+    
+    OpenBSD-Commit-ID: 32d052b4a7a7f22df35fe3f71c368c02b02cacb0
+
+commit 00c5222ddc0c8edcaa4ea45ac03befdc8013d137
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Apr 5 22:54:28 2018 +0000
+
+    upstream: We don't offer CBC cipher by default any more. Spotted by
+    
+    Renaud Allard (via otto@)
+    
+    OpenBSD-Commit-ID: a559b1eef741557dd959ae378b665a2977d92dca
+
+commit 5ee8448ad7c306f05a9f56769f95336a8269f379
+Author: job@openbsd.org <job@openbsd.org>
+Date:   Wed Apr 4 15:12:17 2018 +0000
+
+    upstream: Update default IPQoS in ssh(1), sshd(8) to DSCP AF21 for
+    
+    interactive and CS1 for bulk
+    
+    AF21 was selected as this is the highest priority within the low-latency
+    service class (and it is higher than what we have today). SSH is elastic
+    and time-sensitive data, where a user is waiting for a response via the
+    network in order to continue with a task at hand. As such, these flows
+    should be considered foreground traffic, with delays or drops to such
+    traffic directly impacting user-productivity.
+    
+    For bulk SSH traffic, the CS1 "Lower Effort" marker was chosen to enable
+    networks implementing a scavanger/lower-than-best effort class to
+    discriminate scp(1) below normal activities, such as web surfing. In
+    general this type of bulk SSH traffic is a background activity.
+    
+    An advantage of using "AF21" for interactive SSH and "CS1" for bulk SSH
+    is that they are recognisable values on all common platforms (IANA
+    https://www.iana.org/assignments/dscp-registry/dscp-registry.xml), and
+    for AF21 specifically a definition of the intended behavior exists
+    https://tools.ietf.org/html/rfc4594#section-4.7 in addition to the definition
+    of the Assured Forwarding PHB group https://tools.ietf.org/html/rfc2597, and
+    for CS1 (Lower Effort) there is https://tools.ietf.org/html/rfc3662
+    
+    The first three bits of "AF21" map to the equivalent IEEEE 802.1D PCP, IEEE
+    802.11e, MPLS EXP/CoS and IP Precedence value of 2 (also known as "Immediate",
+    or "AC_BE"), and CS1's first 3 bits map to IEEEE 802.1D PCP, IEEE 802.11e,
+    MPLS/CoS and IP Precedence value 1 ("Background" or "AC_BK").
+    
+    OK deraadt@, "no objection" djm@
+    
+    OpenBSD-Commit-ID: d11d2a4484f461524ef0c20870523dfcdeb52181
+
+commit 424b544fbda963f973da80f884717c3e0a513288
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Tue Apr 3 02:14:08 2018 +0000
+
+    upstream: Import regenerated moduli file.
+    
+    OpenBSD-Commit-ID: 1de0e85522051eb2ffa00437e1885e9d7b3e0c2e
+
+commit 323f66ce934df2da551f256f37d69822428e1ca1
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Apr 6 04:18:35 2018 +0000
+
+    upstream: Add test for username options parsing order, prompted by
+    
+    bz#2849.
+    
+    OpenBSD-Regress-ID: 6985cd32f38596882a3ac172ff8c510693b65283
+
+commit e8f474554e3bda102a797a2fbab0594ccc66f097
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Apr 6 14:11:44 2018 +1000
+
+    Expose SSH_AUTH_INFO_0 to PAM auth modules
+    
+    bz#2408, patch from Radoslaw Ejsmont; ok dtucker@
+
+commit 014ba209cf4c6a159baa30ecebbaddfa97da7100
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Apr 3 12:18:00 2018 +1000
+
+    Import regenerated moduli file.
+
+commit a0349a1cc4a18967ad1dbff5389bcdf9da098814
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Apr 2 15:38:28 2018 +1000
+
+    update versions in .spec files
+
+commit 816ad38f79792f5617e3913be306ddb27e91091c
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Apr 2 15:38:20 2018 +1000
+
+    update version number
+
+commit 2c71ca1dd1efe458cb7dee3f8a1a566f913182c2
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Mar 30 18:23:07 2018 +1100
+
+    Disable native strndup and strnlen on AIX.
+    
+    On at least some revisions of AIX, strndup returns unterminated strings
+    under some conditions, apparently because strnlen returns incorrect
+    values in those cases.  Disable both on AIX and use the replacements
+    from openbsd-compat.  Fixes problem with ECDSA keys there, ok djm.
+
+commit 6b5a17bc14e896e3904dc58d889b58934cfacd24
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Mar 26 13:12:44 2018 +1100
+
+    Include ssh_api.h for struct ssh.
+    
+    struct ssh is needed by implementations of sys_auth_passwd() that were
+    converted in commit bba02a50.  Needed to fix build on AIX, I assume for
+    the other platforms too (although it should be harmless if not needed).
+
+commit bc3f80e4d191b8e48650045dfa8a682cd3aabd4d
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Mar 26 12:58:09 2018 +1100
+
+    Remove UNICOS code missed during removal.
+    
+    Fixes compile error on AIX.
+
+commit 9d57762c24882e2f000a21a0ffc8c5908a1fa738
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Sat Mar 24 19:29:03 2018 +0000
+
+    upstream: openssh-7.7
+    
+    OpenBSD-Commit-ID: 274e614352460b9802c905f38fb5ea7ed5db3d41
+
+commit 4b7d8acdbbceef247dc035e611e577174ed8a87e
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Mar 26 09:37:02 2018 +1100
+
+    Remove authinfo.sh test dependency on printenv
+    
+    Some platforms lack printenv in the default $PATH.
+    Reported by Tom G. Christensen
+
+commit 4afeaf3dcb7dc70efd98fcfcb0ed28a6b40b820e
+Author: Tim Rice <tim@multitalents.net>
+Date:   Sun Mar 25 10:00:21 2018 -0700
+
+            Use libiaf on all sysv5 systems
+
+commit bba02a5094b3db228ceac41cb4bfca165d0735f3
+Author: Tim Rice <tim@multitalents.net>
+Date:   Sun Mar 25 09:17:33 2018 -0700
+
+            modified:   auth-sia.c
+            modified:   openbsd-compat/port-aix.c
+            modified:   openbsd-compat/port-uw.c
+    
+            propogate changes to auth-passwd.c in commit
+            7c856857607112a3dfe6414696bf4c7ab7fb0cb3 to other providers
+            of sys_auth_passwd()
+
+commit d7a7a39168bdfe273587bf85d779d60569100a3f
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Sat Mar 24 19:29:03 2018 +0000
+
+    upstream: openssh-7.7
+    
+    OpenBSD-Commit-ID: 274e614352460b9802c905f38fb5ea7ed5db3d41
+
+commit 9efcaaac314c611c6c0326e8bac5b486c424bbd2
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Sat Mar 24 19:28:43 2018 +0000
+
+    upstream: fix bogus warning when signing cert keys using agent;
+    
+    from djm; ok deraadt dtucker
+    
+    OpenBSD-Commit-ID: 12e50836ba2040042383a8b71e12d7ea06e9633d
+
+commit 393436024d2e4b4c7a01f9cfa5854e7437896d11
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sun Mar 25 09:40:46 2018 +1100
+
+    Replace /dev/stdin with "-".
+    
+    For some reason sftp -b doesn't work with /dev/stdin on Cygwin, as noted
+    and suggested by vinschen at redhat.com.
+
+commit b5974de1a1d419e316ffb6524b1b277dda2f3b49
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Mar 23 13:21:14 2018 +1100
+
+    Provide $OBJ to paths in PuTTY interop tests.
+
+commit dc31e79454e9b9140b33ad380565fdb59b9c4f33
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Mar 16 09:06:31 2018 +0000
+
+    upstream: Tell puttygen to use /dev/urandom instead of /dev/random. On
+    
+    OpenBSD they are both non-blocking, but on many other -portable platforms it
+    blocks, stalling tests.
+    
+    OpenBSD-Regress-ID: 397d0d4c719c353f24d79f5b14775e0cfdf0e1cc
+
+commit cb1f94431ef319cd48618b8b771b58739a8210cf
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Thu Mar 22 07:06:11 2018 +0000
+
+    upstream: ssh/xmss: fix build; ok djm@
+    
+    OpenBSD-Commit-ID: c9374ca41d4497f1c673ab681cc33f6e7c5dd186
+
+commit 27979da9e4074322611355598f69175b9ff10d39
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Thu Mar 22 07:05:48 2018 +0000
+
+    upstream: ssh/xmss: fix deserialize for certs; ok djm@
+    
+    OpenBSD-Commit-ID: f44c41636c16ec83502039828beaf521c057dddc
+
+commit c6cb2565c9285eb54fa9dfbb3890f5464aff410f
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Mar 22 17:00:28 2018 +1100
+
+    Save $? before case statement.
+    
+    In some shells (FreeBSD 9, ash) the case statement resets $?, so save
+    for later testing.
+
+commit 4c4e7f783b43b264c247233acb887ee10ed4ce4d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Mar 14 05:35:40 2018 +0000
+
+    upstream: rename recently-added "valid-before" key restriction to
+    
+    "expiry-time" as the former is confusing wrt similar terminology in X.509;
+    pointed out by jsing@
+    
+    OpenBSD-Regress-ID: ac8b41dbfd90cffd525d58350c327195b0937793
+
+commit 500396b204c58e78ad9d081516a365a9f28dc3fd
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Mar 12 00:56:03 2018 +0000
+
+    upstream: check valid-before option in authorized_keys
+    
+    OpenBSD-Regress-ID: 7e1e4a84f7f099a290e5a4cbf4196f90ff2d7e11
+
+commit a76b5d26c2a51d7dd7a5164e683ab3f4419be215
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Mar 12 00:54:04 2018 +0000
+
+    upstream: explicitly specify RSA/SHA-2 keytype here too
+    
+    OpenBSD-Regress-ID: 74d7b24e8c72c27af6b481198344eb077e993a62
+
+commit 3a43297ce29d37c64e37c7e21282cb219e28d3d1
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Mar 12 00:52:57 2018 +0000
+
+    upstream: exlicitly include RSA/SHA-2 keytypes in
+    
+    PubkeyAcceptedKeyTypes here
+    
+    OpenBSD-Regress-ID: 954d19e0032a74e31697fb1dc7e7d3d1b2d65fe9
+
+commit 037fdc1dc2d68e1d43f9c9e2586c02cabc8f7cc8
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Wed Mar 14 06:56:20 2018 +0000
+
+    upstream: sort expiry-time;
+    
+    OpenBSD-Commit-ID: 8c7d82ee1e63e26ceb2b3d3a16514019f984f6bf
+
+commit abc0fa38c9bc136871f28e452c3465c3051fc785
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Mar 14 05:35:40 2018 +0000
+
+    upstream: rename recently-added "valid-before" key restriction to
+    
+    "expiry-time" as the former is confusing wrt similar terminology in X.509;
+    pointed out by jsing@
+    
+    OpenBSD-Commit-ID: 376939466a1f562f3950a22314bc6505733aaae6
+
+commit bf0fbf2b11a44f06a64b620af7d01ff171c28e13
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Mar 12 00:52:01 2018 +0000
+
+    upstream: add valid-before="[time]" authorized_keys option. A
+    
+    simple way of giving a key an expiry date. ok markus@
+    
+    OpenBSD-Commit-ID: 1793b4dd5184fa87f42ed33c7b0f4f02bc877947
+
+commit fbd733ab7adc907118a6cf56c08ed90c7000043f
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Mar 12 19:17:26 2018 +1100
+
+    Add AC_LANG_PROGRAM to AC_COMPILE_IFELSE.
+    
+    The recently added MIPS ABI tests need AC_LANG_PROGRAM to prevent
+    warnings from autoconf.  Pointed out by klausz at haus-gisela.de.
+
+commit c7c458e8261b04d161763cd333d74e7a5842e917
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Wed Mar 7 23:53:08 2018 +0000
+
+    upstream: revert recent strdelim() change, it causes problems with
+    
+    some configs.
+    
+    revision 1.124
+    date: 2018/03/02 03:02:11;  author: djm;  state: Exp;  lines: +19 -8;  commitid: nNRsCijZiGG6SUTT;
+    Allow escaped quotes \" and \' in ssh_config and sshd_config quotes
+    option strings. bz#1596 ok markus@
+    
+    OpenBSD-Commit-ID: 59c40b1b81206d713c06b49d8477402c86babda5
+
+commit 0bcd871ccdf3baf2b642509ba4773d5be067cfa2
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Mon Mar 5 07:03:18 2018 +0000
+
+    upstream: move the input format details to -f; remove the output
+    
+    format details and point to sshd(8), where it is documented;
+    
+    ok dtucker
+    
+    OpenBSD-Commit-ID: 95f17e47dae02a6ac7329708c8c893d4cad0004a
+
+commit 45011511a09e03493568506ce32f4891a174a3bd
+Author: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+Date:   Tue Jun 20 16:42:28 2017 +0100
+
+    configure.ac: properly set seccomp_audit_arch for MIPS64
+    
+    Currently seccomp_audit_arch is set to AUDIT_ARCH_MIPS64 or
+    AUDIT_ARCH_MIPSEL64 (depending on the endinness) when openssh is built
+    for MIPS64. However, that's only valid for n64 ABI. The right macros for
+    n32 ABI defined in seccomp.h are AUDIT_ARCH_MIPS64N32 and
+    AUDIT_ARCH_MIPSEL64N32, for big and little endian respectively.
+    
+    Because of that an sshd built for MIPS64 n32 rejects connection attempts
+    and the output of strace reveals that the problem is related to seccomp
+    audit:
+    
+    [pid   194] prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, {len=57,
+    filter=0x555d5da0}) = 0
+    [pid   194] write(7, "\0\0\0]\0\0\0\5\0\0\0Ulist_hostkey_types: "..., 97) = ?
+    [pid   193] <... poll resumed> )        = 2 ([{fd=5, revents=POLLIN|POLLHUP},
+    {fd=6, revents=POLLHUP}])
+    [pid   194] +++ killed by SIGSYS +++
+    
+    This patch fixes that problem by setting the right value to
+    seccomp_audit_arch taking into account the MIPS64 ABI.
+    
+    Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+
+commit 580086704c31de91dc7ba040a28e416bf1fefbca
+Author: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+Date:   Tue Jun 20 16:42:11 2017 +0100
+
+    configure.ac: detect MIPS ABI
+    
+    Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+
+commit cd4e937aa701f70366cd5b5969af525dff6fdf15
+Author: Alan Yee <alyee@ucsd.edu>
+Date:   Wed Mar 7 15:12:14 2018 -0800
+
+    Use https URLs for links that support it.
+
+commit c0a0c3fc4a76b682db22146b28ddc46566db1ce9
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Mar 5 20:03:07 2018 +1100
+
+    Disable UTMPX on SunOS4.
+
+commit 58fd4c5c0140f6636227ca7acbb149ab0c2509b9
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Mar 5 19:28:08 2018 +1100
+
+    Check for and work around buggy fflush(NULL).
+    
+    Some really old platforms (eg SunOS4) segfault on fflush(NULL) so check
+    for and work around.  With klausz at haus-gisela.de.
+
+commit 71e48bc7945f867029e50e06c665c66aed6d3c64
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Mar 5 10:22:32 2018 +1100
+
+    Remove extra XMSS #endif
+    
+    Extra #endif breaks compile with -DWITH_XMSS.  Pointed out by Jack
+    Schmidt via github.
+
+commit 055e09e2212ff52067786bf6d794ca9512ff7f0c
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Sat Mar 3 06:37:53 2018 +0000
+
+    upstream: Update RSA minimum modulus size to 1024. sshkey.h rev 1.18
+    
+    bumped the minimum from 768 to 1024, update man page accordingly.
+    
+    OpenBSD-Commit-ID: 27563ab4e866cd2aac40a5247876f6787c08a338
+
+commit 7e4fadd3248d6bb7d39d6688c76a613d35d2efc1
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sun Mar 4 01:46:48 2018 +0000
+
+    upstream: for the pty control tests, just check that the PTY path
+    
+    points to something in /dev (rather than checking the device node itself);
+    makes life easier for portable, where systems with dynamic ptys can delete
+    nodes before we get around to testing their existence.
+    
+    OpenBSD-Regress-ID: b1e455b821e62572bccd98102f8dd9d09bb94994
+
+commit 13ef4cf53f24753fe920832b990b25c9c9cd0530
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Mar 3 16:21:20 2018 +1100
+
+    Update PAM password change to new opts API.
+
+commit 33561e68e0b27366cb769295a077aabc6a49d2a1
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Mar 3 14:56:09 2018 +1100
+
+    Add strndup for platforms that need it.
+    
+    Some platforms don't have strndup, which includes Solaris 10, NetBSD 3
+    and FreeBSD 6.
+
+commit e8a17feba95eef424303fb94441008f6c5347aaf
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Mar 3 14:49:07 2018 +1100
+
+    Flatten and alphabetize object file lists.
+    
+    This will make maintenance and changes easier.  "no objection" tim@
+
+commit de1920d743d295f50e6905e5957c4172c038e8eb
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Mar 3 03:16:17 2018 +0000
+
+    upstream: unit tests for new authorized_keys options API
+    
+    OpenBSD-Regress-ID: 820f9ec9c6301f6ca330ad4052d85f0e67d0bdc1
+
+commit dc3e92df17556dc5b0ab19cee8dcb2a6ba348717
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Mar 2 02:53:27 2018 +0000
+
+    upstream: fix testing of pty option, include positive test and
+    
+    testing of restrict keyword
+    
+    OpenBSD-Regress-ID: 4268f27c2706a0a95e725d9518c5bcbec9814c6d
+
+commit 3d1edd1ebbc0aabea8bbe61903060f37137f7c61
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Mar 2 02:51:55 2018 +0000
+
+    upstream: better testing for port-forwarding and restrict flags in
+    
+    authorized_keys
+    
+    OpenBSD-Regress-ID: ee771df8955f2735df54746872c6228aff381daa
+
+commit 7c856857607112a3dfe6414696bf4c7ab7fb0cb3
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Mar 3 03:15:51 2018 +0000
+
+    upstream: switch over to the new authorized_keys options API and
+    
+    remove the legacy one.
+    
+    Includes a fairly big refactor of auth2-pubkey.c to retain less state
+    between key file lines.
+    
+    feedback and ok markus@
+    
+    OpenBSD-Commit-ID: dece6cae0f47751b9892080eb13d6625599573df
+
+commit 90c4bec8b5f9ec4c003ae4abdf13fc7766f00c8b
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Mar 3 03:06:02 2018 +0000
+
+    upstream: Introduce a new API for handling authorized_keys options.
+    
+    This API parses options to a dedicated structure rather than the old API's
+    approach of setting global state. It also includes support for merging
+    options, e.g. from authorized_keys, authorized_principals and/or
+    certificates.
+    
+    feedback and ok markus@
+    
+    OpenBSD-Commit-ID: 98badda102cd575210d7802943e93a34232c80a2
+
+commit 26074380767e639ef89321610e146ae11016b385
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Sat Mar 3 03:01:50 2018 +0000
+
+    upstream: warn when the agent returns a signature type that was
+    
+    different to what was requested. This might happen when an old/non-OpenSSH
+    agent is asked to make a rsa-sha2-256/512 signature but only supports
+    ssh-rsa. bz#2799 feedback and ok markus@
+    
+    OpenBSD-Commit-ID: 760c0f9438c5c58abc16b5f98008ff2d95cb13ce
+
+commit f493d2b0b66fb003ed29f31dd66ff1aeb64be1fc
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Fri Mar 2 21:40:15 2018 +0000
+
+    upstream: apply a lick of paint; tweaks/ok dtucker
+    
+    OpenBSD-Commit-ID: 518a6736338045e0037f503c21027d958d05e703
+
+commit 713d9cb510e0e7759398716cbe6dcf43e574be71
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Mar 2 03:02:11 2018 +0000
+
+    upstream: Allow escaped quotes \" and \' in ssh_config and
+    
+    sshd_config quotes option strings. bz#1596 ok markus@
+    
+    OpenBSD-Commit-ID: dd3a29fc2dc905e8780198e5a6a30b096de1a1cb
+
+commit 94b4e2d29afaaaef89a95289b16c18bf5627f7cd
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Mar 2 02:08:03 2018 +0000
+
+    upstream: refactor sshkey_read() to make it a little more, err,
+    
+    readable. ok markus
+    
+    OpenBSD-Commit-ID: 2e9247b5762fdac3b6335dc606d3822121714c28
+
+commit 5886b92968b360623491699247caddfb77a74d80
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Thu Mar 1 20:32:16 2018 +0000
+
+    upstream: missing #ifdef for _PATH_HOST_XMSS_KEY_FILE; report by
+    
+    jmc@
+    
+    OpenBSD-Commit-ID: 9039cb69a3f9886bfef096891a9e7fcbd620280b
+
+commit 3b36bed3d26f17f6a2b7e036e01777770fe1bcd4
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Mon Feb 26 12:14:53 2018 +0000
+
+    upstream: Remove unneeded (local) include. ok markus@
+    
+    OpenBSD-Commit-ID: 132812dd2296b1caa8cb07d2408afc28e4e60f93
+
+commit 27b9f3950e0289e225b57b7b880a8f1859dcd70b
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Mon Feb 26 03:56:44 2018 +0000
+
+    upstream: Add $OpenBSD$ markers to xmss files to help keep synced
+    
+    with portable. ok djm@.
+    
+    OpenBSD-Commit-ID: 5233a27aafd1dfadad4b957225f95ae51eb365c1
+
+commit afd830847a82ebbd5aeab05bad6d2c8ce74df1cd
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Mon Feb 26 03:03:05 2018 +0000
+
+    upstream: Add newline at end of file to prevent compiler warnings.
+    
+    OpenBSD-Commit-ID: 52f247d4eafe840c7c14c8befa71a760a8eeb063
+
+commit 941e0d3e9bb8d5e4eb70cc694441445faf037c84
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Wed Feb 28 19:59:35 2018 +1100
+
+    Add WITH_XMSS, move to prevent conflicts.
+    
+    Add #ifdef WITH_XMSS to ssh-xmss.c, move it in the other files to after
+    includes.h so it's less likely to conflict and will pick up WITH_XMSS if
+    added to config.h.
+
+commit a10d8552d0d2438da4ed539275abcbf557d1e7a8
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Feb 27 14:45:17 2018 +1100
+
+    Conditionally compile XMSS code.
+    
+    The XMSS code is currently experimental and, unlike the rest of OpenSSH
+    cannot currently be compiled with a c89 compiler.
+
+commit 146c3bd28c8dbee9c4b06465d9c9facab96b1e9b
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Feb 26 12:51:29 2018 +1100
+
+    Check dlopen has RTLD_NOW before enabling pkcs11.
+
+commit 1323f120d06a26074c4d154fcbe7f49bcad3d741
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Feb 27 08:41:25 2018 +1100
+
+    Check for attributes on prototype args.
+    
+    Some compilers (gcc 2.9.53, 3.0 and probably others, see gcc bug #3481)
+    do not accept __attribute__ on function pointer prototype args.  Check for
+    this and hide them if they're not accepted.
+
+commit f0b245b0439e600fab782d19e97980e9f2c2533c
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Feb 26 11:43:48 2018 +1100
+
+    Check if HAVE_DECL_BZERO correctly.
+
+commit c7ef4a399155e1621a532cc5e08e6fa773658dd4
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Feb 26 17:42:56 2018 +1100
+
+    Wrap <stdint.h> in #ifdef HAVE_STDINT_H.
+
+commit ac53ce46cf8165cbda7f57ee045f9f32e1e92b31
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Feb 26 16:24:23 2018 +1100
+
+    Replace $(CURDIR) with $(PWD).
+    
+    The former doesn't work on Solaris or BSDs.
+
+commit 534b2680a15d14e7e60274d5b29b812d44cc5a44
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Feb 26 14:51:59 2018 +1100
+
+    Comment out hexdump().
+    
+    Nothing currently uses them but they cause conflicts on at least
+    FreeBSD, possibly others.  ok djm@
+
+commit 5aea4aa522f61bb2f34c3055a7de203909dfae77
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Feb 26 14:39:14 2018 +1100
+
+    typo: missing ;
+
+commit cd3ab57f9b388f8b1abf601dc4d78ff82d83b75e
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Feb 26 14:37:06 2018 +1100
+
+    Hook up flock() compat code.
+    
+    Also a couple of minor changes: fail if we can't lock instead of
+    silently succeeding, and apply a couple of minor style fixes.
+
+commit b087998d1ba90dd1ddb6bfdb17873dc3e7392798
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Feb 26 14:27:02 2018 +1100
+
+    Import flock() compat from NetBSD.
+    
+    From NetBSD's src/trunk/tools/compat/flock.c, no OpenSSH changes yet.
+
+commit 89212533dde6798324e835b1499084658df4579e
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Feb 26 12:32:14 2018 +1100
+
+    Fix breakage when REGRESSTMP not set.
+    
+    BUILDDIR is not set where used for REGRESSTMP, use make's CURDIR
+    instead.  Pointed out by djm@.
+
+commit f885474137df4b89498c0b8834c2ac72c47aa4bd
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Feb 26 12:18:14 2018 +1100
+
+    XMSS-related files get includes.h
+
+commit 612faa34c72e421cdc9e63f624526bae62d557cc
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Feb 26 12:17:55 2018 +1100
+
+    object files end with .o - not .c
+
+commit bda709b8e13d3eef19e69c2d1684139e3af728f5
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Feb 26 12:17:22 2018 +1100
+
+    avoid inclusion of deprecated selinux/flask.h
+    
+    Use string_to_security_class() instead.
+
+commit 2e396439365c4ca352cac222717d09b14f8a0dfd
+Author: Damien Miller <djm@mindrot.org>
+Date:   Mon Feb 26 11:48:27 2018 +1100
+
+    updatedepend
+
+commit 1b11ea7c58cd5c59838b5fa574cd456d6047b2d4
+Author: markus@openbsd.org <markus@openbsd.org>
+Date:   Fri Feb 23 15:58:37 2018 +0000
+
+    upstream: Add experimental support for PQC XMSS keys (Extended
+    
+    Hash-Based Signatures) The code is not compiled in by default (see WITH_XMSS
+    in Makefile.inc) Joint work with stefan-lukas_gazdag at genua.eu See
+    https://tools.ietf.org/html/draft-irtf-cfrg-xmss-hash-based-signatures-12 ok
+    djm@
+    
+    OpenBSD-Commit-ID: ef3eccb96762a5d6f135d7daeef608df7776a7ac
+
+commit 7d330a1ac02076de98cfc8fda05353d57b603755
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date:   Fri Feb 23 07:38:09 2018 +0000
+
+    upstream: some cleanup for BindInterface and ssh-keyscan;
+    
+    OpenBSD-Commit-ID: 1a719ebeae22a166adf05bea5009add7075acc8c
+
+commit c7b5a47e3b9db9a0f0198f9c90c705f6307afc2b
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sun Feb 25 23:55:41 2018 +1100
+
+    Invert sense of getpgrp test.
+    
+    AC_FUNC_GETPGRP tests if getpgrp(0) works, which it does if it's not
+    declared.  Instead, test if the zero-arg version we want to use works.
+
+commit b39593a6de5290650a01adf8699c6460570403c2
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sun Feb 25 13:25:15 2018 +1100
+
+    Add no-op getsid implmentation.
+
+commit 11057564eb6ab8fd987de50c3d7f394c6f6632b7
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sun Feb 25 11:22:57 2018 +1100
+
+    bsd-statvfs: include sys/vfs.h, check for f_flags.
+
+commit e9dede06e5bc582a4aeb5b1cd5a7a640d7de3609
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sun Feb 25 10:20:31 2018 +1100
+
+    Handle calloc(0,x) where different from malloc.
+    
+    Configure assumes that if malloc(0) returns null then calloc(0,n)
+    also does.  On some old platforms (SunOS4) malloc behaves as expected
+    (as determined by AC_FUNC_MALLOC) but calloc doesn't.  Test for this
+    at configure time and activate the replacement function if found, plus
+    handle this case in rpl_calloc.
+
+commit 2eb4041493fd2635ffdc64a852d02b38c4955e0b
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Feb 24 21:06:48 2018 +1100
+
+    Add prototype for readv if needed.
+
+commit 6c8c9a615b6d31db8a87bc25033f053d5b0a831e
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Feb 24 20:46:37 2018 +1100
+
+    Check for raise and supply if needed.
+
+commit a9004425a032d7a7141a5437cfabfd02431e2a74
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sat Feb 24 20:25:22 2018 +1100
+
+    Check for bzero and supply if needed.
+    
+    Since explicit_bzero uses it via an indirect it needs to be a function
+    not just a macro.
+
+commit 1a348359e4d2876203b5255941bae348557f4f54
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Feb 23 05:14:05 2018 +0000
+
+    upstream: Add ssh-keyscan -D option to make it print its results in
+    
+    SSHFP format bz#2821, ok dtucker@
+    
+    OpenBSD-Commit-ID: 831446b582e0f298ca15c9d99c415c899e392221
+
+commit 3e19fb976a47b44b3d7c4f8355269f7f2c5dd82c
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Feb 23 04:18:46 2018 +0000
+
+    upstream: Add missing braces.
+    
+    Caught by the tinderbox's -Werror=misleading-indentation,  ok djm@
+    
+    OpenBSD-Commit-ID: d44656af594c3b2366eb87d6abcef83e1c88a6ca
+
+commit b59162da99399d89bd57f71c170c0003c55b1583
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Feb 23 15:20:42 2018 +1100
+
+    Check for ifaddrs.h for BindInterface.
+    
+    BindInterface required getifaddr and friends so disable if not available
+    (eg Solaris 10).  We should be able to add support for some systems with
+    a bit more work but this gets the building again.
+
+commit a8dd6fe0aa10b6866830b4688a73ef966f0aed88
+Author: Damien Miller <djm@mindrot.org>
+Date:   Fri Feb 23 14:19:11 2018 +1100
+
+    space before tab in previous
+
+commit b5e9263c7704247f9624c8f5c458e9181fcdbc09
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Feb 9 03:40:22 2018 +0000
+
+    upstream: Replace fatal with exit in the case that we do not have
+    
+    $SUDO set. Prevents test failures when neither sudo nor doas are configured.
+    
+    OpenBSD-Regress-ID: 6a0464decc4f8ac7d6eded556a032b0fc521bc7b
+
+commit 3e9d3192ad43758ef761c5b0aa3ac5ccf8121ef2
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Feb 23 14:10:53 2018 +1100
+
+    Use portable syntax for REGRESSTMP.
+
+commit 73282b61187883a2b2bb48e087fdda1d751d6059
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Feb 23 03:03:00 2018 +0000
+
+    upstream: unbreak interop test after SSHv1 purge; patch from Colin
+    
+    Watson via bz#2823
+    
+    OpenBSD-Regress-ID: 807d30a597756ed6612bdf46dfebca74f49cb31a
+
+commit f8985dde5f46aedade0373365cbf86ed3f1aead2
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Feb 9 03:42:57 2018 +0000
+
+    upstream: Skip sftp-chroot test when SUDO not set instead of
+    
+    fatal().
+    
+    OpenBSD-Regress-ID: cd4b5f1109b0dc09af4e5ea7d4968c43fbcbde88
+
+commit df88551c02d4e3445c44ff67ba8757cff718609a
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Feb 9 03:40:22 2018 +0000
+
+    upstream: Replace fatal with exit in the case that we do not have
+    
+    $SUDO set. Prevents test failures when neither sudo nor doas are configured.
+    
+    OpenBSD-Regress-ID: 6a0464decc4f8ac7d6eded556a032b0fc521bc7b
+
+commit 3b252c20b19f093e87363de197f1100b79705dd3
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Thu Feb 8 08:46:20 2018 +0000
+
+    upstream: some helpers to check verbose/quiet mode
+    
+    OpenBSD-Regress-ID: e736aac39e563f5360a0935080a71d5fdcb976de
+
+commit ac2e3026bbee1367e4cda34765d1106099be3287
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Feb 23 02:34:33 2018 +0000
+
+    upstream: Add BindInterface ssh_config directive and -B
+    
+    command-line argument to ssh(1) that directs it to bind its outgoing
+    connection to the address of the specified network interface.
+    
+    BindInterface prefers to use addresses that aren't loopback or link-
+    local, but will fall back to those if no other addresses of the
+    required family are available on that interface.
+    
+    Based on patch by Mike Manning in bz#2820, ok dtucker@
+    
+    OpenBSD-Commit-ID: c5064d285c2851f773dd736a2c342aa384fbf713
+
+commit fcdb9d777839a3fa034b3bc3067ba8c1f6886679
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Mon Feb 19 00:55:02 2018 +0000
+
+    upstream: emphasise that the hostkey rotation may send key types
+    
+    that the client may not support, and that the client should simply disregard
+    such keys (this is what ssh does already).
+    
+    OpenBSD-Commit-ID: 65f8ffbc32ac8d12be8f913d7c0ea55bef8622bf
+
+commit ce066f688dc166506c082dac41ca686066e3de5f
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Feb 22 20:45:09 2018 +1100
+
+    Add headers for sys/audit.h.
+    
+    On some older platforms (at least sunos4, probably others) sys/audit.h
+    requires some other headers.  Patch from klausz at haus-gisela.de.
+
+commit 3fd2d2291a695c96a54269deae079bacce6e3fb9
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Mon Feb 19 18:37:40 2018 +1100
+
+    Add REGRESSTMP make var override.
+    
+    Defaults to original location ($srcdir/regress) but allows overriding
+    if desired, eg a directory in /tmp.
+
+commit f8338428588f3ecb5243c86336eccaa28809f97e
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Sun Feb 18 15:53:15 2018 +1100
+
+    Remove now-unused check for getrusage.
+    
+    getrusage was used in ssh-rand-helper but that's now long gone.
+    Patch from klauszh at haus-gisela.de.
+
+commit 8570177195f6a4b3173c0a25484a83641ee3faa6
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date:   Fri Feb 16 04:43:11 2018 +0000
+
+    upstream: Don't send IUTF8 to servers that don't like them.
+    
+    Some SSH servers eg "ConfD" drop the connection if the client sends the
+    new IUTF8 (RFC8160) terminal mode even if it's not set.  Add a bug bit
+    for such servers and avoid sending IUTF8 to them.  ok djm@
+    
+    OpenBSD-Commit-ID: 26425855402d870c3c0a90491e72e2a8a342ceda
+
+commit f6dc2ba3c9d12be53057b9371f5109ec553a399f
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Fri Feb 16 17:32:28 2018 +1100
+
+    freezero should check for NULL.
+
+commit 680321f3eb46773883111e234b3c262142ff7c5b
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Feb 16 02:40:45 2018 +0000
+
+    upstream: Mention recent DH KEX methods:
+    
+    diffie-hellman-group14-sha256
+    diffie-hellman-group16-sha512
+    diffie-hellman-group18-sha512
+    
+    From Jakub Jelen via bz#2826
+    
+    OpenBSD-Commit-ID: 51bf769f06e55447f4bfa7306949e62d2401907a
+
+commit 88c50a5ae20902715f0fca306bb9c38514f71679
+Author: djm@openbsd.org <djm@openbsd.org>
+Date:   Fri Feb 16 02:32:40 2018 +0000
+
+    upstream: stop loading DSA keys by default, remove sshd_config
+    
+    stanza and manpage bits; from Colin Watson via bz#2662, ok dtucker@
+    
+    OpenBSD-Commit-ID: d33a849f481684ff655c140f5eb1b4acda8c5c09
+
+commit d2b3db2860c962927def39a52f67f1c23f7b201a
+Author: jsing@openbsd.org <jsing@openbsd.org>
+Date:   Wed Feb 14 16:27:24 2018 +0000
+
+    upstream: Ensure that D mod (P-1) and D mod (Q-1) are calculated in
+    
+    constant time.
+    
+    This avoids a potential side channel timing leak.
+    
+    ok djm@ markus@
+    
+    OpenBSD-Commit-ID: 71ff3c16be03290e63d8edab8fac053d8a82968c
+
+commit 4270efad7048535b4f250f493d70f9acfb201593
+Author: jsing@openbsd.org <jsing@openbsd.org>
+Date:   Wed Feb 14 16:03:32 2018 +0000
+
+    upstream: Some obvious freezero() conversions.
+    
+    This also zeros an ed25519_pk when it was not being zeroed previously.
+    
+    ok djm@ dtucker@
+    
+    OpenBSD-Commit-ID: 5c196a3c85c23ac0bd9b11bcadaedd90b7a2ce82
+
+commit affa6ba67ffccc30b85d6e98f36eb5afd9386882
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Feb 15 22:32:04 2018 +1100
+
+    Remove execute bit from modpipe.c.
+
+commit 9879dca438526ae6dfd656fecb26b0558c29c731
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Feb 15 22:26:16 2018 +1100
+
+    Update prngd link to point to sourceforge.
+
+commit b6973fa5152b1a0bafd2417b7c3ad96f6e87d014
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Feb 15 22:22:38 2018 +1100
+
+    Remove references to UNICOS.
+
+commit f1ca487940449f0b64f38f1da575078257609966
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Feb 15 22:18:37 2018 +1100
+
+    Remove extra newline.
+
+commit 6d4e980f3cf27f409489cf89cd46c21501b13731
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Feb 15 22:16:54 2018 +1100
+
+    OpenSSH's builtin entropy gathering is long gone.
+
+commit 389125b25d1a1d7f22e907463b7e8eca74af79ea
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Feb 15 21:43:01 2018 +1100
+
+    Replace remaining mysignal() with signal().
+    
+    These seem to have been missed during the replacement of mysignal
+    with #define signal in commit 5ade9ab.  Both include the requisite
+    headers to pick up the #define.
+
+commit 265d88d4e61e352de6791733c8b29fa3d7d0c26d
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Feb 15 20:06:19 2018 +1100
+
+    Remove remaining now-obsolete cvs $Ids.
+
+commit 015749e9b1d2f6e14733466d19ba72f014d0845c
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Thu Feb 15 17:01:54 2018 +1100
+
+    Regenerate dependencies after UNICOS removal.
+
+commit ddc0f3814881ea279a6b6d4d98e03afc60ae1ed7
+Author: Darren Tucker <dtucker@dtucker.net>
+Date:   Tue Feb 13 09:10:46 2018 +1100
+
+    Remove UNICOS support.
+    
+    The code required to support it is quite invasive to the mainline
+    code that is synced with upstream and is an ongoing maintenance burden.
+    Both the hardware and software are literal museum pieces these days and
+    we could not find anyone still running OpenSSH on one.
diff --git a/config.h.in b/config.h.in
new file mode 100644
index 000000000..b8b5a01ae
--- /dev/null
+++ b/config.h.in
@@ -0,0 +1,2025 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
+/* Define if you have a getaddrinfo that fails for the all-zeros IPv6 address
+   */
+#undef AIX_GETNAMEINFO_HACK
+
+/* Define if your AIX loginfailed() function takes 4 arguments (AIX >= 5.2) */
+#undef AIX_LOGINFAILED_4ARG
+
+/* System only supports IPv4 audit records */
+#undef AU_IPv4
+
+/* Define if your resolver libs need this for getrrsetbyname */
+#undef BIND_8_COMPAT
+
+/* The system has incomplete BSM API */
+#undef BROKEN_BSM_API
+
+/* Define if cmsg_type is not passed correctly */
+#undef BROKEN_CMSG_TYPE
+
+/* getaddrinfo is broken (if present) */
+#undef BROKEN_GETADDRINFO
+
+/* getgroups(0,NULL) will return -1 */
+#undef BROKEN_GETGROUPS
+
+/* FreeBSD glob does not do what we need */
+#undef BROKEN_GLOB
+
+/* Define if you system's inet_ntoa is busted (e.g. Irix gcc issue) */
+#undef BROKEN_INET_NTOA
+
+/* Define if your struct dirent expects you to allocate extra space for d_name
+   */
+#undef BROKEN_ONE_BYTE_DIRENT_D_NAME
+
+/* Can't do comparisons on readv */
+#undef BROKEN_READV_COMPARISON
+
+/* NetBSD read function is sometimes redirected, breaking atomicio comparisons
+   against it */
+#undef BROKEN_READ_COMPARISON
+
+/* Needed for NeXT */
+#undef BROKEN_SAVED_UIDS
+
+/* Define if your setregid() is broken */
+#undef BROKEN_SETREGID
+
+/* Define if your setresgid() is broken */
+#undef BROKEN_SETRESGID
+
+/* Define if your setresuid() is broken */
+#undef BROKEN_SETRESUID
+
+/* Define if your setreuid() is broken */
+#undef BROKEN_SETREUID
+
+/* LynxOS has broken setvbuf() implementation */
+#undef BROKEN_SETVBUF
+
+/* QNX shadow support is broken */
+#undef BROKEN_SHADOW_EXPIRE
+
+/* Define if your snprintf is busted */
+#undef BROKEN_SNPRINTF
+
+/* strndup broken, see APAR IY61211 */
+#undef BROKEN_STRNDUP
+
+/* strnlen broken, see APAR IY62551 */
+#undef BROKEN_STRNLEN
+
+/* strnvis detected broken */
+#undef BROKEN_STRNVIS
+
+/* tcgetattr with ICANON may hang */
+#undef BROKEN_TCGETATTR_ICANON
+
+/* updwtmpx is broken (if present) */
+#undef BROKEN_UPDWTMPX
+
+/* Define if you have BSD auth support */
+#undef BSD_AUTH
+
+/* Define if you want to specify the path to your lastlog file */
+#undef CONF_LASTLOG_FILE
+
+/* Define if you want to specify the path to your utmp file */
+#undef CONF_UTMP_FILE
+
+/* Define if you want to specify the path to your wtmpx file */
+#undef CONF_WTMPX_FILE
+
+/* Define if you want to specify the path to your wtmp file */
+#undef CONF_WTMP_FILE
+
+/* Need to call setpgrp as root */
+#undef DISABLE_FD_PASSING
+
+/* Define if you don't want to use lastlog */
+#undef DISABLE_LASTLOG
+
+/* Define if you don't want to use your system's login() call */
+#undef DISABLE_LOGIN
+
+/* Define if you don't want to use pututline() etc. to write [uw]tmp */
+#undef DISABLE_PUTUTLINE
+
+/* Define if you don't want to use pututxline() etc. to write [uw]tmpx */
+#undef DISABLE_PUTUTXLINE
+
+/* Define if you want to disable shadow passwords */
+#undef DISABLE_SHADOW
+
+/* Define if you don't want to use utmp */
+#undef DISABLE_UTMP
+
+/* Define if you don't want to use utmpx */
+#undef DISABLE_UTMPX
+
+/* Define if you don't want to use wtmp */
+#undef DISABLE_WTMP
+
+/* Define if you don't want to use wtmpx */
+#undef DISABLE_WTMPX
+
+/* Enable for PKCS#11 support */
+#undef ENABLE_PKCS11
+
+/* Enable for U2F/FIDO support */
+#undef ENABLE_SK
+
+/* Enable for built-in U2F/FIDO support */
+#undef ENABLE_SK_INTERNAL
+
+/* define if fflush(NULL) does not work */
+#undef FFLUSH_NULL_BUG
+
+/* File names may not contain backslash characters */
+#undef FILESYSTEM_NO_BACKSLASH
+
+/* fsid_t has member val */
+#undef FSID_HAS_VAL
+
+/* fsid_t has member __val */
+#undef FSID_HAS___VAL
+
+/* getpgrp takes one arg */
+#undef GETPGRP_VOID
+
+/* Conflicting defs for getspnam */
+#undef GETSPNAM_CONFLICTING_DEFS
+
+/* Define if your system glob() function has the GLOB_ALTDIRFUNC extension */
+#undef GLOB_HAS_ALTDIRFUNC
+
+/* Define if your system glob() function has gl_matchc options in glob_t */
+#undef GLOB_HAS_GL_MATCHC
+
+/* Define if your system glob() function has gl_statv options in glob_t */
+#undef GLOB_HAS_GL_STATV
+
+/* Define this if you want GSSAPI support in the version 2 protocol */
+#undef GSSAPI
+
+/* Define if you want to use shadow password expire field */
+#undef HAS_SHADOW_EXPIRE
+
+/* Define if your system uses access rights style file descriptor passing */
+#undef HAVE_ACCRIGHTS_IN_MSGHDR
+
+/* Define if you have ut_addr in utmp.h */
+#undef HAVE_ADDR_IN_UTMP
+
+/* Define if you have ut_addr in utmpx.h */
+#undef HAVE_ADDR_IN_UTMPX
+
+/* Define if you have ut_addr_v6 in utmp.h */
+#undef HAVE_ADDR_V6_IN_UTMP
+
+/* Define if you have ut_addr_v6 in utmpx.h */
+#undef HAVE_ADDR_V6_IN_UTMPX
+
+/* Define to 1 if you have the `arc4random' function. */
+#undef HAVE_ARC4RANDOM
+
+/* Define to 1 if you have the `arc4random_buf' function. */
+#undef HAVE_ARC4RANDOM_BUF
+
+/* Define to 1 if you have the `arc4random_stir' function. */
+#undef HAVE_ARC4RANDOM_STIR
+
+/* Define to 1 if you have the `arc4random_uniform' function. */
+#undef HAVE_ARC4RANDOM_UNIFORM
+
+/* Define to 1 if you have the `asprintf' function. */
+#undef HAVE_ASPRINTF
+
+/* OpenBSD's gcc has bounded */
+#undef HAVE_ATTRIBUTE__BOUNDED__
+
+/* Have attribute nonnull */
+#undef HAVE_ATTRIBUTE__NONNULL__
+
+/* OpenBSD's gcc has sentinel */
+#undef HAVE_ATTRIBUTE__SENTINEL__
+
+/* Define to 1 if you have the `aug_get_machine' function. */
+#undef HAVE_AUG_GET_MACHINE
+
+/* Define to 1 if you have the `b64_ntop' function. */
+#undef HAVE_B64_NTOP
+
+/* Define to 1 if you have the `b64_pton' function. */
+#undef HAVE_B64_PTON
+
+/* Define if you have the basename function. */
+#undef HAVE_BASENAME
+
+/* Define to 1 if you have the `bcopy' function. */
+#undef HAVE_BCOPY
+
+/* Define to 1 if you have the `bcrypt_pbkdf' function. */
+#undef HAVE_BCRYPT_PBKDF
+
+/* Define to 1 if you have the `bindresvport_sa' function. */
+#undef HAVE_BINDRESVPORT_SA
+
+/* Define to 1 if you have the `blf_enc' function. */
+#undef HAVE_BLF_ENC
+
+/* Define to 1 if you have the <blf.h> header file. */
+#undef HAVE_BLF_H
+
+/* Define to 1 if you have the `Blowfish_expand0state' function. */
+#undef HAVE_BLOWFISH_EXPAND0STATE
+
+/* Define to 1 if you have the `Blowfish_expandstate' function. */
+#undef HAVE_BLOWFISH_EXPANDSTATE
+
+/* Define to 1 if you have the `Blowfish_initstate' function. */
+#undef HAVE_BLOWFISH_INITSTATE
+
+/* Define to 1 if you have the `Blowfish_stream2word' function. */
+#undef HAVE_BLOWFISH_STREAM2WORD
+
+/* Define to 1 if you have the `BN_is_prime_ex' function. */
+#undef HAVE_BN_IS_PRIME_EX
+
+/* Define to 1 if you have the <bsd/libutil.h> header file. */
+#undef HAVE_BSD_LIBUTIL_H
+
+/* Define to 1 if you have the <bsm/audit.h> header file. */
+#undef HAVE_BSM_AUDIT_H
+
+/* Define to 1 if you have the <bstring.h> header file. */
+#undef HAVE_BSTRING_H
+
+/* Define to 1 if you have the `bzero' function. */
+#undef HAVE_BZERO
+
+/* calloc(0, x) returns NULL */
+#undef HAVE_CALLOC
+
+/* Define to 1 if you have the `cap_rights_limit' function. */
+#undef HAVE_CAP_RIGHTS_LIMIT
+
+/* Define to 1 if you have the `clock' function. */
+#undef HAVE_CLOCK
+
+/* Have clock_gettime */
+#undef HAVE_CLOCK_GETTIME
+
+/* define if you have clock_t data type */
+#undef HAVE_CLOCK_T
+
+/* Define to 1 if you have the `closefrom' function. */
+#undef HAVE_CLOSEFROM
+
+/* Define if gai_strerror() returns const char * */
+#undef HAVE_CONST_GAI_STRERROR_PROTO
+
+/* Define if your system uses ancillary data style file descriptor passing */
+#undef HAVE_CONTROL_IN_MSGHDR
+
+/* Define to 1 if you have the `crypt' function. */
+#undef HAVE_CRYPT
+
+/* Define to 1 if you have the <crypto/sha2.h> header file. */
+#undef HAVE_CRYPTO_SHA2_H
+
+/* Define to 1 if you have the <crypt.h> header file. */
+#undef HAVE_CRYPT_H
+
+/* Define if you are on Cygwin */
+#undef HAVE_CYGWIN
+
+/* Define if your libraries define daemon() */
+#undef HAVE_DAEMON
+
+/* Define to 1 if you have the declaration of `AI_NUMERICSERV', and to 0 if
+   you don't. */
+#undef HAVE_DECL_AI_NUMERICSERV
+
+/* Define to 1 if you have the declaration of `authenticate', and to 0 if you
+   don't. */
+#undef HAVE_DECL_AUTHENTICATE
+
+/* Define to 1 if you have the declaration of `bzero', and to 0 if you don't.
+   */
+#undef HAVE_DECL_BZERO
+
+/* Define to 1 if you have the declaration of `GLOB_NOMATCH', and to 0 if you
+   don't. */
+#undef HAVE_DECL_GLOB_NOMATCH
+
+/* Define to 1 if you have the declaration of `GSS_C_NT_HOSTBASED_SERVICE',
+   and to 0 if you don't. */
+#undef HAVE_DECL_GSS_C_NT_HOSTBASED_SERVICE
+
+/* Define to 1 if you have the declaration of `howmany', and to 0 if you
+   don't. */
+#undef HAVE_DECL_HOWMANY
+
+/* Define to 1 if you have the declaration of `h_errno', and to 0 if you
+   don't. */
+#undef HAVE_DECL_H_ERRNO
+
+/* Define to 1 if you have the declaration of `loginfailed', and to 0 if you
+   don't. */
+#undef HAVE_DECL_LOGINFAILED
+
+/* Define to 1 if you have the declaration of `loginrestrictions', and to 0 if
+   you don't. */
+#undef HAVE_DECL_LOGINRESTRICTIONS
+
+/* Define to 1 if you have the declaration of `loginsuccess', and to 0 if you
+   don't. */
+#undef HAVE_DECL_LOGINSUCCESS
+
+/* Define to 1 if you have the declaration of `MAXSYMLINKS', and to 0 if you
+   don't. */
+#undef HAVE_DECL_MAXSYMLINKS
+
+/* Define to 1 if you have the declaration of `memmem', and to 0 if you don't.
+   */
+#undef HAVE_DECL_MEMMEM
+
+/* Define to 1 if you have the declaration of `NFDBITS', and to 0 if you
+   don't. */
+#undef HAVE_DECL_NFDBITS
+
+/* Define to 1 if you have the declaration of `offsetof', and to 0 if you
+   don't. */
+#undef HAVE_DECL_OFFSETOF
+
+/* Define to 1 if you have the declaration of `O_NONBLOCK', and to 0 if you
+   don't. */
+#undef HAVE_DECL_O_NONBLOCK
+
+/* Define to 1 if you have the declaration of `passwdexpired', and to 0 if you
+   don't. */
+#undef HAVE_DECL_PASSWDEXPIRED
+
+/* Define to 1 if you have the declaration of `readv', and to 0 if you don't.
+   */
+#undef HAVE_DECL_READV
+
+/* Define to 1 if you have the declaration of `setauthdb', and to 0 if you
+   don't. */
+#undef HAVE_DECL_SETAUTHDB
+
+/* Define to 1 if you have the declaration of `SHUT_RD', and to 0 if you
+   don't. */
+#undef HAVE_DECL_SHUT_RD
+
+/* Define to 1 if you have the declaration of `UINT32_MAX', and to 0 if you
+   don't. */
+#undef HAVE_DECL_UINT32_MAX
+
+/* Define to 1 if you have the declaration of `writev', and to 0 if you don't.
+   */
+#undef HAVE_DECL_WRITEV
+
+/* Define to 1 if you have the declaration of `_getlong', and to 0 if you
+   don't. */
+#undef HAVE_DECL__GETLONG
+
+/* Define to 1 if you have the declaration of `_getshort', and to 0 if you
+   don't. */
+#undef HAVE_DECL__GETSHORT
+
+/* Define to 1 if you have the `DES_crypt' function. */
+#undef HAVE_DES_CRYPT
+
+/* Define if you have /dev/ptmx */
+#undef HAVE_DEV_PTMX
+
+/* Define if you have /dev/ptc */
+#undef HAVE_DEV_PTS_AND_PTC
+
+/* Define to 1 if you have the `DH_get0_key' function. */
+#undef HAVE_DH_GET0_KEY
+
+/* Define to 1 if you have the `DH_get0_pqg' function. */
+#undef HAVE_DH_GET0_PQG
+
+/* Define to 1 if you have the `DH_set0_key' function. */
+#undef HAVE_DH_SET0_KEY
+
+/* Define to 1 if you have the `DH_set0_pqg' function. */
+#undef HAVE_DH_SET0_PQG
+
+/* Define to 1 if you have the `DH_set_length' function. */
+#undef HAVE_DH_SET_LENGTH
+
+/* Define to 1 if you have the <dirent.h> header file. */
+#undef HAVE_DIRENT_H
+
+/* Define to 1 if you have the `dirfd' function. */
+#undef HAVE_DIRFD
+
+/* Define to 1 if you have the `dirname' function. */
+#undef HAVE_DIRNAME
+
+/* Define to 1 if you have the `dlopen' function. */
+#undef HAVE_DLOPEN
+
+/* Define to 1 if you have the `DSA_generate_parameters_ex' function. */
+#undef HAVE_DSA_GENERATE_PARAMETERS_EX
+
+/* Define to 1 if you have the `DSA_get0_key' function. */
+#undef HAVE_DSA_GET0_KEY
+
+/* Define to 1 if you have the `DSA_get0_pqg' function. */
+#undef HAVE_DSA_GET0_PQG
+
+/* Define to 1 if you have the `DSA_set0_key' function. */
+#undef HAVE_DSA_SET0_KEY
+
+/* Define to 1 if you have the `DSA_set0_pqg' function. */
+#undef HAVE_DSA_SET0_PQG
+
+/* Define to 1 if you have the `DSA_SIG_get0' function. */
+#undef HAVE_DSA_SIG_GET0
+
+/* Define to 1 if you have the `DSA_SIG_set0' function. */
+#undef HAVE_DSA_SIG_SET0
+
+/* Define to 1 if you have the `ECDSA_SIG_get0' function. */
+#undef HAVE_ECDSA_SIG_GET0
+
+/* Define to 1 if you have the `ECDSA_SIG_set0' function. */
+#undef HAVE_ECDSA_SIG_SET0
+
+/* Define to 1 if you have the `EC_KEY_METHOD_new' function. */
+#undef HAVE_EC_KEY_METHOD_NEW
+
+/* Define to 1 if you have the <elf.h> header file. */
+#undef HAVE_ELF_H
+
+/* Define to 1 if you have the `endgrent' function. */
+#undef HAVE_ENDGRENT
+
+/* Define to 1 if you have the <endian.h> header file. */
+#undef HAVE_ENDIAN_H
+
+/* Define to 1 if you have the `endutent' function. */
+#undef HAVE_ENDUTENT
+
+/* Define to 1 if you have the `endutxent' function. */
+#undef HAVE_ENDUTXENT
+
+/* Define to 1 if you have the `err' function. */
+#undef HAVE_ERR
+
+/* Define to 1 if you have the `errx' function. */
+#undef HAVE_ERRX
+
+/* Define to 1 if you have the <err.h> header file. */
+#undef HAVE_ERR_H
+
+/* Define if your system has /etc/default/login */
+#undef HAVE_ETC_DEFAULT_LOGIN
+
+/* Define to 1 if you have the `EVP_CIPHER_CTX_ctrl' function. */
+#undef HAVE_EVP_CIPHER_CTX_CTRL
+
+/* Define to 1 if you have the `EVP_CIPHER_CTX_get_iv' function. */
+#undef HAVE_EVP_CIPHER_CTX_GET_IV
+
+/* Define to 1 if you have the `EVP_CIPHER_CTX_iv' function. */
+#undef HAVE_EVP_CIPHER_CTX_IV
+
+/* Define to 1 if you have the `EVP_CIPHER_CTX_iv_noconst' function. */
+#undef HAVE_EVP_CIPHER_CTX_IV_NOCONST
+
+/* Define to 1 if you have the `EVP_CIPHER_CTX_set_iv' function. */
+#undef HAVE_EVP_CIPHER_CTX_SET_IV
+
+/* Define to 1 if you have the `EVP_DigestFinal_ex' function. */
+#undef HAVE_EVP_DIGESTFINAL_EX
+
+/* Define to 1 if you have the `EVP_DigestInit_ex' function. */
+#undef HAVE_EVP_DIGESTINIT_EX
+
+/* Define to 1 if you have the `EVP_MD_CTX_cleanup' function. */
+#undef HAVE_EVP_MD_CTX_CLEANUP
+
+/* Define to 1 if you have the `EVP_MD_CTX_copy_ex' function. */
+#undef HAVE_EVP_MD_CTX_COPY_EX
+
+/* Define to 1 if you have the `EVP_MD_CTX_free' function. */
+#undef HAVE_EVP_MD_CTX_FREE
+
+/* Define to 1 if you have the `EVP_MD_CTX_init' function. */
+#undef HAVE_EVP_MD_CTX_INIT
+
+/* Define to 1 if you have the `EVP_MD_CTX_new' function. */
+#undef HAVE_EVP_MD_CTX_NEW
+
+/* Define to 1 if you have the `EVP_PKEY_get0_RSA' function. */
+#undef HAVE_EVP_PKEY_GET0_RSA
+
+/* Define to 1 if you have the `EVP_sha256' function. */
+#undef HAVE_EVP_SHA256
+
+/* Define to 1 if you have the `EVP_sha384' function. */
+#undef HAVE_EVP_SHA384
+
+/* Define to 1 if you have the `EVP_sha512' function. */
+#undef HAVE_EVP_SHA512
+
+/* Define if you have ut_exit in utmp.h */
+#undef HAVE_EXIT_IN_UTMP
+
+/* Define to 1 if you have the `explicit_bzero' function. */
+#undef HAVE_EXPLICIT_BZERO
+
+/* Define to 1 if you have the `fchmod' function. */
+#undef HAVE_FCHMOD
+
+/* Define to 1 if you have the `fchmodat' function. */
+#undef HAVE_FCHMODAT
+
+/* Define to 1 if you have the `fchown' function. */
+#undef HAVE_FCHOWN
+
+/* Define to 1 if you have the `fchownat' function. */
+#undef HAVE_FCHOWNAT
+
+/* Use F_CLOSEM fcntl for closefrom */
+#undef HAVE_FCNTL_CLOSEM
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
+
+/* Define to 1 if the system has the type `fd_mask'. */
+#undef HAVE_FD_MASK
+
+/* Define to 1 if you have the <features.h> header file. */
+#undef HAVE_FEATURES_H
+
+/* Define to 1 if you have the <floatingpoint.h> header file. */
+#undef HAVE_FLOATINGPOINT_H
+
+/* Define to 1 if you have the `flock' function. */
+#undef HAVE_FLOCK
+
+/* Define to 1 if you have the `fmt_scaled' function. */
+#undef HAVE_FMT_SCALED
+
+/* Define to 1 if you have the `fnmatch' function. */
+#undef HAVE_FNMATCH
+
+/* Define to 1 if you have the <fnmatch.h> header file. */
+#undef HAVE_FNMATCH_H
+
+/* Define to 1 if you have the `freeaddrinfo' function. */
+#undef HAVE_FREEADDRINFO
+
+/* Define to 1 if you have the `freezero' function. */
+#undef HAVE_FREEZERO
+
+/* Define to 1 if the system has the type `fsblkcnt_t'. */
+#undef HAVE_FSBLKCNT_T
+
+/* Define to 1 if the system has the type `fsfilcnt_t'. */
+#undef HAVE_FSFILCNT_T
+
+/* Define to 1 if you have the `fstatfs' function. */
+#undef HAVE_FSTATFS
+
+/* Define to 1 if you have the `fstatvfs' function. */
+#undef HAVE_FSTATVFS
+
+/* Define to 1 if you have the `futimes' function. */
+#undef HAVE_FUTIMES
+
+/* Define to 1 if you have the `gai_strerror' function. */
+#undef HAVE_GAI_STRERROR
+
+/* Define to 1 if you have the `getaddrinfo' function. */
+#undef HAVE_GETADDRINFO
+
+/* Define to 1 if you have the `getaudit' function. */
+#undef HAVE_GETAUDIT
+
+/* Define to 1 if you have the `getaudit_addr' function. */
+#undef HAVE_GETAUDIT_ADDR
+
+/* Define to 1 if you have the `getcwd' function. */
+#undef HAVE_GETCWD
+
+/* Define to 1 if you have the `getgrouplist' function. */
+#undef HAVE_GETGROUPLIST
+
+/* Define to 1 if you have the `getgrset' function. */
+#undef HAVE_GETGRSET
+
+/* Define to 1 if you have the `getlastlogxbyname' function. */
+#undef HAVE_GETLASTLOGXBYNAME
+
+/* Define to 1 if you have the `getline' function. */
+#undef HAVE_GETLINE
+
+/* Define to 1 if you have the `getluid' function. */
+#undef HAVE_GETLUID
+
+/* Define to 1 if you have the `getnameinfo' function. */
+#undef HAVE_GETNAMEINFO
+
+/* Define to 1 if you have the `getopt' function. */
+#undef HAVE_GETOPT
+
+/* Define to 1 if you have the <getopt.h> header file. */
+#undef HAVE_GETOPT_H
+
+/* Define if your getopt(3) defines and uses optreset */
+#undef HAVE_GETOPT_OPTRESET
+
+/* Define if your libraries define getpagesize() */
+#undef HAVE_GETPAGESIZE
+
+/* Define to 1 if you have the `getpeereid' function. */
+#undef HAVE_GETPEEREID
+
+/* Define to 1 if you have the `getpeerucred' function. */
+#undef HAVE_GETPEERUCRED
+
+/* Define to 1 if you have the `getpgid' function. */
+#undef HAVE_GETPGID
+
+/* Define to 1 if you have the `getpgrp' function. */
+#undef HAVE_GETPGRP
+
+/* Define to 1 if you have the `getpwanam' function. */
+#undef HAVE_GETPWANAM
+
+/* Define to 1 if you have the `getrandom' function. */
+#undef HAVE_GETRANDOM
+
+/* Define to 1 if you have the `getrlimit' function. */
+#undef HAVE_GETRLIMIT
+
+/* Define if getrrsetbyname() exists */
+#undef HAVE_GETRRSETBYNAME
+
+/* Define to 1 if you have the `getseuserbyname' function. */
+#undef HAVE_GETSEUSERBYNAME
+
+/* Define to 1 if you have the `getsid' function. */
+#undef HAVE_GETSID
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#undef HAVE_GETTIMEOFDAY
+
+/* Define to 1 if you have the `getttyent' function. */
+#undef HAVE_GETTTYENT
+
+/* Define to 1 if you have the `getutent' function. */
+#undef HAVE_GETUTENT
+
+/* Define to 1 if you have the `getutid' function. */
+#undef HAVE_GETUTID
+
+/* Define to 1 if you have the `getutline' function. */
+#undef HAVE_GETUTLINE
+
+/* Define to 1 if you have the `getutxent' function. */
+#undef HAVE_GETUTXENT
+
+/* Define to 1 if you have the `getutxid' function. */
+#undef HAVE_GETUTXID
+
+/* Define to 1 if you have the `getutxline' function. */
+#undef HAVE_GETUTXLINE
+
+/* Define to 1 if you have the `getutxuser' function. */
+#undef HAVE_GETUTXUSER
+
+/* Define to 1 if you have the `get_default_context_with_level' function. */
+#undef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL
+
+/* Define to 1 if you have the `glob' function. */
+#undef HAVE_GLOB
+
+/* Define to 1 if you have the <glob.h> header file. */
+#undef HAVE_GLOB_H
+
+/* Define to 1 if you have the `group_from_gid' function. */
+#undef HAVE_GROUP_FROM_GID
+
+/* Define to 1 if you have the <gssapi_generic.h> header file. */
+#undef HAVE_GSSAPI_GENERIC_H
+
+/* Define to 1 if you have the <gssapi/gssapi_generic.h> header file. */
+#undef HAVE_GSSAPI_GSSAPI_GENERIC_H
+
+/* Define to 1 if you have the <gssapi/gssapi.h> header file. */
+#undef HAVE_GSSAPI_GSSAPI_H
+
+/* Define to 1 if you have the <gssapi/gssapi_krb5.h> header file. */
+#undef HAVE_GSSAPI_GSSAPI_KRB5_H
+
+/* Define to 1 if you have the <gssapi.h> header file. */
+#undef HAVE_GSSAPI_H
+
+/* Define to 1 if you have the <gssapi_krb5.h> header file. */
+#undef HAVE_GSSAPI_KRB5_H
+
+/* Define if HEADER.ad exists in arpa/nameser.h */
+#undef HAVE_HEADER_AD
+
+/* Define to 1 if you have the `HMAC_CTX_init' function. */
+#undef HAVE_HMAC_CTX_INIT
+
+/* Define if you have ut_host in utmp.h */
+#undef HAVE_HOST_IN_UTMP
+
+/* Define if you have ut_host in utmpx.h */
+#undef HAVE_HOST_IN_UTMPX
+
+/* Define to 1 if you have the <iaf.h> header file. */
+#undef HAVE_IAF_H
+
+/* Define to 1 if you have the <ia.h> header file. */
+#undef HAVE_IA_H
+
+/* Define if you have ut_id in utmp.h */
+#undef HAVE_ID_IN_UTMP
+
+/* Define if you have ut_id in utmpx.h */
+#undef HAVE_ID_IN_UTMPX
+
+/* Define to 1 if you have the <ifaddrs.h> header file. */
+#undef HAVE_IFADDRS_H
+
+/* Define to 1 if you have the `inet_aton' function. */
+#undef HAVE_INET_ATON
+
+/* Define to 1 if you have the `inet_ntoa' function. */
+#undef HAVE_INET_NTOA
+
+/* Define to 1 if you have the `inet_ntop' function. */
+#undef HAVE_INET_NTOP
+
+/* Define to 1 if you have the `innetgr' function. */
+#undef HAVE_INNETGR
+
+/* define if you have int64_t data type */
+#undef HAVE_INT64_T
+
+/* Define to 1 if the system has the type `intmax_t'. */
+#undef HAVE_INTMAX_T
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* define if you have intxx_t data type */
+#undef HAVE_INTXX_T
+
+/* Define to 1 if the system has the type `in_addr_t'. */
+#undef HAVE_IN_ADDR_T
+
+/* Define to 1 if the system has the type `in_port_t'. */
+#undef HAVE_IN_PORT_T
+
+/* Define if you have isblank(3C). */
+#undef HAVE_ISBLANK
+
+/* Define to 1 if you have the `krb5_cc_new_unique' function. */
+#undef HAVE_KRB5_CC_NEW_UNIQUE
+
+/* Define to 1 if you have the `krb5_free_error_message' function. */
+#undef HAVE_KRB5_FREE_ERROR_MESSAGE
+
+/* Define to 1 if you have the `krb5_get_error_message' function. */
+#undef HAVE_KRB5_GET_ERROR_MESSAGE
+
+/* Define to 1 if you have the <langinfo.h> header file. */
+#undef HAVE_LANGINFO_H
+
+/* Define to 1 if you have the <lastlog.h> header file. */
+#undef HAVE_LASTLOG_H
+
+/* Define if you want ldns support */
+#undef HAVE_LDNS
+
+/* Define to 1 if you have the <libaudit.h> header file. */
+#undef HAVE_LIBAUDIT_H
+
+/* Define to 1 if you have the `bsm' library (-lbsm). */
+#undef HAVE_LIBBSM
+
+/* Define to 1 if you have the `crypt' library (-lcrypt). */
+#undef HAVE_LIBCRYPT
+
+/* Define to 1 if you have the `dl' library (-ldl). */
+#undef HAVE_LIBDL
+
+/* Define to 1 if you have the <libgen.h> header file. */
+#undef HAVE_LIBGEN_H
+
+/* Define if system has libiaf that supports set_id */
+#undef HAVE_LIBIAF
+
+/* Define to 1 if you have the `network' library (-lnetwork). */
+#undef HAVE_LIBNETWORK
+
+/* Define to 1 if you have the `pam' library (-lpam). */
+#undef HAVE_LIBPAM
+
+/* Define to 1 if you have the <libproc.h> header file. */
+#undef HAVE_LIBPROC_H
+
+/* Define to 1 if you have the `socket' library (-lsocket). */
+#undef HAVE_LIBSOCKET
+
+/* Define to 1 if you have the <libutil.h> header file. */
+#undef HAVE_LIBUTIL_H
+
+/* Define to 1 if you have the `xnet' library (-lxnet). */
+#undef HAVE_LIBXNET
+
+/* Define to 1 if you have the `z' library (-lz). */
+#undef HAVE_LIBZ
+
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
+
+/* Define to 1 if you have the <linux/audit.h> header file. */
+#undef HAVE_LINUX_AUDIT_H
+
+/* Define to 1 if you have the <linux/filter.h> header file. */
+#undef HAVE_LINUX_FILTER_H
+
+/* Define to 1 if you have the <linux/if_tun.h> header file. */
+#undef HAVE_LINUX_IF_TUN_H
+
+/* Define to 1 if you have the <linux/seccomp.h> header file. */
+#undef HAVE_LINUX_SECCOMP_H
+
+/* Define to 1 if you have the `llabs' function. */
+#undef HAVE_LLABS
+
+/* Define to 1 if you have the <locale.h> header file. */
+#undef HAVE_LOCALE_H
+
+/* Define to 1 if you have the `localtime_r' function. */
+#undef HAVE_LOCALTIME_R
+
+/* Define to 1 if you have the `login' function. */
+#undef HAVE_LOGIN
+
+/* Define to 1 if you have the <login_cap.h> header file. */
+#undef HAVE_LOGIN_CAP_H
+
+/* Define to 1 if you have the `login_getcapbool' function. */
+#undef HAVE_LOGIN_GETCAPBOOL
+
+/* Define to 1 if you have the <login.h> header file. */
+#undef HAVE_LOGIN_H
+
+/* Define to 1 if you have the `logout' function. */
+#undef HAVE_LOGOUT
+
+/* Define to 1 if you have the `logwtmp' function. */
+#undef HAVE_LOGWTMP
+
+/* Define to 1 if the system has the type `long double'. */
+#undef HAVE_LONG_DOUBLE
+
+/* Define to 1 if the system has the type `long long'. */
+#undef HAVE_LONG_LONG
+
+/* Define to 1 if you have the <maillock.h> header file. */
+#undef HAVE_MAILLOCK_H
+
+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
+   to 0 otherwise. */
+#undef HAVE_MALLOC
+
+/* Define to 1 if you have the `mblen' function. */
+#undef HAVE_MBLEN
+
+/* Define to 1 if you have the `mbtowc' function. */
+#undef HAVE_MBTOWC
+
+/* Define to 1 if you have the `md5_crypt' function. */
+#undef HAVE_MD5_CRYPT
+
+/* Define if you want to allow MD5 passwords */
+#undef HAVE_MD5_PASSWORDS
+
+/* Define to 1 if you have the `memmem' function. */
+#undef HAVE_MEMMEM
+
+/* Define to 1 if you have the `memmove' function. */
+#undef HAVE_MEMMOVE
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `memset_s' function. */
+#undef HAVE_MEMSET_S
+
+/* Define to 1 if you have the `mkdtemp' function. */
+#undef HAVE_MKDTEMP
+
+/* define if you have mode_t data type */
+#undef HAVE_MODE_T
+
+/* Some systems put nanosleep outside of libc */
+#undef HAVE_NANOSLEEP
+
+/* Define to 1 if you have the <ndir.h> header file. */
+#undef HAVE_NDIR_H
+
+/* Define to 1 if you have the <netdb.h> header file. */
+#undef HAVE_NETDB_H
+
+/* Define to 1 if you have the <netgroup.h> header file. */
+#undef HAVE_NETGROUP_H
+
+/* Define to 1 if you have the <net/if_tun.h> header file. */
+#undef HAVE_NET_IF_TUN_H
+
+/* Define to 1 if you have the <net/route.h> header file. */
+#undef HAVE_NET_ROUTE_H
+
+/* Define if you are on NeXT */
+#undef HAVE_NEXT
+
+/* Define to 1 if you have the `ngetaddrinfo' function. */
+#undef HAVE_NGETADDRINFO
+
+/* Define to 1 if you have the `nl_langinfo' function. */
+#undef HAVE_NL_LANGINFO
+
+/* Define to 1 if you have the `nsleep' function. */
+#undef HAVE_NSLEEP
+
+/* Define to 1 if you have the `ogetaddrinfo' function. */
+#undef HAVE_OGETADDRINFO
+
+/* Define if you have an old version of PAM which takes only one argument to
+   pam_strerror */
+#undef HAVE_OLD_PAM
+
+/* Define to 1 if you have the `openlog_r' function. */
+#undef HAVE_OPENLOG_R
+
+/* Define to 1 if you have the `openpty' function. */
+#undef HAVE_OPENPTY
+
+/* as a macro */
+#undef HAVE_OPENSSL_ADD_ALL_ALGORITHMS
+
+/* Define to 1 if you have the `OPENSSL_init_crypto' function. */
+#undef HAVE_OPENSSL_INIT_CRYPTO
+
+/* Define to 1 if you have the `OpenSSL_version' function. */
+#undef HAVE_OPENSSL_VERSION
+
+/* Define to 1 if you have the `OpenSSL_version_num' function. */
+#undef HAVE_OPENSSL_VERSION_NUM
+
+/* Define if you have Digital Unix Security Integration Architecture */
+#undef HAVE_OSF_SIA
+
+/* Define to 1 if you have the `pam_getenvlist' function. */
+#undef HAVE_PAM_GETENVLIST
+
+/* Define to 1 if you have the <pam/pam_appl.h> header file. */
+#undef HAVE_PAM_PAM_APPL_H
+
+/* Define to 1 if you have the `pam_putenv' function. */
+#undef HAVE_PAM_PUTENV
+
+/* Define to 1 if you have the <paths.h> header file. */
+#undef HAVE_PATHS_H
+
+/* Define if you have ut_pid in utmp.h */
+#undef HAVE_PID_IN_UTMP
+
+/* define if you have pid_t data type */
+#undef HAVE_PID_T
+
+/* Define to 1 if you have the `pledge' function. */
+#undef HAVE_PLEDGE
+
+/* Define to 1 if you have the `poll' function. */
+#undef HAVE_POLL
+
+/* Define to 1 if you have the <poll.h> header file. */
+#undef HAVE_POLL_H
+
+/* Define to 1 if you have the `prctl' function. */
+#undef HAVE_PRCTL
+
+/* Define to 1 if you have the `priv_basicset' function. */
+#undef HAVE_PRIV_BASICSET
+
+/* Define to 1 if you have the <priv.h> header file. */
+#undef HAVE_PRIV_H
+
+/* Define if you have /proc/$pid/fd */
+#undef HAVE_PROC_PID
+
+/* Define to 1 if you have the `proc_pidinfo' function. */
+#undef HAVE_PROC_PIDINFO
+
+/* Define to 1 if you have the `pstat' function. */
+#undef HAVE_PSTAT
+
+/* Define to 1 if you have the <pty.h> header file. */
+#undef HAVE_PTY_H
+
+/* Define to 1 if you have the `pututline' function. */
+#undef HAVE_PUTUTLINE
+
+/* Define to 1 if you have the `pututxline' function. */
+#undef HAVE_PUTUTXLINE
+
+/* Define to 1 if you have the `raise' function. */
+#undef HAVE_RAISE
+
+/* Define to 1 if you have the `readpassphrase' function. */
+#undef HAVE_READPASSPHRASE
+
+/* Define to 1 if you have the <readpassphrase.h> header file. */
+#undef HAVE_READPASSPHRASE_H
+
+/* Define to 1 if your system has a GNU libc compatible `realloc' function,
+   and to 0 otherwise. */
+#undef HAVE_REALLOC
+
+/* Define to 1 if you have the `reallocarray' function. */
+#undef HAVE_REALLOCARRAY
+
+/* Define to 1 if you have the `realpath' function. */
+#undef HAVE_REALPATH
+
+/* Define to 1 if you have the `recallocarray' function. */
+#undef HAVE_RECALLOCARRAY
+
+/* Define to 1 if you have the `recvmsg' function. */
+#undef HAVE_RECVMSG
+
+/* sys/resource.h has RLIMIT_NPROC */
+#undef HAVE_RLIMIT_NPROC
+
+/* Define to 1 if you have the <rpc/types.h> header file. */
+#undef HAVE_RPC_TYPES_H
+
+/* Define to 1 if you have the `rresvport_af' function. */
+#undef HAVE_RRESVPORT_AF
+
+/* Define to 1 if you have the `RSA_generate_key_ex' function. */
+#undef HAVE_RSA_GENERATE_KEY_EX
+
+/* Define to 1 if you have the `RSA_get0_crt_params' function. */
+#undef HAVE_RSA_GET0_CRT_PARAMS
+
+/* Define to 1 if you have the `RSA_get0_factors' function. */
+#undef HAVE_RSA_GET0_FACTORS
+
+/* Define to 1 if you have the `RSA_get0_key' function. */
+#undef HAVE_RSA_GET0_KEY
+
+/* Define to 1 if you have the `RSA_get_default_method' function. */
+#undef HAVE_RSA_GET_DEFAULT_METHOD
+
+/* Define to 1 if you have the `RSA_meth_dup' function. */
+#undef HAVE_RSA_METH_DUP
+
+/* Define to 1 if you have the `RSA_meth_free' function. */
+#undef HAVE_RSA_METH_FREE
+
+/* Define to 1 if you have the `RSA_meth_get_finish' function. */
+#undef HAVE_RSA_METH_GET_FINISH
+
+/* Define to 1 if you have the `RSA_meth_set1_name' function. */
+#undef HAVE_RSA_METH_SET1_NAME
+
+/* Define to 1 if you have the `RSA_meth_set_finish' function. */
+#undef HAVE_RSA_METH_SET_FINISH
+
+/* Define to 1 if you have the `RSA_meth_set_priv_dec' function. */
+#undef HAVE_RSA_METH_SET_PRIV_DEC
+
+/* Define to 1 if you have the `RSA_meth_set_priv_enc' function. */
+#undef HAVE_RSA_METH_SET_PRIV_ENC
+
+/* Define to 1 if you have the `RSA_set0_crt_params' function. */
+#undef HAVE_RSA_SET0_CRT_PARAMS
+
+/* Define to 1 if you have the `RSA_set0_factors' function. */
+#undef HAVE_RSA_SET0_FACTORS
+
+/* Define to 1 if you have the `RSA_set0_key' function. */
+#undef HAVE_RSA_SET0_KEY
+
+/* Define to 1 if you have the <sandbox.h> header file. */
+#undef HAVE_SANDBOX_H
+
+/* Define to 1 if you have the `sandbox_init' function. */
+#undef HAVE_SANDBOX_INIT
+
+/* define if you have sa_family_t data type */
+#undef HAVE_SA_FAMILY_T
+
+/* Define to 1 if you have the `scan_scaled' function. */
+#undef HAVE_SCAN_SCALED
+
+/* Define if you have SecureWare-based protected password database */
+#undef HAVE_SECUREWARE
+
+/* Define to 1 if you have the <security/pam_appl.h> header file. */
+#undef HAVE_SECURITY_PAM_APPL_H
+
+/* Define to 1 if you have the `sendmsg' function. */
+#undef HAVE_SENDMSG
+
+/* Define to 1 if you have the `setauthdb' function. */
+#undef HAVE_SETAUTHDB
+
+/* Define to 1 if you have the `setdtablesize' function. */
+#undef HAVE_SETDTABLESIZE
+
+/* Define to 1 if you have the `setegid' function. */
+#undef HAVE_SETEGID
+
+/* Define to 1 if you have the `setenv' function. */
+#undef HAVE_SETENV
+
+/* Define to 1 if you have the `seteuid' function. */
+#undef HAVE_SETEUID
+
+/* Define to 1 if you have the `setgroupent' function. */
+#undef HAVE_SETGROUPENT
+
+/* Define to 1 if you have the `setgroups' function. */
+#undef HAVE_SETGROUPS
+
+/* Define to 1 if you have the `setlinebuf' function. */
+#undef HAVE_SETLINEBUF
+
+/* Define to 1 if you have the `setlogin' function. */
+#undef HAVE_SETLOGIN
+
+/* Define to 1 if you have the `setluid' function. */
+#undef HAVE_SETLUID
+
+/* Define to 1 if you have the `setpassent' function. */
+#undef HAVE_SETPASSENT
+
+/* Define to 1 if you have the `setpcred' function. */
+#undef HAVE_SETPCRED
+
+/* Define to 1 if you have the `setpflags' function. */
+#undef HAVE_SETPFLAGS
+
+/* Define to 1 if you have the `setppriv' function. */
+#undef HAVE_SETPPRIV
+
+/* Define to 1 if you have the `setproctitle' function. */
+#undef HAVE_SETPROCTITLE
+
+/* Define to 1 if you have the `setregid' function. */
+#undef HAVE_SETREGID
+
+/* Define to 1 if you have the `setresgid' function. */
+#undef HAVE_SETRESGID
+
+/* Define to 1 if you have the `setresuid' function. */
+#undef HAVE_SETRESUID
+
+/* Define to 1 if you have the `setreuid' function. */
+#undef HAVE_SETREUID
+
+/* Define to 1 if you have the `setrlimit' function. */
+#undef HAVE_SETRLIMIT
+
+/* Define to 1 if you have the `setsid' function. */
+#undef HAVE_SETSID
+
+/* Define to 1 if you have the `setutent' function. */
+#undef HAVE_SETUTENT
+
+/* Define to 1 if you have the `setutxdb' function. */
+#undef HAVE_SETUTXDB
+
+/* Define to 1 if you have the `setutxent' function. */
+#undef HAVE_SETUTXENT
+
+/* Define to 1 if you have the `setvbuf' function. */
+#undef HAVE_SETVBUF
+
+/* Define to 1 if you have the `set_id' function. */
+#undef HAVE_SET_ID
+
+/* Define to 1 if you have the `SHA256Update' function. */
+#undef HAVE_SHA256UPDATE
+
+/* Define to 1 if you have the <sha2.h> header file. */
+#undef HAVE_SHA2_H
+
+/* Define to 1 if you have the `SHA384Update' function. */
+#undef HAVE_SHA384UPDATE
+
+/* Define to 1 if you have the `SHA512Update' function. */
+#undef HAVE_SHA512UPDATE
+
+/* Define to 1 if you have the <shadow.h> header file. */
+#undef HAVE_SHADOW_H
+
+/* Define to 1 if you have the `sigaction' function. */
+#undef HAVE_SIGACTION
+
+/* Define to 1 if you have the `sigvec' function. */
+#undef HAVE_SIGVEC
+
+/* Define to 1 if the system has the type `sig_atomic_t'. */
+#undef HAVE_SIG_ATOMIC_T
+
+/* define if you have size_t data type */
+#undef HAVE_SIZE_T
+
+/* Define to 1 if you have the `snprintf' function. */
+#undef HAVE_SNPRINTF
+
+/* Define to 1 if you have the `socketpair' function. */
+#undef HAVE_SOCKETPAIR
+
+/* Have PEERCRED socket option */
+#undef HAVE_SO_PEERCRED
+
+/* define if you have ssize_t data type */
+#undef HAVE_SSIZE_T
+
+/* Fields in struct sockaddr_storage */
+#undef HAVE_SS_FAMILY_IN_SS
+
+/* Define to 1 if you have the `statfs' function. */
+#undef HAVE_STATFS
+
+/* Define to 1 if you have the `statvfs' function. */
+#undef HAVE_STATVFS
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#undef HAVE_STDDEF_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strcasestr' function. */
+#undef HAVE_STRCASESTR
+
+/* Define to 1 if you have the `strdup' function. */
+#undef HAVE_STRDUP
+
+/* Define to 1 if you have the `strerror' function. */
+#undef HAVE_STRERROR
+
+/* Define to 1 if you have the `strftime' function. */
+#undef HAVE_STRFTIME
+
+/* Silly mkstemp() */
+#undef HAVE_STRICT_MKSTEMP
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strlcat' function. */
+#undef HAVE_STRLCAT
+
+/* Define to 1 if you have the `strlcpy' function. */
+#undef HAVE_STRLCPY
+
+/* Define to 1 if you have the `strmode' function. */
+#undef HAVE_STRMODE
+
+/* Define to 1 if you have the `strndup' function. */
+#undef HAVE_STRNDUP
+
+/* Define to 1 if you have the `strnlen' function. */
+#undef HAVE_STRNLEN
+
+/* Define to 1 if you have the `strnvis' function. */
+#undef HAVE_STRNVIS
+
+/* Define to 1 if you have the `strptime' function. */
+#undef HAVE_STRPTIME
+
+/* Define to 1 if you have the `strsep' function. */
+#undef HAVE_STRSEP
+
+/* Define to 1 if you have the `strsignal' function. */
+#undef HAVE_STRSIGNAL
+
+/* Define to 1 if you have the `strtoll' function. */
+#undef HAVE_STRTOLL
+
+/* Define to 1 if you have the `strtonum' function. */
+#undef HAVE_STRTONUM
+
+/* Define to 1 if you have the `strtoul' function. */
+#undef HAVE_STRTOUL
+
+/* Define to 1 if you have the `strtoull' function. */
+#undef HAVE_STRTOULL
+
+/* define if you have struct addrinfo data type */
+#undef HAVE_STRUCT_ADDRINFO
+
+/* define if you have struct in6_addr data type */
+#undef HAVE_STRUCT_IN6_ADDR
+
+/* Define to 1 if `pw_change' is a member of `struct passwd'. */
+#undef HAVE_STRUCT_PASSWD_PW_CHANGE
+
+/* Define to 1 if `pw_class' is a member of `struct passwd'. */
+#undef HAVE_STRUCT_PASSWD_PW_CLASS
+
+/* Define to 1 if `pw_expire' is a member of `struct passwd'. */
+#undef HAVE_STRUCT_PASSWD_PW_EXPIRE
+
+/* Define to 1 if `pw_gecos' is a member of `struct passwd'. */
+#undef HAVE_STRUCT_PASSWD_PW_GECOS
+
+/* define if you have struct sockaddr_in6 data type */
+#undef HAVE_STRUCT_SOCKADDR_IN6
+
+/* Define to 1 if `sin6_scope_id' is a member of `struct sockaddr_in6'. */
+#undef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
+
+/* define if you have struct sockaddr_storage data type */
+#undef HAVE_STRUCT_SOCKADDR_STORAGE
+
+/* Define to 1 if `f_files' is a member of `struct statfs'. */
+#undef HAVE_STRUCT_STATFS_F_FILES
+
+/* Define to 1 if `f_flags' is a member of `struct statfs'. */
+#undef HAVE_STRUCT_STATFS_F_FLAGS
+
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
+#undef HAVE_STRUCT_STAT_ST_BLKSIZE
+
+/* Define to 1 if `st_mtim' is a member of `struct stat'. */
+#undef HAVE_STRUCT_STAT_ST_MTIM
+
+/* Define to 1 if `st_mtime' is a member of `struct stat'. */
+#undef HAVE_STRUCT_STAT_ST_MTIME
+
+/* define if you have struct timespec */
+#undef HAVE_STRUCT_TIMESPEC
+
+/* define if you have struct timeval */
+#undef HAVE_STRUCT_TIMEVAL
+
+/* Define to 1 if you have the `swap32' function. */
+#undef HAVE_SWAP32
+
+/* Define to 1 if you have the `sysconf' function. */
+#undef HAVE_SYSCONF
+
+/* Define if you have syslen in utmpx.h */
+#undef HAVE_SYSLEN_IN_UTMPX
+
+/* Define to 1 if you have the <sys/audit.h> header file. */
+#undef HAVE_SYS_AUDIT_H
+
+/* Define to 1 if you have the <sys/bitypes.h> header file. */
+#undef HAVE_SYS_BITYPES_H
+
+/* Define to 1 if you have the <sys/bsdtty.h> header file. */
+#undef HAVE_SYS_BSDTTY_H
+
+/* Define to 1 if you have the <sys/capsicum.h> header file. */
+#undef HAVE_SYS_CAPSICUM_H
+
+/* Define to 1 if you have the <sys/cdefs.h> header file. */
+#undef HAVE_SYS_CDEFS_H
+
+/* Define to 1 if you have the <sys/dir.h> header file. */
+#undef HAVE_SYS_DIR_H
+
+/* Define if your system defines sys_errlist[] */
+#undef HAVE_SYS_ERRLIST
+
+/* Define to 1 if you have the <sys/file.h> header file. */
+#undef HAVE_SYS_FILE_H
+
+/* Define to 1 if you have the <sys/label.h> header file. */
+#undef HAVE_SYS_LABEL_H
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#undef HAVE_SYS_MMAN_H
+
+/* Define to 1 if you have the <sys/mount.h> header file. */
+#undef HAVE_SYS_MOUNT_H
+
+/* Define to 1 if you have the <sys/ndir.h> header file. */
+#undef HAVE_SYS_NDIR_H
+
+/* Define if your system defines sys_nerr */
+#undef HAVE_SYS_NERR
+
+/* Define to 1 if you have the <sys/poll.h> header file. */
+#undef HAVE_SYS_POLL_H
+
+/* Define to 1 if you have the <sys/prctl.h> header file. */
+#undef HAVE_SYS_PRCTL_H
+
+/* Define to 1 if you have the <sys/pstat.h> header file. */
+#undef HAVE_SYS_PSTAT_H
+
+/* Define to 1 if you have the <sys/ptms.h> header file. */
+#undef HAVE_SYS_PTMS_H
+
+/* Define to 1 if you have the <sys/ptrace.h> header file. */
+#undef HAVE_SYS_PTRACE_H
+
+/* Define to 1 if you have the <sys/random.h> header file. */
+#undef HAVE_SYS_RANDOM_H
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#undef HAVE_SYS_SELECT_H
+
+/* Define to 1 if you have the <sys/statvfs.h> header file. */
+#undef HAVE_SYS_STATVFS_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/stream.h> header file. */
+#undef HAVE_SYS_STREAM_H
+
+/* Define to 1 if you have the <sys/stropts.h> header file. */
+#undef HAVE_SYS_STROPTS_H
+
+/* Define to 1 if you have the <sys/strtio.h> header file. */
+#undef HAVE_SYS_STRTIO_H
+
+/* Define to 1 if you have the <sys/sysctl.h> header file. */
+#undef HAVE_SYS_SYSCTL_H
+
+/* Force use of sys/syslog.h on Ultrix */
+#undef HAVE_SYS_SYSLOG_H
+
+/* Define to 1 if you have the <sys/sysmacros.h> header file. */
+#undef HAVE_SYS_SYSMACROS_H
+
+/* Define to 1 if you have the <sys/timers.h> header file. */
+#undef HAVE_SYS_TIMERS_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <sys/un.h> header file. */
+#undef HAVE_SYS_UN_H
+
+/* Define to 1 if you have the <sys/vfs.h> header file. */
+#undef HAVE_SYS_VFS_H
+
+/* Define to 1 if you have the `tcgetpgrp' function. */
+#undef HAVE_TCGETPGRP
+
+/* Define to 1 if you have the `tcsendbreak' function. */
+#undef HAVE_TCSENDBREAK
+
+/* Define to 1 if you have the `time' function. */
+#undef HAVE_TIME
+
+/* Define to 1 if you have the <time.h> header file. */
+#undef HAVE_TIME_H
+
+/* Define if you have ut_time in utmp.h */
+#undef HAVE_TIME_IN_UTMP
+
+/* Define if you have ut_time in utmpx.h */
+#undef HAVE_TIME_IN_UTMPX
+
+/* Define to 1 if you have the `timingsafe_bcmp' function. */
+#undef HAVE_TIMINGSAFE_BCMP
+
+/* Define to 1 if you have the <tmpdir.h> header file. */
+#undef HAVE_TMPDIR_H
+
+/* Define to 1 if you have the `truncate' function. */
+#undef HAVE_TRUNCATE
+
+/* Define to 1 if you have the <ttyent.h> header file. */
+#undef HAVE_TTYENT_H
+
+/* Define if you have ut_tv in utmp.h */
+#undef HAVE_TV_IN_UTMP
+
+/* Define if you have ut_tv in utmpx.h */
+#undef HAVE_TV_IN_UTMPX
+
+/* Define if you have ut_type in utmp.h */
+#undef HAVE_TYPE_IN_UTMP
+
+/* Define if you have ut_type in utmpx.h */
+#undef HAVE_TYPE_IN_UTMPX
+
+/* Define to 1 if you have the <ucred.h> header file. */
+#undef HAVE_UCRED_H
+
+/* Define to 1 if the system has the type `uintmax_t'. */
+#undef HAVE_UINTMAX_T
+
+/* define if you have uintxx_t data type */
+#undef HAVE_UINTXX_T
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the `unsetenv' function. */
+#undef HAVE_UNSETENV
+
+/* Define to 1 if the system has the type `unsigned long long'. */
+#undef HAVE_UNSIGNED_LONG_LONG
+
+/* Define to 1 if you have the `updwtmp' function. */
+#undef HAVE_UPDWTMP
+
+/* Define to 1 if you have the `updwtmpx' function. */
+#undef HAVE_UPDWTMPX
+
+/* Define to 1 if you have the <usersec.h> header file. */
+#undef HAVE_USERSEC_H
+
+/* Define to 1 if you have the `user_from_uid' function. */
+#undef HAVE_USER_FROM_UID
+
+/* Define to 1 if you have the `usleep' function. */
+#undef HAVE_USLEEP
+
+/* Define to 1 if you have the <util.h> header file. */
+#undef HAVE_UTIL_H
+
+/* Define to 1 if you have the `utimensat' function. */
+#undef HAVE_UTIMENSAT
+
+/* Define to 1 if you have the `utimes' function. */
+#undef HAVE_UTIMES
+
+/* Define to 1 if you have the <utime.h> header file. */
+#undef HAVE_UTIME_H
+
+/* Define to 1 if you have the `utmpname' function. */
+#undef HAVE_UTMPNAME
+
+/* Define to 1 if you have the `utmpxname' function. */
+#undef HAVE_UTMPXNAME
+
+/* Define to 1 if you have the <utmpx.h> header file. */
+#undef HAVE_UTMPX_H
+
+/* Define to 1 if you have the <utmp.h> header file. */
+#undef HAVE_UTMP_H
+
+/* define if you have u_char data type */
+#undef HAVE_U_CHAR
+
+/* define if you have u_int data type */
+#undef HAVE_U_INT
+
+/* define if you have u_int64_t data type */
+#undef HAVE_U_INT64_T
+
+/* define if you have u_intxx_t data type */
+#undef HAVE_U_INTXX_T
+
+/* Define to 1 if you have the `vasprintf' function. */
+#undef HAVE_VASPRINTF
+
+/* Define if va_copy exists */
+#undef HAVE_VA_COPY
+
+/* Define to 1 if you have the <vis.h> header file. */
+#undef HAVE_VIS_H
+
+/* Define to 1 if you have the `vsnprintf' function. */
+#undef HAVE_VSNPRINTF
+
+/* Define to 1 if you have the `waitpid' function. */
+#undef HAVE_WAITPID
+
+/* Define to 1 if you have the `warn' function. */
+#undef HAVE_WARN
+
+/* Define to 1 if you have the <wchar.h> header file. */
+#undef HAVE_WCHAR_H
+
+/* Define to 1 if you have the `wcwidth' function. */
+#undef HAVE_WCWIDTH
+
+/* Define to 1 if you have the `_getlong' function. */
+#undef HAVE__GETLONG
+
+/* Define to 1 if you have the `_getpty' function. */
+#undef HAVE__GETPTY
+
+/* Define to 1 if you have the `_getshort' function. */
+#undef HAVE__GETSHORT
+
+/* Define if you have struct __res_state _res as an extern */
+#undef HAVE__RES_EXTERN
+
+/* Define to 1 if you have the `__b64_ntop' function. */
+#undef HAVE___B64_NTOP
+
+/* Define to 1 if you have the `__b64_pton' function. */
+#undef HAVE___B64_PTON
+
+/* Define if compiler implements __FUNCTION__ */
+#undef HAVE___FUNCTION__
+
+/* Define if libc defines __progname */
+#undef HAVE___PROGNAME
+
+/* Fields in struct sockaddr_storage */
+#undef HAVE___SS_FAMILY_IN_SS
+
+/* Define if __va_copy exists */
+#undef HAVE___VA_COPY
+
+/* Define if compiler implements __func__ */
+#undef HAVE___func__
+
+/* Define this if you are using the Heimdal version of Kerberos V5 */
+#undef HEIMDAL
+
+/* Define if you need to use IP address instead of hostname in $DISPLAY */
+#undef IPADDR_IN_DISPLAY
+
+/* Detect IPv4 in IPv6 mapped addresses and treat as IPv4 */
+#undef IPV4_IN_IPV6
+
+/* Define if your system choked on IP TOS setting */
+#undef IP_TOS_IS_BROKEN
+
+/* Define if you want Kerberos 5 support */
+#undef KRB5
+
+/* Define if pututxline updates lastlog too */
+#undef LASTLOG_WRITE_PUTUTXLINE
+
+/* Define to whatever link() returns for "not supported" if it doesn't return
+   EOPNOTSUPP. */
+#undef LINK_OPNOTSUPP_ERRNO
+
+/* Adjust Linux out-of-memory killer */
+#undef LINUX_OOM_ADJUST
+
+/* max value of long long calculated by configure */
+#undef LLONG_MAX
+
+/* min value of long long calculated by configure */
+#undef LLONG_MIN
+
+/* Account locked with pw(1) */
+#undef LOCKED_PASSWD_PREFIX
+
+/* String used in /etc/passwd to denote locked account */
+#undef LOCKED_PASSWD_STRING
+
+/* String used in /etc/passwd to denote locked account */
+#undef LOCKED_PASSWD_SUBSTR
+
+/* Some systems need a utmpx entry for /bin/login to work */
+#undef LOGIN_NEEDS_UTMPX
+
+/* Set this to your mail directory if you do not have _PATH_MAILDIR */
+#undef MAIL_DIRECTORY
+
+/* Need setpgrp to for controlling tty */
+#undef NEED_SETPGRP
+
+/* compiler does not accept __attribute__ on prototype args */
+#undef NO_ATTRIBUTE_ON_PROTOTYPE_ARGS
+
+/* compiler does not accept __attribute__ on return types */
+#undef NO_ATTRIBUTE_ON_RETURN_TYPE
+
+/* Define to disable UID restoration test */
+#undef NO_UID_RESTORATION_TEST
+
+/* Define if X11 doesn't support AF_UNIX sockets on that system */
+#undef NO_X11_UNIX_SOCKETS
+
+/* Define if EVP_DigestUpdate returns void */
+#undef OPENSSL_EVP_DIGESTUPDATE_VOID
+
+/* OpenSSL has ECC */
+#undef OPENSSL_HAS_ECC
+
+/* libcrypto has NID_X9_62_prime256v1 */
+#undef OPENSSL_HAS_NISTP256
+
+/* libcrypto has NID_secp384r1 */
+#undef OPENSSL_HAS_NISTP384
+
+/* libcrypto has NID_secp521r1 */
+#undef OPENSSL_HAS_NISTP521
+
+/* libcrypto has EVP AES CTR */
+#undef OPENSSL_HAVE_EVPCTR
+
+/* libcrypto has EVP AES GCM */
+#undef OPENSSL_HAVE_EVPGCM
+
+/* libcrypto is missing AES 192 and 256 bit functions */
+#undef OPENSSL_LOBOTOMISED_AES
+
+/* Define if you want the OpenSSL internally seeded PRNG only */
+#undef OPENSSL_PRNG_ONLY
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define if you are using Solaris-derived PAM which passes pam_messages to
+   the conversation function with an extra level of indirection */
+#undef PAM_SUN_CODEBASE
+
+/* Work around problematic Linux PAM modules handling of PAM_TTY */
+#undef PAM_TTY_KLUDGE
+
+/* must supply username to passwd */
+#undef PASSWD_NEEDS_USERNAME
+
+/* System dirs owned by bin (uid 2) */
+#undef PLATFORM_SYS_DIR_UID
+
+/* Port number of PRNGD/EGD random number socket */
+#undef PRNGD_PORT
+
+/* Location of PRNGD/EGD random number socket */
+#undef PRNGD_SOCKET
+
+/* read(1) can return 0 for a non-closed fd */
+#undef PTY_ZEROREAD
+
+/* Sandbox using capsicum */
+#undef SANDBOX_CAPSICUM
+
+/* Sandbox using Darwin sandbox_init(3) */
+#undef SANDBOX_DARWIN
+
+/* no privsep sandboxing */
+#undef SANDBOX_NULL
+
+/* Sandbox using pledge(2) */
+#undef SANDBOX_PLEDGE
+
+/* Sandbox using setrlimit(2) */
+#undef SANDBOX_RLIMIT
+
+/* Sandbox using seccomp filter */
+#undef SANDBOX_SECCOMP_FILTER
+
+/* setrlimit RLIMIT_FSIZE works */
+#undef SANDBOX_SKIP_RLIMIT_FSIZE
+
+/* define if setrlimit RLIMIT_NOFILE breaks things */
+#undef SANDBOX_SKIP_RLIMIT_NOFILE
+
+/* Sandbox using Solaris/Illumos privileges */
+#undef SANDBOX_SOLARIS
+
+/* Sandbox using systrace(4) */
+#undef SANDBOX_SYSTRACE
+
+/* Specify the system call convention in use */
+#undef SECCOMP_AUDIT_ARCH
+
+/* Define if your platform breaks doing a seteuid before a setuid */
+#undef SETEUID_BREAKS_SETUID
+
+/* The size of `int', as computed by sizeof. */
+#undef SIZEOF_INT
+
+/* The size of `long int', as computed by sizeof. */
+#undef SIZEOF_LONG_INT
+
+/* The size of `long long int', as computed by sizeof. */
+#undef SIZEOF_LONG_LONG_INT
+
+/* The size of `short int', as computed by sizeof. */
+#undef SIZEOF_SHORT_INT
+
+/* Define as const if snprintf() can declare const char *fmt */
+#undef SNPRINTF_CONST
+
+/* Define to a Set Process Title type if your system is supported by
+   bsd-setproctitle.c */
+#undef SPT_TYPE
+
+/* Define if sshd somehow reacquires a controlling TTY after setsid() */
+#undef SSHD_ACQUIRES_CTTY
+
+/* sshd PAM service name */
+#undef SSHD_PAM_SERVICE
+
+/* Define if pam_chauthtok wants real uid set to the unpriv'ed user */
+#undef SSHPAM_CHAUTHTOK_NEEDS_RUID
+
+/* Use audit debugging module */
+#undef SSH_AUDIT_EVENTS
+
+/* Windows is sensitive to read buffer size */
+#undef SSH_IOBUFSZ
+
+/* non-privileged user for privilege separation */
+#undef SSH_PRIVSEP_USER
+
+/* Use tunnel device compatibility to OpenBSD */
+#undef SSH_TUN_COMPAT_AF
+
+/* Open tunnel devices the FreeBSD way */
+#undef SSH_TUN_FREEBSD
+
+/* Open tunnel devices the Linux tun/tap way */
+#undef SSH_TUN_LINUX
+
+/* No layer 2 tunnel support */
+#undef SSH_TUN_NO_L2
+
+/* Open tunnel devices the OpenBSD way */
+#undef SSH_TUN_OPENBSD
+
+/* Prepend the address family to IP tunnel traffic */
+#undef SSH_TUN_PREPEND_AF
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define if you want a different $PATH for the superuser */
+#undef SUPERUSER_PATH
+
+/* syslog_r function is safe to use in in a signal handler */
+#undef SYSLOG_R_SAFE_IN_SIGHAND
+
+/* Support routing domains using Linux VRF */
+#undef SYS_RDOMAIN_LINUX
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#undef TIME_WITH_SYS_TIME
+
+/* Support passwords > 8 chars */
+#undef UNIXWARE_LONG_PASSWORDS
+
+/* Specify default $PATH */
+#undef USER_PATH
+
+/* Define this if you want to use libkafs' AFS support */
+#undef USE_AFS
+
+/* Use BSM audit module */
+#undef USE_BSM_AUDIT
+
+/* Use btmp to log bad logins */
+#undef USE_BTMP
+
+/* Use libedit for sftp */
+#undef USE_LIBEDIT
+
+/* Use Linux audit module */
+#undef USE_LINUX_AUDIT
+
+/* Enable OpenSSL engine support */
+#undef USE_OPENSSL_ENGINE
+
+/* Define if you want to enable PAM support */
+#undef USE_PAM
+
+/* Use PIPES instead of a socketpair() */
+#undef USE_PIPES
+
+/* Define if you have Solaris privileges */
+#undef USE_SOLARIS_PRIVS
+
+/* Define if you have Solaris process contracts */
+#undef USE_SOLARIS_PROCESS_CONTRACTS
+
+/* Define if you have Solaris projects */
+#undef USE_SOLARIS_PROJECTS
+
+/* Define if you shouldn't strip 'tty' from your ttyname in [uw]tmp */
+#undef WITH_ABBREV_NO_TTY
+
+/* Define if you want to enable AIX4's authenticate function */
+#undef WITH_AIXAUTHENTICATE
+
+/* Define if you have/want arrays (cluster-wide session management, not C
+   arrays) */
+#undef WITH_IRIX_ARRAY
+
+/* Define if you want IRIX audit trails */
+#undef WITH_IRIX_AUDIT
+
+/* Define if you want IRIX kernel jobs */
+#undef WITH_IRIX_JOBS
+
+/* Define if you want IRIX project management */
+#undef WITH_IRIX_PROJECT
+
+/* use libcrypto for cryptography */
+#undef WITH_OPENSSL
+
+/* Define if you want SELinux support. */
+#undef WITH_SELINUX
+
+/* Enable zlib */
+#undef WITH_ZLIB
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
+
+/* Define if xauth is found in your path */
+#undef XAUTH_PATH
+
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* log for bad login attempts */
+#undef _PATH_BTMP
+
+/* Full path of your "passwd" program */
+#undef _PATH_PASSWD_PROG
+
+/* Specify location of ssh.pid */
+#undef _PATH_SSH_PIDDIR
+
+/* Define if we don't have struct __res_state in resolv.h */
+#undef __res_state
+
+/* Define to rpl_calloc if the replacement function should be used. */
+#undef calloc
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+#undef inline
+#endif
+
+/* Define to rpl_malloc if the replacement function should be used. */
+#undef malloc
+
+/* Define to rpl_realloc if the replacement function should be used. */
+#undef realloc
+
+/* type to use in place of socklen_t if not defined */
+#undef socklen_t
diff --git a/configure b/configure
new file mode 100755
index 000000000..09db0a335
--- /dev/null
+++ b/configure
@@ -0,0 +1,21326 @@
+#! /bin/sh
+# From configure.ac Revision: 1.583 .
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.69 for OpenSSH Portable.
+#
+# Report bugs to <openssh-unix-dev@mindrot.org>.
+#
+#
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+#
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+        expr "X$arg" : "X\\(.*\\)$as_nl";
+        arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""        $as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  as_found=:
+  case $as_dir in #(
+         /*)
+           for as_base in sh bash ksh sh5; do
+             # Try only shells that exist, to save several forks.
+             as_shell=$as_dir/$as_base
+             if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+                    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+                   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
+           done;;
+       esac
+  as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+              { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+      if test "x$CONFIG_SHELL" != x; then :
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and
+$0: openssh-unix-dev@mindrot.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+  fi
+  exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$as_dir" : 'X\(//\)[^/]' \| \
+         X"$as_dir" : 'X\(//\)$' \| \
+         X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+            s//\1/
+            q
+          }
+          /^X\(\/\/\)[^/].*/{
+            s//\1/
+            q
+          }
+          /^X\(\/\/\)$/{
+            s//\1/
+            q
+          }
+          /^X\(\/\).*/{
+            s//\1/
+            q
+          }
+          s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+         X"$0" : 'X\(//\)$' \| \
+         X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+            s//\1/
+            q
+          }
+          /^X\/\(\/\/\)$/{
+            s//\1/
+            q
+          }
+          /^X\/\(\/\).*/{
+            s//\1/
+            q
+          }
+          s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T=' ';;     # ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T=' ';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+
+# Identity of this package.
+PACKAGE_NAME='OpenSSH'
+PACKAGE_TARNAME='openssh'
+PACKAGE_VERSION='Portable'
+PACKAGE_STRING='OpenSSH Portable'
+PACKAGE_BUGREPORT='openssh-unix-dev@mindrot.org'
+PACKAGE_URL=''
+
+ac_unique_file="ssh.c"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subst_vars='LTLIBOBJS
+CFLAGS_NOPIE
+LDFLAGS_NOPIE
+DEPEND
+UNSUPPORTED_ALGORITHMS
+TEST_MALLOC_OPTIONS
+TEST_SSH_UTF8
+TEST_SSH_IPV6
+piddir
+user_path
+mansubdir
+MANTYPE
+XAUTH_PATH
+STRIP_OPT
+xauth_path
+PRIVSEP_PATH
+K5LIBS
+GSSLIBS
+KRB5CONF
+SSHDLIBS
+SSHLIBS
+SSH_PRIVSEP_USER
+LIBFIDO2
+COMMENT_OUT_ECC
+TEST_SSH_ECC
+PICFLAG
+LIBEDIT
+PKGCONFIG
+LDNSCONFIG
+LIBOBJS
+LD
+PATH_PASSWD_PROG
+STARTUP_SCRIPT_SHELL
+MAKE_PACKAGE_SUPPORTED
+PATH_USERADD_PROG
+PATH_GROUPADD_PROG
+MANFMT
+TEST_SHELL
+MANDOC
+NROFF
+GROFF
+SH
+TEST_MINUS_S_SH
+ENT
+SED
+KILL
+CAT
+ac_ct_AR
+AR
+MKDIR_P
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+RANLIB
+AWK
+EGREP
+GREP
+CPP
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_largefile
+with_openssl
+with_stackprotect
+with_hardening
+with_rpath
+with_cflags
+with_cflags_after
+with_cppflags
+with_ldflags
+with_ldflags_after
+with_libs
+with_Werror
+with_solaris_contracts
+with_solaris_projects
+with_solaris_privs
+with_osfsia
+with_zlib
+with_zlib_version_check
+with_ldns
+with_libedit
+with_audit
+with_pie
+enable_pkcs11
+enable_security_key
+with_security_key_builtin
+with_ssl_dir
+with_openssl_header_check
+with_ssl_engine
+with_prngd_port
+with_prngd_socket
+with_pam
+with_pam_service
+with_privsep_user
+with_sandbox
+with_selinux
+with_kerberos5
+with_privsep_path
+with_xauth
+enable_strip
+with_maildir
+with_mantype
+with_md5_passwords
+with_shadow
+with_ipaddr_display
+enable_etc_default_login
+with_default_path
+with_superuser_path
+with_4in6
+with_bsd_auth
+with_pid_dir
+enable_lastlog
+enable_utmp
+enable_utmpx
+enable_wtmp
+enable_wtmpx
+enable_libutil
+enable_pututline
+enable_pututxline
+with_lastlog
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+         ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+         ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+         ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+         ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  as_fn_error $? "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in   exec_prefix prefix bindir sbindir libexecdir datarootdir \
+                datadir sysconfdir sharedstatedir localstatedir includedir \
+                oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+                libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error $? "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error $? "pwd does not report name of working directory"
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$as_myself" : 'X\(//\)[^/]' \| \
+         X"$as_myself" : 'X\(//\)$' \| \
+         X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+            s//\1/
+            q
+          }
+          /^X\(\/\/\)[^/].*/{
+            s//\1/
+            q
+          }
+          /^X\(\/\/\)$/{
+            s//\1/
+            q
+          }
+          /^X\(\/\).*/{
+            s//\1/
+            q
+          }
+          s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+        cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+        pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures OpenSSH Portable to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking ...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/openssh]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of OpenSSH Portable:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-largefile     omit support for large files
+  --disable-pkcs11        disable PKCS#11 support code [no]
+  --disable-security-key  disable U2F/FIDO support code no
+  --disable-strip         Disable calling strip(1) on install
+  --disable-etc-default-login Disable using PATH from /etc/default/login no
+  --disable-lastlog       disable use of lastlog even if detected no
+  --disable-utmp          disable use of utmp even if detected no
+  --disable-utmpx         disable use of utmpx even if detected no
+  --disable-wtmp          disable use of wtmp even if detected no
+  --disable-wtmpx         disable use of wtmpx even if detected no
+  --disable-libutil       disable use of libutil (login() etc.) no
+  --disable-pututline     disable use of pututline() etc. (uwtmp) no
+  --disable-pututxline    disable use of pututxline() etc. (uwtmpx) no
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-openssl       Disable use of OpenSSL; use only limited internal crypto **EXPERIMENTAL**
+  --without-stackprotect  Don't use compiler's stack protection
+  --without-hardening     Don't use toolchain hardening flags
+  --without-rpath         Disable auto-added -R linker paths
+  --with-cflags           Specify additional flags to pass to compiler
+  --with-cflags-after     Specify additional flags to pass to compiler after configure
+  --with-cppflags         Specify additional flags to pass to preprocessor
+  --with-ldflags          Specify additional flags to pass to linker
+  --with-ldflags-after    Specify additional flags to pass to linker after configure
+  --with-libs             Specify additional libraries to link with
+  --with-Werror           Build main code with -Werror
+  --with-solaris-contracts Enable Solaris process contracts (experimental)
+  --with-solaris-projects Enable Solaris projects (experimental)
+  --with-solaris-privs    Enable Solaris/Illumos privileges (experimental)
+  --with-osfsia           Enable Digital Unix SIA
+  --with-zlib=PATH        Use zlib in PATH
+  --without-zlib-version-check Disable zlib version check
+  --with-ldns[=PATH]      Use ldns for DNSSEC support (optionally in PATH)
+  --with-libedit[=PATH]   Enable libedit support for sftp
+  --with-audit=module     Enable audit support (modules=debug,bsm,linux)
+  --with-pie              Build Position Independent Executables if possible
+  --with-security-key-builtin include builtin U2F/FIDO support
+  --with-ssl-dir=PATH     Specify path to OpenSSL installation
+  --without-openssl-header-check Disable OpenSSL version consistency check
+  --with-ssl-engine       Enable OpenSSL (hardware) ENGINE support
+  --with-prngd-port=PORT  read entropy from PRNGD/EGD TCP localhost:PORT
+  --with-prngd-socket=FILE read entropy from PRNGD/EGD socket FILE (default=/var/run/egd-pool)
+  --with-pam              Enable PAM support
+  --with-pam-service=name Specify PAM service name
+  --with-privsep-user=user Specify non-privileged user for privilege separation
+  --with-sandbox=style    Specify privilege separation sandbox (no, capsicum, darwin, rlimit, seccomp_filter, systrace, pledge)
+  --with-selinux          Enable SELinux support
+  --with-kerberos5=PATH   Enable Kerberos 5 support
+  --with-privsep-path=xxx Path for privilege separation chroot (default=/var/empty)
+  --with-xauth=PATH       Specify path to xauth program
+  --with-maildir=/path/to/mail    Specify your system mail directory
+  --with-mantype=man|cat|doc  Set man page type
+  --with-md5-passwords    Enable use of MD5 passwords
+  --without-shadow        Disable shadow password support
+  --with-ipaddr-display   Use ip address instead of hostname in $DISPLAY
+  --with-default-path=    Specify default $PATH environment for server
+  --with-superuser-path=  Specify different path for super-user
+  --with-4in6             Check for and convert IPv4 in IPv6 mapped addresses
+  --with-bsd-auth         Enable BSD auth support
+  --with-pid-dir=PATH     Specify location of sshd.pid file
+  --with-lastlog=FILE|DIR specify lastlog location common locations
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to <openssh-unix-dev@mindrot.org>.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+OpenSSH configure Portable
+generated by GNU Autoconf 2.69
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+         test -z "$ac_c_werror_flag" ||
+         test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+        ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+         test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+         test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_decl
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+         test -z "$ac_c_werror_flag" ||
+         test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+         test "$cross_compiling" = yes ||
+         test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+        ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval \${$3+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## ------------------------------------------- ##
+## Report this to openssh-unix-dev@mindrot.org ##
+## ------------------------------------------- ##"
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+         return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+            return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_type
+
+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
+# --------------------------------------------
+# Tries to find the compile-time value of EXPR in a program that includes
+# INCLUDES, setting VAR accordingly. Returns whether the value could be
+# computed
+ac_fn_c_compute_int ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if test "$cross_compiling" = yes; then
+    # Depending upon the size, compute the lo and hi bounds.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= 0)];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid; break
+else
+  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+                        if test $ac_lo -le $ac_mid; then
+                          ac_lo= ac_hi=
+                          break
+                        fi
+                        as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) < 0)];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= $ac_mid)];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=$ac_mid; break
+else
+  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+                        if test $ac_mid -le $ac_hi; then
+                          ac_lo= ac_hi=
+                          break
+                        fi
+                        as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  ac_lo= ac_hi=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid
+else
+  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in #((
+?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
+'') ac_retval=1 ;;
+esac
+  else
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+static long int longval () { return $2; }
+static unsigned long int ulongval () { return $2; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (($2) < 0)
+    {
+      long int i = longval ();
+      if (i != ($2))
+        return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ($2))
+        return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+else
+  ac_retval=1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f conftest.val
+
+  fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_compute_int
+
+# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
+# ----------------------------------------------------
+# Tries to find if the field MEMBER exists in type AGGR, after including
+# INCLUDES, setting cache variable VAR accordingly.
+ac_fn_c_check_member ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+$as_echo_n "checking for $2.$3... " >&6; }
+if eval \${$4+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$4=yes"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (sizeof ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$4=yes"
+else
+  eval "$4=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$4
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_member
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by OpenSSH $as_me Portable, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    2)
+      as_fn_append ac_configure_args1 " '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+        ac_must_keep_next=false # Got value, back to normal.
+      else
+        case $ac_arg in
+          *=* | --config-cache | -C | -disable-* | --disable-* \
+          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+          | -with-* | --with-* | -without-* | --without-* | --x)
+            case "$ac_configure_args0 " in
+              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+            esac
+            ;;
+          -* ) ac_must_keep_next=true ;;
+        esac
+      fi
+      as_fn_append ac_configure_args " '$ac_arg'"
+      ;;
+    esac
+  done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    $as_echo "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+        "s/'\''/'\''\\\\'\'''\''/g;
+          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    $as_echo "## ----------------- ##
+## Output variables. ##
+## ----------------- ##"
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      $as_echo "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
+      echo
+      for ac_var in $ac_subst_files
+      do
+        eval ac_val=\$$ac_var
+        case $ac_val in
+        *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+        esac
+        $as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      $as_echo "## ----------- ##
+## confdefs.h. ##
+## ----------- ##"
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+        # differences in whitespace do not lead to failure.
+        ac_old_val_w=`echo x $ac_old_val`
+        ac_new_val_w=`echo x $ac_new_val`
+        if test "$ac_old_val_w" != "$ac_new_val_w"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+          ac_cache_corrupted=:
+        else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+          eval $ac_var=\$ac_old_val
+        fi
+        { $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ac_config_headers="$ac_config_headers config.h"
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in cc gcc
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cc gcc
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+        ;;
+    [ab].out )
+        # We found the default executable, but exeext='' is most
+        # certainly right.
+        break;;
+    *.* )
+        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+        then :; else
+           ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+        fi
+        # We set ac_cv_exeext here because the later test for it is not
+        # safe: cross compilers may not add the suffix if given an `-o'
+        # argument, so we may need to know it at that point already.
+        # Even if this section looks crufty: it has the advantage of
+        # actually working.
+        break;;
+    * )
+        break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+  ac_file=''
+fi
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+          break;;
+    * ) break;;
+  esac
+done
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+        cross_compiling=yes
+    else
+        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+         CFLAGS="-g"
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+        -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+                   (('a' <= (c) && (c) <= 'i') \
+                     || ('j' <= (c) && (c) <= 'r') \
+                     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+        || toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+                  inttypes.h stdint.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if ${ac_cv_c_bigendian+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+               not a universal capable compiler
+             #endif
+             typedef int dummy;
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+        # Check for potential -arch flags.  It is not universal unless
+        # there are at least two -arch flags with different values.
+        ac_arch=
+        ac_prev=
+        for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+         if test -n "$ac_prev"; then
+           case $ac_word in
+             i?86 | x86_64 | ppc | ppc64)
+               if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+                 ac_arch=$ac_word
+               else
+                 ac_cv_c_bigendian=universal
+                 break
+               fi
+               ;;
+           esac
+           ac_prev=
+         elif test "x$ac_word" = "x-arch"; then
+           ac_prev=arch
+         fi
+       done
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+             #include <sys/param.h>
+
+int
+main ()
+{
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+                     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+                     && LITTLE_ENDIAN)
+              bogus endian macros
+             #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+                #include <sys/param.h>
+
+int
+main ()
+{
+#if BYTE_ORDER != BIG_ENDIAN
+                 not big endian
+                #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+              bogus endian macros
+             #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#ifndef _BIG_ENDIAN
+                 not big endian
+                #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then :
+  # Try to guess by grepping values from an object file.
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+short int ascii_mm[] =
+                  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+                short int ascii_ii[] =
+                  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+                int use_ascii (int i) {
+                  return ascii_mm[i] + ascii_ii[i];
+                }
+                short int ebcdic_ii[] =
+                  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+                short int ebcdic_mm[] =
+                  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+                int use_ebcdic (int i) {
+                  return ebcdic_mm[i] + ebcdic_ii[i];
+                }
+                extern int foo;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+              ac_cv_c_bigendian=yes
+            fi
+            if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+              if test "$ac_cv_c_bigendian" = unknown; then
+                ac_cv_c_bigendian=no
+              else
+                # finding both strings is unlikely to happen, but who knows?
+                ac_cv_c_bigendian=unknown
+              fi
+            fi
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+             /* Are we little or big endian?  From Harbison&Steele.  */
+             union
+             {
+               long int l;
+               char c[sizeof (long int)];
+             } u;
+             u.l = 1;
+             return u.c[sizeof (long int) - 1] == 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_c_bigendian=no
+else
+  ac_cv_c_bigendian=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+;; #(
+   no)
+      ;; #(
+   universal)
+
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+
+     ;; #(
+   *)
+     as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
+
+
+# Checks for programs.
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AWK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if ${ac_cv_path_install+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+          if test $ac_prog = install &&
+            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+            # AIX install.  It has an incompatible calling convention.
+            :
+          elif test $ac_prog = install &&
+            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+            # program-specific install script used by HP pwplus--don't use.
+            :
+          else
+            rm -rf conftest.one conftest.two conftest.dir
+            echo one > conftest.one
+            echo two > conftest.two
+            mkdir conftest.dir
+            if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+              test -s conftest.one && test -s conftest.two &&
+              test -s conftest.dir/conftest.one &&
+              test -s conftest.dir/conftest.two
+            then
+              ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+              break 3
+            fi
+          fi
+        fi
+      done
+    done
+    ;;
+esac
+
+  done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if ${ac_cv_path_mkdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in mkdir gmkdir; do
+         for ac_exec_ext in '' $ac_executable_extensions; do
+           as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+           case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+             'mkdir (GNU coreutils) '* | \
+             'mkdir (coreutils) '* | \
+             'mkdir (fileutils) '4.1*)
+               ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+               break 3;;
+           esac
+         done
+       done
+  done
+IFS=$as_save_IFS
+
+fi
+
+  test -d ./--version && rmdir ./--version
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$AR" && break
+  done
+fi
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+fi
+
+# Extract the first word of "cat", so it can be a program name with args.
+set dummy cat; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_CAT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $CAT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_CAT="$CAT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_CAT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+CAT=$ac_cv_path_CAT
+if test -n "$CAT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CAT" >&5
+$as_echo "$CAT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "kill", so it can be a program name with args.
+set dummy kill; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_KILL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $KILL in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_KILL="$KILL" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_KILL="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+KILL=$ac_cv_path_KILL
+if test -n "$KILL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KILL" >&5
+$as_echo "$KILL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "sed", so it can be a program name with args.
+set dummy sed; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $SED in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_SED="$SED" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+SED=$ac_cv_path_SED
+if test -n "$SED"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
+$as_echo "$SED" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "ent", so it can be a program name with args.
+set dummy ent; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ENT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ENT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ENT="$ENT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ENT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ENT=$ac_cv_path_ENT
+if test -n "$ENT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENT" >&5
+$as_echo "$ENT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+# Extract the first word of "bash", so it can be a program name with args.
+set dummy bash; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_TEST_MINUS_S_SH+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $TEST_MINUS_S_SH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_TEST_MINUS_S_SH="$TEST_MINUS_S_SH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_TEST_MINUS_S_SH="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+TEST_MINUS_S_SH=$ac_cv_path_TEST_MINUS_S_SH
+if test -n "$TEST_MINUS_S_SH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEST_MINUS_S_SH" >&5
+$as_echo "$TEST_MINUS_S_SH" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "ksh", so it can be a program name with args.
+set dummy ksh; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_TEST_MINUS_S_SH+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $TEST_MINUS_S_SH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_TEST_MINUS_S_SH="$TEST_MINUS_S_SH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_TEST_MINUS_S_SH="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+TEST_MINUS_S_SH=$ac_cv_path_TEST_MINUS_S_SH
+if test -n "$TEST_MINUS_S_SH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEST_MINUS_S_SH" >&5
+$as_echo "$TEST_MINUS_S_SH" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "sh", so it can be a program name with args.
+set dummy sh; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_TEST_MINUS_S_SH+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $TEST_MINUS_S_SH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_TEST_MINUS_S_SH="$TEST_MINUS_S_SH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_TEST_MINUS_S_SH="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+TEST_MINUS_S_SH=$ac_cv_path_TEST_MINUS_S_SH
+if test -n "$TEST_MINUS_S_SH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEST_MINUS_S_SH" >&5
+$as_echo "$TEST_MINUS_S_SH" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "sh", so it can be a program name with args.
+set dummy sh; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_SH+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $SH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_SH="$SH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_SH="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+SH=$ac_cv_path_SH
+if test -n "$SH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SH" >&5
+$as_echo "$SH" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "groff", so it can be a program name with args.
+set dummy groff; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GROFF+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GROFF in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GROFF="$GROFF" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_GROFF="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+GROFF=$ac_cv_path_GROFF
+if test -n "$GROFF"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GROFF" >&5
+$as_echo "$GROFF" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "nroff awf", so it can be a program name with args.
+set dummy nroff awf; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_NROFF+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $NROFF in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_NROFF="$NROFF" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_NROFF="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+NROFF=$ac_cv_path_NROFF
+if test -n "$NROFF"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NROFF" >&5
+$as_echo "$NROFF" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "mandoc", so it can be a program name with args.
+set dummy mandoc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MANDOC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MANDOC in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_MANDOC="$MANDOC" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_MANDOC="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+MANDOC=$ac_cv_path_MANDOC
+if test -n "$MANDOC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANDOC" >&5
+$as_echo "$MANDOC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+TEST_SHELL=sh
+
+
+if test "x$MANDOC" != "x" ; then
+        MANFMT="$MANDOC"
+elif test "x$NROFF" != "x" ; then
+        MANFMT="$NROFF -mandoc"
+elif test "x$GROFF" != "x" ; then
+        MANFMT="$GROFF -mandoc -Tascii"
+else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no manpage formatter found" >&5
+$as_echo "$as_me: WARNING: no manpage formatter found" >&2;}
+        MANFMT="false"
+fi
+
+
+# Extract the first word of "groupadd", so it can be a program name with args.
+set dummy groupadd; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PATH_GROUPADD_PROG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PATH_GROUPADD_PROG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PATH_GROUPADD_PROG="$PATH_GROUPADD_PROG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /usr/sbin${PATH_SEPARATOR}/etc
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PATH_GROUPADD_PROG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_PATH_GROUPADD_PROG" && ac_cv_path_PATH_GROUPADD_PROG="groupadd"
+  ;;
+esac
+fi
+PATH_GROUPADD_PROG=$ac_cv_path_PATH_GROUPADD_PROG
+if test -n "$PATH_GROUPADD_PROG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_GROUPADD_PROG" >&5
+$as_echo "$PATH_GROUPADD_PROG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "useradd", so it can be a program name with args.
+set dummy useradd; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PATH_USERADD_PROG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PATH_USERADD_PROG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PATH_USERADD_PROG="$PATH_USERADD_PROG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /usr/sbin${PATH_SEPARATOR}/etc
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PATH_USERADD_PROG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_PATH_USERADD_PROG" && ac_cv_path_PATH_USERADD_PROG="useradd"
+  ;;
+esac
+fi
+PATH_USERADD_PROG=$ac_cv_path_PATH_USERADD_PROG
+if test -n "$PATH_USERADD_PROG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_USERADD_PROG" >&5
+$as_echo "$PATH_USERADD_PROG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "pkgmk", so it can be a program name with args.
+set dummy pkgmk; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MAKE_PACKAGE_SUPPORTED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MAKE_PACKAGE_SUPPORTED"; then
+  ac_cv_prog_MAKE_PACKAGE_SUPPORTED="$MAKE_PACKAGE_SUPPORTED" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_MAKE_PACKAGE_SUPPORTED="yes"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_MAKE_PACKAGE_SUPPORTED" && ac_cv_prog_MAKE_PACKAGE_SUPPORTED="no"
+fi
+fi
+MAKE_PACKAGE_SUPPORTED=$ac_cv_prog_MAKE_PACKAGE_SUPPORTED
+if test -n "$MAKE_PACKAGE_SUPPORTED"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_PACKAGE_SUPPORTED" >&5
+$as_echo "$MAKE_PACKAGE_SUPPORTED" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test -x /sbin/sh; then
+        STARTUP_SCRIPT_SHELL=/sbin/sh
+
+else
+        STARTUP_SCRIPT_SHELL=/bin/sh
+
+fi
+
+# System features
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then :
+  enableval=$enable_largefile;
+fi
+
+if test "$enable_largefile" != no; then
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+if ${ac_cv_sys_largefile_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_sys_largefile_CC=no
+     if test "$GCC" != yes; then
+       ac_save_CC=$CC
+       while :; do
+         # IRIX 6.2 and later do not support large files by default,
+         # so use the C compiler's -n32 option if that helps.
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+                       && LARGE_OFF_T % 2147483647 == 1)
+                      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+         if ac_fn_c_try_compile "$LINENO"; then :
+  break
+fi
+rm -f core conftest.err conftest.$ac_objext
+         CC="$CC -n32"
+         if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_largefile_CC=' -n32'; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+         break
+       done
+       CC=$ac_save_CC
+       rm -f conftest.$ac_ext
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+  if test "$ac_cv_sys_largefile_CC" != no; then
+    CC=$CC$ac_cv_sys_largefile_CC
+  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if ${ac_cv_sys_file_offset_bits+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+                       && LARGE_OFF_T % 2147483647 == 1)
+                      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+                       && LARGE_OFF_T % 2147483647 == 1)
+                      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=64; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_file_offset_bits=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  if test $ac_cv_sys_file_offset_bits = unknown; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+if ${ac_cv_sys_large_files+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+                       && LARGE_OFF_T % 2147483647 == 1)
+                      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+                       && LARGE_OFF_T % 2147483647 == 1)
+                      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=1; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_large_files=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  fi
+
+
+fi
+
+
+if test -z "$AR" ; then
+        as_fn_error $? "*** 'ar' missing, please install or fix your \$PATH ***" "$LINENO" 5
+fi
+
+# Extract the first word of "passwd", so it can be a program name with args.
+set dummy passwd; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PATH_PASSWD_PROG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PATH_PASSWD_PROG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PATH_PASSWD_PROG="$PATH_PASSWD_PROG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PATH_PASSWD_PROG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PATH_PASSWD_PROG=$ac_cv_path_PATH_PASSWD_PROG
+if test -n "$PATH_PASSWD_PROG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_PASSWD_PROG" >&5
+$as_echo "$PATH_PASSWD_PROG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test ! -z "$PATH_PASSWD_PROG" ; then
+
+cat >>confdefs.h <<_ACEOF
+#define _PATH_PASSWD_PROG "$PATH_PASSWD_PROG"
+_ACEOF
+
+fi
+
+LD="$CC"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if ${ac_cv_c_inline+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_inline=no
+for ac_kw in inline __inline__ __inline; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __cplusplus
+typedef int foo_t;
+static $ac_kw foo_t static_foo () {return 0; }
+$ac_kw foo_t foo () {return 0; }
+#endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_inline=$ac_kw
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  test "$ac_cv_c_inline" != no && break
+done
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
+
+case $ac_cv_c_inline in
+  inline | yes) ;;
+  *)
+    case $ac_cv_c_inline in
+      no) ac_val=;;
+      *) ac_val=$ac_cv_c_inline;;
+    esac
+    cat >>confdefs.h <<_ACEOF
+#ifndef __cplusplus
+#define inline $ac_val
+#endif
+_ACEOF
+    ;;
+esac
+
+
+ac_fn_c_check_decl "$LINENO" "LLONG_MAX" "ac_cv_have_decl_LLONG_MAX" "#include <limits.h>
+"
+if test "x$ac_cv_have_decl_LLONG_MAX" = xyes; then :
+  have_llong_max=1
+fi
+
+ac_fn_c_check_decl "$LINENO" "SYSTR_POLICY_KILL" "ac_cv_have_decl_SYSTR_POLICY_KILL" "
+        #include <sys/types.h>
+        #include <sys/param.h>
+        #include <dev/systrace.h>
+
+"
+if test "x$ac_cv_have_decl_SYSTR_POLICY_KILL" = xyes; then :
+  have_systr_policy_kill=1
+fi
+
+ac_fn_c_check_decl "$LINENO" "RLIMIT_NPROC" "ac_cv_have_decl_RLIMIT_NPROC" "
+        #include <sys/types.h>
+        #include <sys/resource.h>
+
+"
+if test "x$ac_cv_have_decl_RLIMIT_NPROC" = xyes; then :
+
+$as_echo "#define HAVE_RLIMIT_NPROC /**/" >>confdefs.h
+
+fi
+
+ac_fn_c_check_decl "$LINENO" "PR_SET_NO_NEW_PRIVS" "ac_cv_have_decl_PR_SET_NO_NEW_PRIVS" "
+        #include <sys/types.h>
+        #include <linux/prctl.h>
+
+"
+if test "x$ac_cv_have_decl_PR_SET_NO_NEW_PRIVS" = xyes; then :
+  have_linux_no_new_privs=1
+fi
+
+
+openssl=yes
+
+# Check whether --with-openssl was given.
+if test "${with_openssl+set}" = set; then :
+  withval=$with_openssl;   if test "x$withval" = "xno" ; then
+                openssl=no
+           fi
+
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OpenSSL will be used for cryptography" >&5
+$as_echo_n "checking whether OpenSSL will be used for cryptography... " >&6; }
+if test "x$openssl" = "xyes" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define WITH_OPENSSL 1
+_ACEOF
+
+else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+use_stack_protector=1
+use_toolchain_hardening=1
+
+# Check whether --with-stackprotect was given.
+if test "${with_stackprotect+set}" = set; then :
+  withval=$with_stackprotect;
+    if test "x$withval" = "xno"; then
+        use_stack_protector=0
+    fi
+fi
+
+
+# Check whether --with-hardening was given.
+if test "${with_hardening+set}" = set; then :
+  withval=$with_hardening;
+    if test "x$withval" = "xno"; then
+        use_toolchain_hardening=0
+    fi
+fi
+
+
+# We use -Werror for the tests only so that we catch warnings like "this is
+# on by default" for things like -fPIE.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror" >&5
+$as_echo_n "checking if $CC supports -Werror... " >&6; }
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Werror"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int main(void) { return 0; }
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+          WERROR="-Werror"
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+          WERROR=""
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+CFLAGS="$saved_CFLAGS"
+
+if test "$GCC" = "yes" || test "$GCC" = "egcs"; then
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -pipe" >&5
+$as_echo_n "checking if $CC supports compile flag -pipe... " >&6; }
+        saved_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $WERROR -pipe"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-pipe"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                CFLAGS="$saved_CFLAGS"
+else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                 CFLAGS="$saved_CFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  CFLAGS="$saved_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+}
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wunknown-warning-option" >&5
+$as_echo_n "checking if $CC supports compile flag -Wunknown-warning-option... " >&6; }
+        saved_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $WERROR -Wunknown-warning-option"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-Wunknown-warning-option"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                CFLAGS="$saved_CFLAGS"
+else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                 CFLAGS="$saved_CFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  CFLAGS="$saved_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+}
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wno-error=format-truncation" >&5
+$as_echo_n "checking if $CC supports compile flag -Wno-error=format-truncation... " >&6; }
+        saved_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $WERROR -Wno-error=format-truncation"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-Wno-error=format-truncation"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                CFLAGS="$saved_CFLAGS"
+else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                 CFLAGS="$saved_CFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  CFLAGS="$saved_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+}
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Qunused-arguments" >&5
+$as_echo_n "checking if $CC supports compile flag -Qunused-arguments... " >&6; }
+        saved_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $WERROR -Qunused-arguments"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-Qunused-arguments"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                CFLAGS="$saved_CFLAGS"
+else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                 CFLAGS="$saved_CFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  CFLAGS="$saved_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+}
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wall" >&5
+$as_echo_n "checking if $CC supports compile flag -Wall... " >&6; }
+        saved_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $WERROR -Wall"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-Wall"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                CFLAGS="$saved_CFLAGS"
+else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                 CFLAGS="$saved_CFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  CFLAGS="$saved_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+}
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wextra" >&5
+$as_echo_n "checking if $CC supports compile flag -Wextra... " >&6; }
+        saved_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $WERROR -Wextra"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-Wextra"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                CFLAGS="$saved_CFLAGS"
+else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                 CFLAGS="$saved_CFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  CFLAGS="$saved_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+}
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wpointer-arith" >&5
+$as_echo_n "checking if $CC supports compile flag -Wpointer-arith... " >&6; }
+        saved_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $WERROR -Wpointer-arith"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-Wpointer-arith"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                CFLAGS="$saved_CFLAGS"
+else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                 CFLAGS="$saved_CFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  CFLAGS="$saved_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+}
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wuninitialized" >&5
+$as_echo_n "checking if $CC supports compile flag -Wuninitialized... " >&6; }
+        saved_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $WERROR -Wuninitialized"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-Wuninitialized"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                CFLAGS="$saved_CFLAGS"
+else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                 CFLAGS="$saved_CFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  CFLAGS="$saved_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+}
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wsign-compare" >&5
+$as_echo_n "checking if $CC supports compile flag -Wsign-compare... " >&6; }
+        saved_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $WERROR -Wsign-compare"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-Wsign-compare"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                CFLAGS="$saved_CFLAGS"
+else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                 CFLAGS="$saved_CFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  CFLAGS="$saved_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+}
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wformat-security" >&5
+$as_echo_n "checking if $CC supports compile flag -Wformat-security... " >&6; }
+        saved_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $WERROR -Wformat-security"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-Wformat-security"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                CFLAGS="$saved_CFLAGS"
+else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                 CFLAGS="$saved_CFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  CFLAGS="$saved_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+}
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wsizeof-pointer-memaccess" >&5
+$as_echo_n "checking if $CC supports compile flag -Wsizeof-pointer-memaccess... " >&6; }
+        saved_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $WERROR -Wsizeof-pointer-memaccess"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-Wsizeof-pointer-memaccess"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                CFLAGS="$saved_CFLAGS"
+else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                 CFLAGS="$saved_CFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  CFLAGS="$saved_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+}
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wpointer-sign" >&5
+$as_echo_n "checking if $CC supports compile flag -Wpointer-sign... " >&6; }
+        saved_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $WERROR -Wpointer-sign"
+        _define_flag="-Wno-pointer-sign"
+        test "x$_define_flag" = "x" && _define_flag="-Wpointer-sign"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                CFLAGS="$saved_CFLAGS"
+else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                 CFLAGS="$saved_CFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  CFLAGS="$saved_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+}
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wunused-result" >&5
+$as_echo_n "checking if $CC supports compile flag -Wunused-result... " >&6; }
+        saved_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $WERROR -Wunused-result"
+        _define_flag="-Wno-unused-result"
+        test "x$_define_flag" = "x" && _define_flag="-Wunused-result"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                CFLAGS="$saved_CFLAGS"
+else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                 CFLAGS="$saved_CFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  CFLAGS="$saved_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+}
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wimplicit-fallthrough" >&5
+$as_echo_n "checking if $CC supports compile flag -Wimplicit-fallthrough... " >&6; }
+        saved_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $WERROR -Wimplicit-fallthrough"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-Wimplicit-fallthrough"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                CFLAGS="$saved_CFLAGS"
+else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                 CFLAGS="$saved_CFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  CFLAGS="$saved_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+}
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -fno-strict-aliasing" >&5
+$as_echo_n "checking if $CC supports compile flag -fno-strict-aliasing... " >&6; }
+        saved_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $WERROR -fno-strict-aliasing"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-fno-strict-aliasing"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                CFLAGS="$saved_CFLAGS"
+else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                 CFLAGS="$saved_CFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  CFLAGS="$saved_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+}
+    if test "x$use_toolchain_hardening" = "x1"; then
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -mretpoline" >&5
+$as_echo_n "checking if $CC supports compile flag -mretpoline... " >&6; }
+        saved_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $WERROR -mretpoline"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-mretpoline"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                CFLAGS="$saved_CFLAGS"
+else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                 CFLAGS="$saved_CFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  CFLAGS="$saved_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+} # clang
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $LD supports link flag -Wl,-z,retpolineplt" >&5
+$as_echo_n "checking if $LD supports link flag -Wl,-z,retpolineplt... " >&6; }
+        saved_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS $WERROR -Wl,-z,retpolineplt"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-Wl,-z,retpolineplt"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        long long p = n * o;
+        printf("%d %d %d %f %f %lld %lld %lld\n", i, j, k, l, m, n, o, p);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  LDFLAGS="$saved_LDFLAGS"
+else
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                  LDFLAGS="$saved_LDFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  LDFLAGS="$saved_LDFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+}
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -D_FORTIFY_SOURCE=2" >&5
+$as_echo_n "checking if $CC supports compile flag -D_FORTIFY_SOURCE=2... " >&6; }
+        saved_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $WERROR -D_FORTIFY_SOURCE=2"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-D_FORTIFY_SOURCE=2"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                CFLAGS="$saved_CFLAGS"
+else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                 CFLAGS="$saved_CFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  CFLAGS="$saved_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+}
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $LD supports link flag -Wl,-z,relro" >&5
+$as_echo_n "checking if $LD supports link flag -Wl,-z,relro... " >&6; }
+        saved_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS $WERROR -Wl,-z,relro"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-Wl,-z,relro"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        long long p = n * o;
+        printf("%d %d %d %f %f %lld %lld %lld\n", i, j, k, l, m, n, o, p);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  LDFLAGS="$saved_LDFLAGS"
+else
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                  LDFLAGS="$saved_LDFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  LDFLAGS="$saved_LDFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+}
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $LD supports link flag -Wl,-z,now" >&5
+$as_echo_n "checking if $LD supports link flag -Wl,-z,now... " >&6; }
+        saved_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS $WERROR -Wl,-z,now"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-Wl,-z,now"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        long long p = n * o;
+        printf("%d %d %d %f %f %lld %lld %lld\n", i, j, k, l, m, n, o, p);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  LDFLAGS="$saved_LDFLAGS"
+else
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                  LDFLAGS="$saved_LDFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  LDFLAGS="$saved_LDFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+}
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $LD supports link flag -Wl,-z,noexecstack" >&5
+$as_echo_n "checking if $LD supports link flag -Wl,-z,noexecstack... " >&6; }
+        saved_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS $WERROR -Wl,-z,noexecstack"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-Wl,-z,noexecstack"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        long long p = n * o;
+        printf("%d %d %d %f %f %lld %lld %lld\n", i, j, k, l, m, n, o, p);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  LDFLAGS="$saved_LDFLAGS"
+else
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                  LDFLAGS="$saved_LDFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  LDFLAGS="$saved_LDFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+}
+        # NB. -ftrapv expects certain support functions to be present in
+        # the compiler library (libgcc or similar) to detect integer operations
+        # that can overflow. We must check that the result of enabling it
+        # actually links. The test program compiled/linked includes a number
+        # of integer operations that should exercise this.
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -ftrapv and linking succeeds" >&5
+$as_echo_n "checking if $CC supports compile flag -ftrapv and linking succeeds... " >&6; }
+        saved_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $WERROR -ftrapv"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-ftrapv"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        long long int p = n * o;
+        printf("%d %d %d %f %f %lld %lld %lld\n", i, j, k, l, m, n, o, p);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                CFLAGS="$saved_CFLAGS"
+else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                 CFLAGS="$saved_CFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  CFLAGS="$saved_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+}
+    fi
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc version" >&5
+$as_echo_n "checking gcc version... " >&6; }
+        GCC_VER=`$CC -v 2>&1 | $AWK '/gcc version /{print $3}'`
+        case $GCC_VER in
+                1.*) no_attrib_nonnull=1 ;;
+                2.8* | 2.9*)
+                     no_attrib_nonnull=1
+                     ;;
+                2.*) no_attrib_nonnull=1 ;;
+                *) ;;
+        esac
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCC_VER" >&5
+$as_echo "$GCC_VER" >&6; }
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -fno-builtin-memset" >&5
+$as_echo_n "checking if $CC accepts -fno-builtin-memset... " >&6; }
+        saved_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS -fno-builtin-memset"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <string.h>
+int
+main ()
+{
+ char b[10]; memset(b, 0, sizeof(b));
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  CFLAGS="$saved_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+        # -fstack-protector-all doesn't always work for some GCC versions
+        # and/or platforms, so we test if we can.  If it's not supported
+        # on a given platform gcc will emit a warning so we use -Werror.
+        if test "x$use_stack_protector" = "x1"; then
+            for t in -fstack-protector-strong -fstack-protector-all \
+                    -fstack-protector; do
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports $t" >&5
+$as_echo_n "checking if $CC supports $t... " >&6; }
+                saved_CFLAGS="$CFLAGS"
+                saved_LDFLAGS="$LDFLAGS"
+                CFLAGS="$CFLAGS $t -Werror"
+                LDFLAGS="$LDFLAGS $t -Werror"
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+        #include <stdio.h>
+        int func (int t) {char b[100]; snprintf(b,sizeof b,"%d",t); return t;}
+
+int
+main ()
+{
+
+        char x[256];
+        snprintf(x, sizeof(x), "XXX%d", func(1));
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                      CFLAGS="$saved_CFLAGS $t"
+                      LDFLAGS="$saved_LDFLAGS $t"
+                      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $t works" >&5
+$as_echo_n "checking if $t works... " >&6; }
+                      if test "$cross_compiling" = yes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: cannot test" >&5
+$as_echo "$as_me: WARNING: cross compiling: cannot test" >&2;}
+                          break
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+        #include <stdio.h>
+        int func (int t) {char b[100]; snprintf(b,sizeof b,"%d",t); return t;}
+
+int
+main ()
+{
+
+        char x[256];
+        snprintf(x, sizeof(x), "XXX%d", func(1));
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                          break
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+                CFLAGS="$saved_CFLAGS"
+                LDFLAGS="$saved_LDFLAGS"
+            done
+        fi
+
+        if test -z "$have_llong_max"; then
+                # retry LLONG_MAX with -std=gnu99, needed on some Linuxes
+                unset ac_cv_have_decl_LLONG_MAX
+                saved_CFLAGS="$CFLAGS"
+                CFLAGS="$CFLAGS -std=gnu99"
+                ac_fn_c_check_decl "$LINENO" "LLONG_MAX" "ac_cv_have_decl_LLONG_MAX" "#include <limits.h>
+
+"
+if test "x$ac_cv_have_decl_LLONG_MAX" = xyes; then :
+  have_llong_max=1
+else
+  CFLAGS="$saved_CFLAGS"
+fi
+
+        fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler allows __attribute__ on return types" >&5
+$as_echo_n "checking if compiler allows __attribute__ on return types... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+__attribute__((__unused__)) static void foo(void){return;}
+int
+main ()
+{
+ exit(0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+$as_echo "#define NO_ATTRIBUTE_ON_RETURN_TYPE 1" >>confdefs.h
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler allows __attribute__ prototype args" >&5
+$as_echo_n "checking if compiler allows __attribute__ prototype args... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+typedef void foo(const char *, ...) __attribute__((format(printf, 1, 2)));
+int
+main ()
+{
+ exit(0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+$as_echo "#define NO_ATTRIBUTE_ON_PROTOTYPE_ARGS 1" >>confdefs.h
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test "x$no_attrib_nonnull" != "x1" ; then
+
+$as_echo "#define HAVE_ATTRIBUTE__NONNULL__ 1" >>confdefs.h
+
+fi
+
+
+# Check whether --with-rpath was given.
+if test "${with_rpath+set}" = set; then :
+  withval=$with_rpath;
+                if test "x$withval" = "xno" ; then
+                        rpath_opt=""
+                elif test "x$withval" = "xyes" ; then
+                        rpath_opt="-R"
+                else
+                        rpath_opt="$withval"
+                fi
+
+
+fi
+
+
+# Allow user to specify flags
+
+# Check whether --with-cflags was given.
+if test "${with_cflags+set}" = set; then :
+  withval=$with_cflags;
+                if test -n "$withval"  &&  test "x$withval" != "xno"  &&  \
+                    test "x${withval}" != "xyes"; then
+                        CFLAGS="$CFLAGS $withval"
+                fi
+
+
+fi
+
+
+
+# Check whether --with-cflags-after was given.
+if test "${with_cflags_after+set}" = set; then :
+  withval=$with_cflags_after;
+                if test -n "$withval"  &&  test "x$withval" != "xno"  &&  \
+                    test "x${withval}" != "xyes"; then
+                        CFLAGS_AFTER="$withval"
+                fi
+
+
+fi
+
+
+# Check whether --with-cppflags was given.
+if test "${with_cppflags+set}" = set; then :
+  withval=$with_cppflags;
+                if test -n "$withval"  &&  test "x$withval" != "xno"  &&  \
+                    test "x${withval}" != "xyes"; then
+                        CPPFLAGS="$CPPFLAGS $withval"
+                fi
+
+
+fi
+
+
+# Check whether --with-ldflags was given.
+if test "${with_ldflags+set}" = set; then :
+  withval=$with_ldflags;
+                if test -n "$withval"  &&  test "x$withval" != "xno"  &&  \
+                    test "x${withval}" != "xyes"; then
+                        LDFLAGS="$LDFLAGS $withval"
+                fi
+
+
+fi
+
+
+# Check whether --with-ldflags-after was given.
+if test "${with_ldflags_after+set}" = set; then :
+  withval=$with_ldflags_after;
+                if test -n "$withval"  &&  test "x$withval" != "xno"  &&  \
+                    test "x${withval}" != "xyes"; then
+                        LDFLAGS_AFTER="$withval"
+                fi
+
+
+fi
+
+
+# Check whether --with-libs was given.
+if test "${with_libs+set}" = set; then :
+  withval=$with_libs;
+                if test -n "$withval"  &&  test "x$withval" != "xno"  &&  \
+                    test "x${withval}" != "xyes"; then
+                        LIBS="$LIBS $withval"
+                fi
+
+
+fi
+
+
+# Check whether --with-Werror was given.
+if test "${with_Werror+set}" = set; then :
+  withval=$with_Werror;
+                if test -n "$withval"  &&  test "x$withval" != "xno"; then
+                        werror_flags="-Werror"
+                        if test "x${withval}" != "xyes"; then
+                                werror_flags="$withval"
+                        fi
+                fi
+
+
+fi
+
+
+for ac_header in  \
+        blf.h \
+        bstring.h \
+        crypt.h \
+        crypto/sha2.h \
+        dirent.h \
+        endian.h \
+        elf.h \
+        err.h \
+        features.h \
+        fcntl.h \
+        floatingpoint.h \
+        fnmatch.h \
+        getopt.h \
+        glob.h \
+        ia.h \
+        iaf.h \
+        ifaddrs.h \
+        inttypes.h \
+        langinfo.h \
+        limits.h \
+        locale.h \
+        login.h \
+        maillock.h \
+        ndir.h \
+        net/if_tun.h \
+        netdb.h \
+        netgroup.h \
+        pam/pam_appl.h \
+        paths.h \
+        poll.h \
+        pty.h \
+        readpassphrase.h \
+        rpc/types.h \
+        security/pam_appl.h \
+        sha2.h \
+        shadow.h \
+        stddef.h \
+        stdint.h \
+        string.h \
+        strings.h \
+        sys/bitypes.h \
+        sys/bsdtty.h \
+        sys/cdefs.h \
+        sys/dir.h \
+        sys/file.h \
+        sys/mman.h \
+        sys/label.h \
+        sys/ndir.h \
+        sys/poll.h \
+        sys/prctl.h \
+        sys/pstat.h \
+        sys/ptrace.h \
+        sys/random.h \
+        sys/select.h \
+        sys/stat.h \
+        sys/stream.h \
+        sys/stropts.h \
+        sys/strtio.h \
+        sys/statvfs.h \
+        sys/sysmacros.h \
+        sys/time.h \
+        sys/timers.h \
+        sys/vfs.h \
+        time.h \
+        tmpdir.h \
+        ttyent.h \
+        ucred.h \
+        unistd.h \
+        usersec.h \
+        util.h \
+        utime.h \
+        utmp.h \
+        utmpx.h \
+        vis.h \
+        wchar.h \
+
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+# On some platforms (eg SunOS4) sys/audit.h requires sys/[time|types|label.h]
+# to be included first.
+for ac_header in sys/audit.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "sys/audit.h" "ac_cv_header_sys_audit_h" "
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_LABEL_H
+# include <sys/label.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_audit_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_AUDIT_H 1
+_ACEOF
+
+fi
+
+done
+
+
+# sys/capsicum.h requires sys/types.h
+for ac_header in sys/capsicum.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "sys/capsicum.h" "ac_cv_header_sys_capsicum_h" "
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_capsicum_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_CAPSICUM_H 1
+_ACEOF
+
+fi
+
+done
+
+
+# net/route.h requires sys/socket.h and sys/types.h.
+# sys/sysctl.h also requires sys/param.h
+for ac_header in net/route.h sys/sysctl.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#include <sys/param.h>
+#include <sys/socket.h>
+
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+# lastlog.h requires sys/time.h to be included first on Solaris
+for ac_header in lastlog.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "lastlog.h" "ac_cv_header_lastlog_h" "
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+
+"
+if test "x$ac_cv_header_lastlog_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LASTLOG_H 1
+_ACEOF
+
+fi
+
+done
+
+
+# sys/ptms.h requires sys/stream.h to be included first on Solaris
+for ac_header in sys/ptms.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "sys/ptms.h" "ac_cv_header_sys_ptms_h" "
+#ifdef HAVE_SYS_STREAM_H
+# include <sys/stream.h>
+#endif
+
+"
+if test "x$ac_cv_header_sys_ptms_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_PTMS_H 1
+_ACEOF
+
+fi
+
+done
+
+
+# login_cap.h requires sys/types.h on NetBSD
+for ac_header in login_cap.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "login_cap.h" "ac_cv_header_login_cap_h" "
+#include <sys/types.h>
+
+"
+if test "x$ac_cv_header_login_cap_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LOGIN_CAP_H 1
+_ACEOF
+
+fi
+
+done
+
+
+# older BSDs need sys/param.h before sys/mount.h
+for ac_header in sys/mount.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "sys/mount.h" "ac_cv_header_sys_mount_h" "
+#include <sys/param.h>
+
+"
+if test "x$ac_cv_header_sys_mount_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_MOUNT_H 1
+_ACEOF
+
+fi
+
+done
+
+
+# Android requires sys/socket.h to be included before sys/un.h
+for ac_header in sys/un.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "sys/un.h" "ac_cv_header_sys_un_h" "
+#include <sys/types.h>
+#include <sys/socket.h>
+
+"
+if test "x$ac_cv_header_sys_un_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_UN_H 1
+_ACEOF
+
+fi
+
+done
+
+
+# Messages for features tested for in target-specific section
+SIA_MSG="no"
+SPC_MSG="no"
+SP_MSG="no"
+SPP_MSG="no"
+
+# Support for Solaris/Illumos privileges (this test is used by both
+# the --with-solaris-privs option and --with-sandbox=solaris).
+SOLARIS_PRIVS="no"
+
+# Check for some target-specific stuff
+case "$host" in
+*-*-aix*)
+        # Some versions of VAC won't allow macro redefinitions at
+        # -qlanglevel=ansi, and autoconf 2.60 sometimes insists on using that
+        # particularly with older versions of vac or xlc.
+        # It also throws errors about null macro arguments, but these are
+        # not fatal.
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler allows macro redefinitions" >&5
+$as_echo_n "checking if compiler allows macro redefinitions... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#define testmacro foo
+#define testmacro bar
+int
+main ()
+{
+ exit(0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+              CC="`echo $CC | sed 's/-qlanglvl\=ansi//g'`"
+              CFLAGS="`echo $CFLAGS | sed 's/-qlanglvl\=ansi//g'`"
+              CPPFLAGS="`echo $CPPFLAGS | sed 's/-qlanglvl\=ansi//g'`"
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to specify blibpath for linker ($LD)" >&5
+$as_echo_n "checking how to specify blibpath for linker ($LD)... " >&6; }
+        if (test -z "$blibpath"); then
+                blibpath="/usr/lib:/lib"
+        fi
+        saved_LDFLAGS="$LDFLAGS"
+        if test "$GCC" = "yes"; then
+                flags="-Wl,-blibpath: -Wl,-rpath, -blibpath:"
+        else
+                flags="-blibpath: -Wl,-blibpath: -Wl,-rpath,"
+        fi
+        for tryflags in $flags ;do
+                if (test -z "$blibflags"); then
+                        LDFLAGS="$saved_LDFLAGS $tryflags$blibpath"
+                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  blibflags=$tryflags
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+                fi
+        done
+        if (test -z "$blibflags"); then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+                as_fn_error $? "*** must be able to specify blibpath on AIX - check config.log" "$LINENO" 5
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $blibflags" >&5
+$as_echo "$blibflags" >&6; }
+        fi
+        LDFLAGS="$saved_LDFLAGS"
+                ac_fn_c_check_func "$LINENO" "authenticate" "ac_cv_func_authenticate"
+if test "x$ac_cv_func_authenticate" = xyes; then :
+
+$as_echo "#define WITH_AIXAUTHENTICATE 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for authenticate in -ls" >&5
+$as_echo_n "checking for authenticate in -ls... " >&6; }
+if ${ac_cv_lib_s_authenticate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ls  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char authenticate ();
+int
+main ()
+{
+return authenticate ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_s_authenticate=yes
+else
+  ac_cv_lib_s_authenticate=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_s_authenticate" >&5
+$as_echo "$ac_cv_lib_s_authenticate" >&6; }
+if test "x$ac_cv_lib_s_authenticate" = xyes; then :
+   $as_echo "#define WITH_AIXAUTHENTICATE 1" >>confdefs.h
+
+                                LIBS="$LIBS -ls"
+
+fi
+
+
+fi
+
+                ac_fn_c_check_decl "$LINENO" "authenticate" "ac_cv_have_decl_authenticate" "#include <usersec.h>
+"
+if test "x$ac_cv_have_decl_authenticate" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_AUTHENTICATE $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "loginrestrictions" "ac_cv_have_decl_loginrestrictions" "#include <usersec.h>
+"
+if test "x$ac_cv_have_decl_loginrestrictions" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_LOGINRESTRICTIONS $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "loginsuccess" "ac_cv_have_decl_loginsuccess" "#include <usersec.h>
+"
+if test "x$ac_cv_have_decl_loginsuccess" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_LOGINSUCCESS $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "passwdexpired" "ac_cv_have_decl_passwdexpired" "#include <usersec.h>
+"
+if test "x$ac_cv_have_decl_passwdexpired" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_PASSWDEXPIRED $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "setauthdb" "ac_cv_have_decl_setauthdb" "#include <usersec.h>
+"
+if test "x$ac_cv_have_decl_setauthdb" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_SETAUTHDB $ac_have_decl
+_ACEOF
+
+                ac_fn_c_check_decl "$LINENO" "loginfailed" "ac_cv_have_decl_loginfailed" "#include <usersec.h>
+
+"
+if test "x$ac_cv_have_decl_loginfailed" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_LOGINFAILED $ac_have_decl
+_ACEOF
+if test $ac_have_decl = 1; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if loginfailed takes 4 arguments" >&5
+$as_echo_n "checking if loginfailed takes 4 arguments... " >&6; }
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <usersec.h>
+int
+main ()
+{
+ (void)loginfailed("user","host","tty",0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define AIX_LOGINFAILED_4ARG 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+        for ac_func in getgrset setauthdb
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+        ac_fn_c_check_decl "$LINENO" "F_CLOSEM" "ac_cv_have_decl_F_CLOSEM" " #include <limits.h>
+              #include <fcntl.h>
+
+"
+if test "x$ac_cv_have_decl_F_CLOSEM" = xyes; then :
+
+$as_echo "#define HAVE_FCNTL_CLOSEM 1" >>confdefs.h
+
+fi
+
+        check_for_aix_broken_getaddrinfo=1
+
+$as_echo "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h
+
+
+$as_echo "#define BROKEN_SETREUID 1" >>confdefs.h
+
+
+$as_echo "#define BROKEN_SETREGID 1" >>confdefs.h
+
+
+$as_echo "#define DISABLE_LASTLOG 1" >>confdefs.h
+
+
+$as_echo "#define LOGIN_NEEDS_UTMPX 1" >>confdefs.h
+
+
+$as_echo "#define SPT_TYPE SPT_REUSEARGV" >>confdefs.h
+
+
+$as_echo "#define SSHPAM_CHAUTHTOK_NEEDS_RUID 1" >>confdefs.h
+
+
+$as_echo "#define PTY_ZEROREAD 1" >>confdefs.h
+
+
+$as_echo "#define PLATFORM_SYS_DIR_UID 2" >>confdefs.h
+
+
+$as_echo "#define BROKEN_STRNDUP 1" >>confdefs.h
+
+
+$as_echo "#define BROKEN_STRNLEN 1" >>confdefs.h
+
+        ;;
+*-*-android*)
+
+$as_echo "#define DISABLE_UTMP 1" >>confdefs.h
+
+
+$as_echo "#define DISABLE_WTMP 1" >>confdefs.h
+
+        ;;
+*-*-cygwin*)
+        check_for_libcrypt_later=1
+        LIBS="$LIBS /usr/lib/textreadmode.o"
+
+$as_echo "#define HAVE_CYGWIN 1" >>confdefs.h
+
+
+$as_echo "#define USE_PIPES 1" >>confdefs.h
+
+
+$as_echo "#define NO_UID_RESTORATION_TEST 1" >>confdefs.h
+
+
+$as_echo "#define DISABLE_SHADOW 1" >>confdefs.h
+
+
+$as_echo "#define NO_X11_UNIX_SOCKETS 1" >>confdefs.h
+
+
+$as_echo "#define DISABLE_FD_PASSING 1" >>confdefs.h
+
+
+$as_echo "#define SSH_IOBUFSZ 65535" >>confdefs.h
+
+
+$as_echo "#define FILESYSTEM_NO_BACKSLASH 1" >>confdefs.h
+
+        # Cygwin defines optargs, optargs as declspec(dllimport) for historical
+        # reasons which cause compile warnings, so we disable those warnings.
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wno-attributes" >&5
+$as_echo_n "checking if $CC supports compile flag -Wno-attributes... " >&6; }
+        saved_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $WERROR -Wno-attributes"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-Wno-attributes"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                CFLAGS="$saved_CFLAGS"
+else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                 CFLAGS="$saved_CFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  CFLAGS="$saved_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+}
+        ;;
+*-*-dgux*)
+
+$as_echo "#define IP_TOS_IS_BROKEN 1" >>confdefs.h
+
+        $as_echo "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_SETREUID 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_SETREGID 1" >>confdefs.h
+
+        ;;
+*-*-darwin*)
+        use_pie=auto
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have working getaddrinfo" >&5
+$as_echo_n "checking if we have working getaddrinfo... " >&6; }
+        if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: assume it is working" >&5
+$as_echo "assume it is working" >&6; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <mach-o/dyld.h>
+main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
+                exit(0);
+        else
+                exit(1);
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: working" >&5
+$as_echo "working" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: buggy" >&5
+$as_echo "buggy" >&6; }
+
+$as_echo "#define BROKEN_GETADDRINFO 1" >>confdefs.h
+
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+        $as_echo "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_SETREUID 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_SETREGID 1" >>confdefs.h
+
+
+$as_echo "#define BROKEN_GLOB 1" >>confdefs.h
+
+
+cat >>confdefs.h <<_ACEOF
+#define BIND_8_COMPAT 1
+_ACEOF
+
+
+$as_echo "#define SSH_TUN_FREEBSD 1" >>confdefs.h
+
+
+$as_echo "#define SSH_TUN_COMPAT_AF 1" >>confdefs.h
+
+
+$as_echo "#define SSH_TUN_PREPEND_AF 1" >>confdefs.h
+
+
+        ac_fn_c_check_decl "$LINENO" "AU_IPv4" "ac_cv_have_decl_AU_IPv4" "$ac_includes_default"
+if test "x$ac_cv_have_decl_AU_IPv4" = xyes; then :
+
+else
+
+$as_echo "#define AU_IPv4 0" >>confdefs.h
+
+            #include <bsm/audit.h>
+
+$as_echo "#define LASTLOG_WRITE_PUTUTXLINE 1" >>confdefs.h
+
+
+fi
+
+
+$as_echo "#define SPT_TYPE SPT_REUSEARGV" >>confdefs.h
+
+        for ac_func in sandbox_init
+do :
+  ac_fn_c_check_func "$LINENO" "sandbox_init" "ac_cv_func_sandbox_init"
+if test "x$ac_cv_func_sandbox_init" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SANDBOX_INIT 1
+_ACEOF
+
+fi
+done
+
+        for ac_header in sandbox.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sandbox.h" "ac_cv_header_sandbox_h" "$ac_includes_default"
+if test "x$ac_cv_header_sandbox_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SANDBOX_H 1
+_ACEOF
+
+fi
+
+done
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sandbox_apply in -lsandbox" >&5
+$as_echo_n "checking for sandbox_apply in -lsandbox... " >&6; }
+if ${ac_cv_lib_sandbox_sandbox_apply+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsandbox  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sandbox_apply ();
+int
+main ()
+{
+return sandbox_apply ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_sandbox_sandbox_apply=yes
+else
+  ac_cv_lib_sandbox_sandbox_apply=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sandbox_sandbox_apply" >&5
+$as_echo "$ac_cv_lib_sandbox_sandbox_apply" >&6; }
+if test "x$ac_cv_lib_sandbox_sandbox_apply" = xyes; then :
+
+            SSHDLIBS="$SSHDLIBS -lsandbox"
+
+fi
+
+        # proc_pidinfo()-based closefrom() replacement.
+        for ac_header in libproc.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "libproc.h" "ac_cv_header_libproc_h" "$ac_includes_default"
+if test "x$ac_cv_header_libproc_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPROC_H 1
+_ACEOF
+
+fi
+
+done
+
+        for ac_func in proc_pidinfo
+do :
+  ac_fn_c_check_func "$LINENO" "proc_pidinfo" "ac_cv_func_proc_pidinfo"
+if test "x$ac_cv_func_proc_pidinfo" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PROC_PIDINFO 1
+_ACEOF
+
+fi
+done
+
+        ;;
+*-*-dragonfly*)
+        SSHDLIBS="$SSHDLIBS -lcrypt"
+        TEST_MALLOC_OPTIONS="AFGJPRX"
+        ;;
+*-*-haiku*)
+        LIBS="$LIBS -lbsd "
+        CFLAGS="$CFLAGS -D_BSD_SOURCE"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lnetwork" >&5
+$as_echo_n "checking for socket in -lnetwork... " >&6; }
+if ${ac_cv_lib_network_socket+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lnetwork  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char socket ();
+int
+main ()
+{
+return socket ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_network_socket=yes
+else
+  ac_cv_lib_network_socket=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_socket" >&5
+$as_echo "$ac_cv_lib_network_socket" >&6; }
+if test "x$ac_cv_lib_network_socket" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBNETWORK 1
+_ACEOF
+
+  LIBS="-lnetwork $LIBS"
+
+fi
+
+        $as_echo "#define HAVE_U_INT64_T 1" >>confdefs.h
+
+
+$as_echo "#define DISABLE_UTMPX 1" >>confdefs.h
+
+        MANTYPE=man
+        ;;
+*-*-hpux*)
+        # first we define all of the options common to all HP-UX releases
+        CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"
+        IPADDR_IN_DISPLAY=yes
+        $as_echo "#define USE_PIPES 1" >>confdefs.h
+
+        $as_echo "#define LOGIN_NEEDS_UTMPX 1" >>confdefs.h
+
+
+$as_echo "#define LOCKED_PASSWD_STRING \"*\"" >>confdefs.h
+
+        $as_echo "#define SPT_TYPE SPT_PSTAT" >>confdefs.h
+
+
+$as_echo "#define PLATFORM_SYS_DIR_UID 2" >>confdefs.h
+
+        maildir="/var/mail"
+        LIBS="$LIBS -lsec"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for t_error in -lxnet" >&5
+$as_echo_n "checking for t_error in -lxnet... " >&6; }
+if ${ac_cv_lib_xnet_t_error+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lxnet  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char t_error ();
+int
+main ()
+{
+return t_error ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_xnet_t_error=yes
+else
+  ac_cv_lib_xnet_t_error=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xnet_t_error" >&5
+$as_echo "$ac_cv_lib_xnet_t_error" >&6; }
+if test "x$ac_cv_lib_xnet_t_error" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBXNET 1
+_ACEOF
+
+  LIBS="-lxnet $LIBS"
+
+else
+  as_fn_error $? "*** -lxnet needed on HP-UX - check config.log ***" "$LINENO" 5
+fi
+
+
+        # next, we define all of the options specific to major releases
+        case "$host" in
+        *-*-hpux10*)
+                if test -z "$GCC"; then
+                        CFLAGS="$CFLAGS -Ae"
+                fi
+                ;;
+        *-*-hpux11*)
+
+$as_echo "#define PAM_SUN_CODEBASE 1" >>confdefs.h
+
+
+$as_echo "#define DISABLE_UTMP 1" >>confdefs.h
+
+
+$as_echo "#define USE_BTMP 1" >>confdefs.h
+
+                check_for_hpux_broken_getaddrinfo=1
+                check_for_conflicting_getspnam=1
+                ;;
+        esac
+
+        # lastly, we define options specific to minor releases
+        case "$host" in
+        *-*-hpux10.26)
+
+$as_echo "#define HAVE_SECUREWARE 1" >>confdefs.h
+
+                disable_ptmx_check=yes
+                LIBS="$LIBS -lsecpw"
+                ;;
+        esac
+        ;;
+*-*-irix5*)
+        PATH="$PATH:/usr/etc"
+
+$as_echo "#define BROKEN_INET_NTOA 1" >>confdefs.h
+
+        $as_echo "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_SETREUID 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_SETREGID 1" >>confdefs.h
+
+
+$as_echo "#define WITH_ABBREV_NO_TTY 1" >>confdefs.h
+
+        $as_echo "#define LOCKED_PASSWD_STRING \"*LK*\"" >>confdefs.h
+
+        ;;
+*-*-irix6*)
+        PATH="$PATH:/usr/etc"
+
+$as_echo "#define WITH_IRIX_ARRAY 1" >>confdefs.h
+
+
+$as_echo "#define WITH_IRIX_PROJECT 1" >>confdefs.h
+
+
+$as_echo "#define WITH_IRIX_AUDIT 1" >>confdefs.h
+
+        ac_fn_c_check_func "$LINENO" "jlimit_startjob" "ac_cv_func_jlimit_startjob"
+if test "x$ac_cv_func_jlimit_startjob" = xyes; then :
+
+$as_echo "#define WITH_IRIX_JOBS 1" >>confdefs.h
+
+fi
+
+        $as_echo "#define BROKEN_INET_NTOA 1" >>confdefs.h
+
+        $as_echo "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_SETREUID 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_SETREGID 1" >>confdefs.h
+
+
+$as_echo "#define BROKEN_UPDWTMPX 1" >>confdefs.h
+
+        $as_echo "#define WITH_ABBREV_NO_TTY 1" >>confdefs.h
+
+        $as_echo "#define LOCKED_PASSWD_STRING \"*LK*\"" >>confdefs.h
+
+        ;;
+*-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
+        check_for_libcrypt_later=1
+        $as_echo "#define PAM_TTY_KLUDGE 1" >>confdefs.h
+
+        $as_echo "#define LOCKED_PASSWD_PREFIX \"!\"" >>confdefs.h
+
+        $as_echo "#define SPT_TYPE SPT_REUSEARGV" >>confdefs.h
+
+
+$as_echo "#define _PATH_BTMP \"/var/log/btmp\"" >>confdefs.h
+
+
+$as_echo "#define USE_BTMP 1" >>confdefs.h
+
+        ;;
+*-*-linux*)
+        no_dev_ptmx=1
+        use_pie=auto
+        check_for_libcrypt_later=1
+        check_for_openpty_ctty_bug=1
+                        CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE"
+
+$as_echo "#define PAM_TTY_KLUDGE 1" >>confdefs.h
+
+
+$as_echo "#define LOCKED_PASSWD_PREFIX \"!\"" >>confdefs.h
+
+        $as_echo "#define SPT_TYPE SPT_REUSEARGV" >>confdefs.h
+
+
+$as_echo "#define LINK_OPNOTSUPP_ERRNO EPERM" >>confdefs.h
+
+
+$as_echo "#define _PATH_BTMP \"/var/log/btmp\"" >>confdefs.h
+
+        $as_echo "#define USE_BTMP 1" >>confdefs.h
+
+
+$as_echo "#define LINUX_OOM_ADJUST 1" >>confdefs.h
+
+        inet6_default_4in6=yes
+        case `uname -r` in
+        1.*|2.0.*)
+
+$as_echo "#define BROKEN_CMSG_TYPE 1" >>confdefs.h
+
+                ;;
+        esac
+        # tun(4) forwarding compat code
+        for ac_header in linux/if_tun.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "linux/if_tun.h" "ac_cv_header_linux_if_tun_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_if_tun_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LINUX_IF_TUN_H 1
+_ACEOF
+
+fi
+
+done
+
+        if test "x$ac_cv_header_linux_if_tun_h" = "xyes" ; then
+
+$as_echo "#define SSH_TUN_LINUX 1" >>confdefs.h
+
+
+$as_echo "#define SSH_TUN_COMPAT_AF 1" >>confdefs.h
+
+
+$as_echo "#define SSH_TUN_PREPEND_AF 1" >>confdefs.h
+
+        fi
+        ac_fn_c_check_header_compile "$LINENO" "linux/if.h" "ac_cv_header_linux_if_h" "
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+"
+if test "x$ac_cv_header_linux_if_h" = xyes; then :
+
+$as_echo "#define SYS_RDOMAIN_LINUX 1" >>confdefs.h
+
+fi
+
+
+        for ac_header in linux/seccomp.h linux/filter.h linux/audit.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <linux/types.h>
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+        # Obtain MIPS ABI
+        case "$host" in
+        mips*)
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if _MIPS_SIM != _ABIO32
+#error
+#endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  mips_abi="o32"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if _MIPS_SIM != _ABIN32
+#error
+#endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  mips_abi="n32"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if _MIPS_SIM != _ABI64
+#error
+#endif
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  mips_abi="n64"
+else
+  as_fn_error $? "unknown MIPS ABI" "$LINENO" 5
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+                ;;
+        esac
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for seccomp architecture" >&5
+$as_echo_n "checking for seccomp architecture... " >&6; }
+        seccomp_audit_arch=
+        case "$host" in
+        x86_64-*)
+                seccomp_audit_arch=AUDIT_ARCH_X86_64
+                ;;
+        i*86-*)
+                seccomp_audit_arch=AUDIT_ARCH_I386
+                ;;
+        arm*-*)
+                seccomp_audit_arch=AUDIT_ARCH_ARM
+                ;;
+        aarch64*-*)
+                seccomp_audit_arch=AUDIT_ARCH_AARCH64
+                ;;
+        s390x-*)
+                seccomp_audit_arch=AUDIT_ARCH_S390X
+                ;;
+        s390-*)
+                seccomp_audit_arch=AUDIT_ARCH_S390
+                ;;
+        powerpc64-*)
+                seccomp_audit_arch=AUDIT_ARCH_PPC64
+                ;;
+        powerpc64le-*)
+                seccomp_audit_arch=AUDIT_ARCH_PPC64LE
+                ;;
+        mips-*)
+                seccomp_audit_arch=AUDIT_ARCH_MIPS
+                ;;
+        mipsel-*)
+                seccomp_audit_arch=AUDIT_ARCH_MIPSEL
+                ;;
+        mips64-*)
+                case "$mips_abi" in
+                "n32")
+                        seccomp_audit_arch=AUDIT_ARCH_MIPS64N32
+                        ;;
+                "n64")
+                        seccomp_audit_arch=AUDIT_ARCH_MIPS64
+                        ;;
+                esac
+                ;;
+        mips64el-*)
+                case "$mips_abi" in
+                "n32")
+                        seccomp_audit_arch=AUDIT_ARCH_MIPSEL64N32
+                        ;;
+                "n64")
+                        seccomp_audit_arch=AUDIT_ARCH_MIPSEL64
+                        ;;
+                esac
+                ;;
+        esac
+        if test "x$seccomp_audit_arch" != "x" ; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$seccomp_audit_arch\"" >&5
+$as_echo "\"$seccomp_audit_arch\"" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define SECCOMP_AUDIT_ARCH $seccomp_audit_arch
+_ACEOF
+
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: architecture not supported" >&5
+$as_echo "architecture not supported" >&6; }
+        fi
+        ;;
+mips-sony-bsd|mips-sony-newsos4)
+
+$as_echo "#define NEED_SETPGRP 1" >>confdefs.h
+
+        SONY=1
+        ;;
+*-*-netbsd*)
+        check_for_libcrypt_before=1
+        if test "x$withval" != "xno" ; then
+                rpath_opt="-R"
+        fi
+        CPPFLAGS="$CPPFLAGS -D_OPENBSD_SOURCE"
+
+$as_echo "#define SSH_TUN_FREEBSD 1" >>confdefs.h
+
+        ac_fn_c_check_header_mongrel "$LINENO" "net/if_tap.h" "ac_cv_header_net_if_tap_h" "$ac_includes_default"
+if test "x$ac_cv_header_net_if_tap_h" = xyes; then :
+
+else
+
+$as_echo "#define SSH_TUN_NO_L2 1" >>confdefs.h
+
+fi
+
+
+
+$as_echo "#define SSH_TUN_PREPEND_AF 1" >>confdefs.h
+
+        TEST_MALLOC_OPTIONS="AJRX"
+
+$as_echo "#define BROKEN_READ_COMPARISON 1" >>confdefs.h
+
+        ;;
+*-*-freebsd*)
+        check_for_libcrypt_later=1
+
+$as_echo "#define LOCKED_PASSWD_PREFIX \"*LOCKED*\"" >>confdefs.h
+
+
+$as_echo "#define SSH_TUN_FREEBSD 1" >>confdefs.h
+
+        ac_fn_c_check_header_mongrel "$LINENO" "net/if_tap.h" "ac_cv_header_net_if_tap_h" "$ac_includes_default"
+if test "x$ac_cv_header_net_if_tap_h" = xyes; then :
+
+else
+
+$as_echo "#define SSH_TUN_NO_L2 1" >>confdefs.h
+
+fi
+
+
+
+$as_echo "#define BROKEN_GLOB 1" >>confdefs.h
+
+        TEST_MALLOC_OPTIONS="AJRX"
+        # Preauth crypto occasionally uses file descriptors for crypto offload
+        # and will crash if they cannot be opened.
+
+$as_echo "#define SANDBOX_SKIP_RLIMIT_NOFILE 1" >>confdefs.h
+
+        ;;
+*-*-bsdi*)
+        $as_echo "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_SETREUID 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_SETREGID 1" >>confdefs.h
+
+        ;;
+*-next-*)
+        conf_lastlog_location="/usr/adm/lastlog"
+        conf_utmp_location=/etc/utmp
+        conf_wtmp_location=/usr/adm/wtmp
+        maildir=/usr/spool/mail
+
+$as_echo "#define HAVE_NEXT 1" >>confdefs.h
+
+        $as_echo "#define USE_PIPES 1" >>confdefs.h
+
+
+$as_echo "#define BROKEN_SAVED_UIDS 1" >>confdefs.h
+
+        ;;
+*-*-openbsd*)
+        use_pie=auto
+
+$as_echo "#define HAVE_ATTRIBUTE__SENTINEL__ 1" >>confdefs.h
+
+
+$as_echo "#define HAVE_ATTRIBUTE__BOUNDED__ 1" >>confdefs.h
+
+
+$as_echo "#define SSH_TUN_OPENBSD 1" >>confdefs.h
+
+
+$as_echo "#define SYSLOG_R_SAFE_IN_SIGHAND 1" >>confdefs.h
+
+        TEST_MALLOC_OPTIONS="AFGJPRX"
+        ;;
+*-*-solaris*)
+        if test "x$withval" != "xno" ; then
+                rpath_opt="-R"
+        fi
+        $as_echo "#define PAM_SUN_CODEBASE 1" >>confdefs.h
+
+        $as_echo "#define LOGIN_NEEDS_UTMPX 1" >>confdefs.h
+
+        $as_echo "#define PAM_TTY_KLUDGE 1" >>confdefs.h
+
+
+$as_echo "#define SSHPAM_CHAUTHTOK_NEEDS_RUID 1" >>confdefs.h
+
+        $as_echo "#define LOCKED_PASSWD_STRING \"*LK*\"" >>confdefs.h
+
+        # Pushing STREAMS modules will cause sshd to acquire a controlling tty.
+
+$as_echo "#define SSHD_ACQUIRES_CTTY 1" >>confdefs.h
+
+
+$as_echo "#define PASSWD_NEEDS_USERNAME 1" >>confdefs.h
+
+
+$as_echo "#define BROKEN_TCGETATTR_ICANON 1" >>confdefs.h
+
+        external_path_file=/etc/default/login
+        # hardwire lastlog location (can't detect it on some versions)
+        conf_lastlog_location="/var/adm/lastlog"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for obsolete utmp and wtmp in solaris2.x" >&5
+$as_echo_n "checking for obsolete utmp and wtmp in solaris2.x... " >&6; }
+        sol2ver=`echo "$host"| sed -e 's/.*[0-9]\.//'`
+        if test "$sol2ver" -ge 8; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                $as_echo "#define DISABLE_UTMP 1" >>confdefs.h
+
+
+$as_echo "#define DISABLE_WTMP 1" >>confdefs.h
+
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+        for ac_func in setpflags
+do :
+  ac_fn_c_check_func "$LINENO" "setpflags" "ac_cv_func_setpflags"
+if test "x$ac_cv_func_setpflags" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SETPFLAGS 1
+_ACEOF
+
+fi
+done
+
+        for ac_func in setppriv
+do :
+  ac_fn_c_check_func "$LINENO" "setppriv" "ac_cv_func_setppriv"
+if test "x$ac_cv_func_setppriv" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SETPPRIV 1
+_ACEOF
+
+fi
+done
+
+        for ac_func in priv_basicset
+do :
+  ac_fn_c_check_func "$LINENO" "priv_basicset" "ac_cv_func_priv_basicset"
+if test "x$ac_cv_func_priv_basicset" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PRIV_BASICSET 1
+_ACEOF
+
+fi
+done
+
+        for ac_header in priv.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "priv.h" "ac_cv_header_priv_h" "$ac_includes_default"
+if test "x$ac_cv_header_priv_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PRIV_H 1
+_ACEOF
+
+fi
+
+done
+
+
+# Check whether --with-solaris-contracts was given.
+if test "${with_solaris_contracts+set}" = set; then :
+  withval=$with_solaris_contracts;
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ct_tmpl_activate in -lcontract" >&5
+$as_echo_n "checking for ct_tmpl_activate in -lcontract... " >&6; }
+if ${ac_cv_lib_contract_ct_tmpl_activate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcontract  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ct_tmpl_activate ();
+int
+main ()
+{
+return ct_tmpl_activate ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_contract_ct_tmpl_activate=yes
+else
+  ac_cv_lib_contract_ct_tmpl_activate=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_contract_ct_tmpl_activate" >&5
+$as_echo "$ac_cv_lib_contract_ct_tmpl_activate" >&6; }
+if test "x$ac_cv_lib_contract_ct_tmpl_activate" = xyes; then :
+
+$as_echo "#define USE_SOLARIS_PROCESS_CONTRACTS 1" >>confdefs.h
+
+                          LIBS="$LIBS -lcontract"
+                          SPC_MSG="yes"
+fi
+
+
+fi
+
+
+# Check whether --with-solaris-projects was given.
+if test "${with_solaris_projects+set}" = set; then :
+  withval=$with_solaris_projects;
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setproject in -lproject" >&5
+$as_echo_n "checking for setproject in -lproject... " >&6; }
+if ${ac_cv_lib_project_setproject+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lproject  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char setproject ();
+int
+main ()
+{
+return setproject ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_project_setproject=yes
+else
+  ac_cv_lib_project_setproject=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_project_setproject" >&5
+$as_echo "$ac_cv_lib_project_setproject" >&6; }
+if test "x$ac_cv_lib_project_setproject" = xyes; then :
+
+$as_echo "#define USE_SOLARIS_PROJECTS 1" >>confdefs.h
+
+                        LIBS="$LIBS -lproject"
+                        SP_MSG="yes"
+fi
+
+
+fi
+
+
+# Check whether --with-solaris-privs was given.
+if test "${with_solaris_privs+set}" = set; then :
+  withval=$with_solaris_privs;
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solaris/Illumos privilege support" >&5
+$as_echo_n "checking for Solaris/Illumos privilege support... " >&6; }
+                if test "x$ac_cv_func_setppriv" = "xyes" -a \
+                        "x$ac_cv_header_priv_h" = "xyes" ; then
+                        SOLARIS_PRIVS=yes
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
+
+$as_echo "#define NO_UID_RESTORATION_TEST 1" >>confdefs.h
+
+
+$as_echo "#define USE_SOLARIS_PRIVS 1" >>confdefs.h
+
+                        SPP_MSG="yes"
+                else
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+                        as_fn_error $? "*** must have support for Solaris privileges to use --with-solaris-privs" "$LINENO" 5
+                fi
+
+fi
+
+        TEST_SHELL=$SHELL       # let configure find us a capable shell
+        ;;
+*-*-sunos4*)
+        CPPFLAGS="$CPPFLAGS -DSUNOS4"
+        for ac_func in getpwanam
+do :
+  ac_fn_c_check_func "$LINENO" "getpwanam" "ac_cv_func_getpwanam"
+if test "x$ac_cv_func_getpwanam" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GETPWANAM 1
+_ACEOF
+
+fi
+done
+
+        $as_echo "#define PAM_SUN_CODEBASE 1" >>confdefs.h
+
+        conf_utmp_location=/etc/utmp
+        conf_wtmp_location=/var/adm/wtmp
+        conf_lastlog_location=/var/adm/lastlog
+        $as_echo "#define USE_PIPES 1" >>confdefs.h
+
+
+$as_echo "#define DISABLE_UTMPX 1" >>confdefs.h
+
+        ;;
+*-ncr-sysv*)
+        LIBS="$LIBS -lc89"
+        $as_echo "#define USE_PIPES 1" >>confdefs.h
+
+        $as_echo "#define SSHD_ACQUIRES_CTTY 1" >>confdefs.h
+
+        $as_echo "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_SETREUID 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_SETREGID 1" >>confdefs.h
+
+        ;;
+*-sni-sysv*)
+        # /usr/ucblib MUST NOT be searched on ReliantUNIX
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym in -ldl" >&5
+$as_echo_n "checking for dlsym in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlsym+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlsym ();
+int
+main ()
+{
+return dlsym ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlsym=yes
+else
+  ac_cv_lib_dl_dlsym=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlsym" >&5
+$as_echo "$ac_cv_lib_dl_dlsym" >&6; }
+if test "x$ac_cv_lib_dl_dlsym" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBDL 1
+_ACEOF
+
+  LIBS="-ldl $LIBS"
+
+fi
+
+        # -lresolv needs to be at the end of LIBS or DNS lookups break
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_query in -lresolv" >&5
+$as_echo_n "checking for res_query in -lresolv... " >&6; }
+if ${ac_cv_lib_resolv_res_query+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lresolv  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char res_query ();
+int
+main ()
+{
+return res_query ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_resolv_res_query=yes
+else
+  ac_cv_lib_resolv_res_query=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_query" >&5
+$as_echo "$ac_cv_lib_resolv_res_query" >&6; }
+if test "x$ac_cv_lib_resolv_res_query" = xyes; then :
+   LIBS="$LIBS -lresolv"
+fi
+
+        IPADDR_IN_DISPLAY=yes
+        $as_echo "#define USE_PIPES 1" >>confdefs.h
+
+        $as_echo "#define IP_TOS_IS_BROKEN 1" >>confdefs.h
+
+        $as_echo "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_SETREUID 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_SETREGID 1" >>confdefs.h
+
+        $as_echo "#define SSHD_ACQUIRES_CTTY 1" >>confdefs.h
+
+        external_path_file=/etc/default/login
+        # /usr/ucblib/libucb.a no longer needed on ReliantUNIX
+        # Attention: always take care to bind libsocket and libnsl before libc,
+        # otherwise you will find lots of "SIOCGPGRP errno 22" on syslog
+        ;;
+# UnixWare 1.x, UnixWare 2.x, and others based on code from Univel.
+*-*-sysv4.2*)
+        $as_echo "#define USE_PIPES 1" >>confdefs.h
+
+        $as_echo "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_SETREUID 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_SETREGID 1" >>confdefs.h
+
+
+$as_echo "#define PASSWD_NEEDS_USERNAME 1" >>confdefs.h
+
+        $as_echo "#define LOCKED_PASSWD_STRING \"*LK*\"" >>confdefs.h
+
+        TEST_SHELL=$SHELL       # let configure find us a capable shell
+        ;;
+# UnixWare 7.x, OpenUNIX 8
+*-*-sysv5*)
+        CPPFLAGS="$CPPFLAGS -Dvsnprintf=_xvsnprintf -Dsnprintf=_xsnprintf"
+
+$as_echo "#define UNIXWARE_LONG_PASSWORDS 1" >>confdefs.h
+
+        $as_echo "#define USE_PIPES 1" >>confdefs.h
+
+        $as_echo "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_GETADDRINFO 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_SETREUID 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_SETREGID 1" >>confdefs.h
+
+        $as_echo "#define PASSWD_NEEDS_USERNAME 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_TCGETATTR_ICANON 1" >>confdefs.h
+
+        TEST_SHELL=$SHELL       # let configure find us a capable shell
+        check_for_libcrypt_later=1
+        case "$host" in
+        *-*-sysv5SCO_SV*)       # SCO OpenServer 6.x
+                maildir=/var/spool/mail
+                $as_echo "#define BROKEN_UPDWTMPX 1" >>confdefs.h
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getluid in -lprot" >&5
+$as_echo_n "checking for getluid in -lprot... " >&6; }
+if ${ac_cv_lib_prot_getluid+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lprot  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char getluid ();
+int
+main ()
+{
+return getluid ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_prot_getluid=yes
+else
+  ac_cv_lib_prot_getluid=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_prot_getluid" >&5
+$as_echo "$ac_cv_lib_prot_getluid" >&6; }
+if test "x$ac_cv_lib_prot_getluid" = xyes; then :
+   LIBS="$LIBS -lprot"
+                        for ac_func in getluid setluid
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+fi
+
+                ;;
+        *)      $as_echo "#define LOCKED_PASSWD_STRING \"*LK*\"" >>confdefs.h
+
+                ;;
+        esac
+        ;;
+*-*-sysv*)
+        ;;
+# SCO UNIX and OEM versions of SCO UNIX
+*-*-sco3.2v4*)
+        as_fn_error $? "\"This Platform is no longer supported.\"" "$LINENO" 5
+        ;;
+# SCO OpenServer 5.x
+*-*-sco3.2v5*)
+        if test -z "$GCC"; then
+                CFLAGS="$CFLAGS -belf"
+        fi
+        LIBS="$LIBS -lprot -lx -ltinfo -lm"
+        no_dev_ptmx=1
+        $as_echo "#define USE_PIPES 1" >>confdefs.h
+
+        $as_echo "#define HAVE_SECUREWARE 1" >>confdefs.h
+
+        $as_echo "#define DISABLE_SHADOW 1" >>confdefs.h
+
+        $as_echo "#define DISABLE_FD_PASSING 1" >>confdefs.h
+
+        $as_echo "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_GETADDRINFO 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_SETREUID 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_SETREGID 1" >>confdefs.h
+
+        $as_echo "#define WITH_ABBREV_NO_TTY 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_UPDWTMPX 1" >>confdefs.h
+
+        $as_echo "#define PASSWD_NEEDS_USERNAME 1" >>confdefs.h
+
+        for ac_func in getluid setluid
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+        MANTYPE=man
+        TEST_SHELL=$SHELL       # let configure find us a capable shell
+        SKIP_DISABLE_LASTLOG_DEFINE=yes
+        ;;
+*-dec-osf*)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Digital Unix SIA" >&5
+$as_echo_n "checking for Digital Unix SIA... " >&6; }
+        no_osfsia=""
+
+# Check whether --with-osfsia was given.
+if test "${with_osfsia+set}" = set; then :
+  withval=$with_osfsia;
+                        if test "x$withval" = "xno" ; then
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
+                                no_osfsia=1
+                        fi
+
+fi
+
+        if test -z "$no_osfsia" ; then
+                if test -f /etc/sia/matrix.conf; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_OSF_SIA 1" >>confdefs.h
+
+
+$as_echo "#define DISABLE_LOGIN 1" >>confdefs.h
+
+                        $as_echo "#define DISABLE_FD_PASSING 1" >>confdefs.h
+
+                        LIBS="$LIBS -lsecurity -ldb -lm -laud"
+                        SIA_MSG="yes"
+                else
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+$as_echo "#define LOCKED_PASSWD_SUBSTR \"Nologin\"" >>confdefs.h
+
+                fi
+        fi
+        $as_echo "#define BROKEN_GETADDRINFO 1" >>confdefs.h
+
+        $as_echo "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_SETREUID 1" >>confdefs.h
+
+        $as_echo "#define BROKEN_SETREGID 1" >>confdefs.h
+
+
+$as_echo "#define BROKEN_READV_COMPARISON 1" >>confdefs.h
+
+        ;;
+
+*-*-nto-qnx*)
+        $as_echo "#define USE_PIPES 1" >>confdefs.h
+
+        $as_echo "#define NO_X11_UNIX_SOCKETS 1" >>confdefs.h
+
+        $as_echo "#define DISABLE_LASTLOG 1" >>confdefs.h
+
+        $as_echo "#define SSHD_ACQUIRES_CTTY 1" >>confdefs.h
+
+
+$as_echo "#define BROKEN_SHADOW_EXPIRE 1" >>confdefs.h
+
+        enable_etc_default_login=no     # has incompatible /etc/default/login
+        case "$host" in
+        *-*-nto-qnx6*)
+                $as_echo "#define DISABLE_FD_PASSING 1" >>confdefs.h
+
+                ;;
+        esac
+        ;;
+
+*-*-ultrix*)
+
+$as_echo "#define BROKEN_GETGROUPS 1" >>confdefs.h
+
+
+$as_echo "#define NEED_SETPGRP 1" >>confdefs.h
+
+
+$as_echo "#define HAVE_SYS_SYSLOG_H 1" >>confdefs.h
+
+
+$as_echo "#define DISABLE_UTMPX 1" >>confdefs.h
+
+        # DISABLE_FD_PASSING so that we call setpgrp as root, otherwise we
+        # don't get a controlling tty.
+
+$as_echo "#define DISABLE_FD_PASSING 1" >>confdefs.h
+
+        # On Ultrix some headers are not protected against multiple includes,
+        # so we create wrappers and put it where the compiler will find it.
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: creating compat wrappers for headers" >&5
+$as_echo "$as_me: WARNING: creating compat wrappers for headers" >&2;}
+        mkdir -p netinet
+        for header in netinet/ip.h netdb.h resolv.h; do
+                name=`echo $header | tr 'a-z/.' 'A-Z__'`
+                cat >$header <<EOD
+#ifndef _SSH_COMPAT_${name}
+#define _SSH_COMPAT_${name}
+#include "/usr/include/${header}"
+#endif
+EOD
+        done
+        ;;
+
+*-*-lynxos)
+        CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"
+
+$as_echo "#define BROKEN_SETVBUF 1" >>confdefs.h
+
+        ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler and flags for sanity" >&5
+$as_echo_n "checking compiler and flags for sanity... " >&6; }
+if test "$cross_compiling" = yes; then :
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking compiler sanity" >&5
+$as_echo "$as_me: WARNING: cross compiling: not checking compiler sanity" >&2;}
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <stdio.h>
+int
+main ()
+{
+ exit(0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                as_fn_error $? "*** compiler cannot create working executables, check config.log ***" "$LINENO" 5
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+# Checks for libraries.
+ac_fn_c_check_func "$LINENO" "setsockopt" "ac_cv_func_setsockopt"
+if test "x$ac_cv_func_setsockopt" = xyes; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setsockopt in -lsocket" >&5
+$as_echo_n "checking for setsockopt in -lsocket... " >&6; }
+if ${ac_cv_lib_socket_setsockopt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsocket  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char setsockopt ();
+int
+main ()
+{
+return setsockopt ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_socket_setsockopt=yes
+else
+  ac_cv_lib_socket_setsockopt=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_setsockopt" >&5
+$as_echo "$ac_cv_lib_socket_setsockopt" >&6; }
+if test "x$ac_cv_lib_socket_setsockopt" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSOCKET 1
+_ACEOF
+
+  LIBS="-lsocket $LIBS"
+
+fi
+
+fi
+
+
+for ac_func in dirname
+do :
+  ac_fn_c_check_func "$LINENO" "dirname" "ac_cv_func_dirname"
+if test "x$ac_cv_func_dirname" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DIRNAME 1
+_ACEOF
+ for ac_header in libgen.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "libgen.h" "ac_cv_header_libgen_h" "$ac_includes_default"
+if test "x$ac_cv_header_libgen_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBGEN_H 1
+_ACEOF
+
+fi
+
+done
+
+else
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dirname in -lgen" >&5
+$as_echo_n "checking for dirname in -lgen... " >&6; }
+if ${ac_cv_lib_gen_dirname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgen  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dirname ();
+int
+main ()
+{
+return dirname ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_gen_dirname=yes
+else
+  ac_cv_lib_gen_dirname=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gen_dirname" >&5
+$as_echo "$ac_cv_lib_gen_dirname" >&6; }
+if test "x$ac_cv_lib_gen_dirname" = xyes; then :
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken dirname" >&5
+$as_echo_n "checking for broken dirname... " >&6; }
+if ${ac_cv_have_broken_dirname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                        save_LIBS="$LIBS"
+                        LIBS="$LIBS -lgen"
+                        if test "$cross_compiling" = yes; then :
+   ac_cv_have_broken_dirname="no"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <libgen.h>
+#include <string.h>
+
+int main(int argc, char **argv) {
+    char *s, buf[32];
+
+    strncpy(buf,"/etc", 32);
+    s = dirname(buf);
+    if (!s || strncmp(s, "/", 32) != 0) {
+        exit(1);
+    } else {
+        exit(0);
+    }
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+   ac_cv_have_broken_dirname="no"
+else
+   ac_cv_have_broken_dirname="yes"
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+                        LIBS="$save_LIBS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_broken_dirname" >&5
+$as_echo "$ac_cv_have_broken_dirname" >&6; }
+                if test "x$ac_cv_have_broken_dirname" = "xno" ; then
+                        LIBS="$LIBS -lgen"
+                        $as_echo "#define HAVE_DIRNAME 1" >>confdefs.h
+
+                        for ac_header in libgen.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "libgen.h" "ac_cv_header_libgen_h" "$ac_includes_default"
+if test "x$ac_cv_header_libgen_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBGEN_H 1
+_ACEOF
+
+fi
+
+done
+
+                fi
+
+fi
+
+
+fi
+done
+
+
+ac_fn_c_check_func "$LINENO" "getspnam" "ac_cv_func_getspnam"
+if test "x$ac_cv_func_getspnam" = xyes; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getspnam in -lgen" >&5
+$as_echo_n "checking for getspnam in -lgen... " >&6; }
+if ${ac_cv_lib_gen_getspnam+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgen  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char getspnam ();
+int
+main ()
+{
+return getspnam ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_gen_getspnam=yes
+else
+  ac_cv_lib_gen_getspnam=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gen_getspnam" >&5
+$as_echo "$ac_cv_lib_gen_getspnam" >&6; }
+if test "x$ac_cv_lib_gen_getspnam" = xyes; then :
+  LIBS="$LIBS -lgen"
+fi
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing basename" >&5
+$as_echo_n "checking for library containing basename... " >&6; }
+if ${ac_cv_search_basename+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char basename ();
+int
+main ()
+{
+return basename ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' gen; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_basename=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_basename+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_basename+:} false; then :
+
+else
+  ac_cv_search_basename=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_basename" >&5
+$as_echo "$ac_cv_search_basename" >&6; }
+ac_res=$ac_cv_search_basename
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+$as_echo "#define HAVE_BASENAME 1" >>confdefs.h
+
+fi
+
+
+zlib=yes
+
+# Check whether --with-zlib was given.
+if test "${with_zlib+set}" = set; then :
+  withval=$with_zlib;  if test "x$withval" = "xno" ; then
+                zlib=no
+          elif test "x$withval" != "xyes"; then
+                if test -d "$withval/lib"; then
+                        if test -n "${rpath_opt}"; then
+                                LDFLAGS="-L${withval}/lib ${rpath_opt}${withval}/lib ${LDFLAGS}"
+                        else
+                                LDFLAGS="-L${withval}/lib ${LDFLAGS}"
+                        fi
+                else
+                        if test -n "${rpath_opt}"; then
+                                LDFLAGS="-L${withval} ${rpath_opt}${withval} ${LDFLAGS}"
+                        else
+                                LDFLAGS="-L${withval} ${LDFLAGS}"
+                        fi
+                fi
+                if test -d "$withval/include"; then
+                        CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
+                else
+                        CPPFLAGS="-I${withval} ${CPPFLAGS}"
+                fi
+        fi
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5
+$as_echo_n "checking for zlib... " >&6; }
+if test "x${zlib}" = "xno"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define WITH_ZLIB 1" >>confdefs.h
+
+    ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_zlib_h" = xyes; then :
+
+else
+  as_fn_error $? "*** zlib.h missing - please install first or check config.log ***" "$LINENO" 5
+fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5
+$as_echo_n "checking for deflate in -lz... " >&6; }
+if ${ac_cv_lib_z_deflate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char deflate ();
+int
+main ()
+{
+return deflate ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_z_deflate=yes
+else
+  ac_cv_lib_z_deflate=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5
+$as_echo "$ac_cv_lib_z_deflate" >&6; }
+if test "x$ac_cv_lib_z_deflate" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBZ 1
+_ACEOF
+
+  LIBS="-lz $LIBS"
+
+else
+
+                saved_CPPFLAGS="$CPPFLAGS"
+                saved_LDFLAGS="$LDFLAGS"
+                save_LIBS="$LIBS"
+                                if test -n "${rpath_opt}"; then
+                        LDFLAGS="-L/usr/local/lib ${rpath_opt}/usr/local/lib ${saved_LDFLAGS}"
+                else
+                        LDFLAGS="-L/usr/local/lib ${saved_LDFLAGS}"
+                fi
+                CPPFLAGS="-I/usr/local/include ${saved_CPPFLAGS}"
+                LIBS="$LIBS -lz"
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char deflate ();
+int
+main ()
+{
+return deflate ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  $as_echo "#define HAVE_LIBZ 1" >>confdefs.h
+
+else
+
+                                as_fn_error $? "*** zlib missing - please install first or check config.log ***" "$LINENO" 5
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+
+fi
+
+
+
+# Check whether --with-zlib-version-check was given.
+if test "${with_zlib_version_check+set}" = set; then :
+  withval=$with_zlib_version_check;   if test "x$withval" = "xno" ; then
+                zlib_check_nonfatal=1
+           fi
+
+
+fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for possibly buggy zlib" >&5
+$as_echo_n "checking for possibly buggy zlib... " >&6; }
+    if test "$cross_compiling" = yes; then :
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking zlib version" >&5
+$as_echo "$as_me: WARNING: cross compiling: not checking zlib version" >&2;}
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <zlib.h>
+
+int
+main ()
+{
+
+        int a=0, b=0, c=0, d=0, n, v;
+        n = sscanf(ZLIB_VERSION, "%d.%d.%d.%d", &a, &b, &c, &d);
+        if (n != 3 && n != 4)
+                exit(1);
+        v = a*1000000 + b*10000 + c*100 + d;
+        fprintf(stderr, "found zlib version %s (%d)\n", ZLIB_VERSION, v);
+
+        /* 1.1.4 is OK */
+        if (a == 1 && b == 1 && c >= 4)
+                exit(0);
+
+        /* 1.2.3 and up are OK */
+        if (v >= 1020300)
+                exit(0);
+
+        exit(2);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+          if test -z "$zlib_check_nonfatal" ; then
+                as_fn_error $? "*** zlib too old - check config.log ***
+Your reported zlib version has known security problems.  It's possible your
+vendor has fixed these problems without changing the version number.  If you
+are sure this is the case, you can disable the check by running
+\"./configure --without-zlib-version-check\".
+If you are in doubt, upgrade zlib to version 1.2.3 or greater.
+See http://www.gzip.org/zlib/ for details." "$LINENO" 5
+          else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: zlib version may have security problems" >&5
+$as_echo "$as_me: WARNING: zlib version may have security problems" >&2;}
+          fi
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+
+ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp"
+if test "x$ac_cv_func_strcasecmp" = xyes; then :
+
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strcasecmp in -lresolv" >&5
+$as_echo_n "checking for strcasecmp in -lresolv... " >&6; }
+if ${ac_cv_lib_resolv_strcasecmp+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lresolv  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char strcasecmp ();
+int
+main ()
+{
+return strcasecmp ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_resolv_strcasecmp=yes
+else
+  ac_cv_lib_resolv_strcasecmp=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_strcasecmp" >&5
+$as_echo "$ac_cv_lib_resolv_strcasecmp" >&6; }
+if test "x$ac_cv_lib_resolv_strcasecmp" = xyes; then :
+  LIBS="$LIBS -lresolv"
+fi
+
+
+fi
+
+for ac_func in utimes
+do :
+  ac_fn_c_check_func "$LINENO" "utimes" "ac_cv_func_utimes"
+if test "x$ac_cv_func_utimes" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_UTIMES 1
+_ACEOF
+
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for utimes in -lc89" >&5
+$as_echo_n "checking for utimes in -lc89... " >&6; }
+if ${ac_cv_lib_c89_utimes+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lc89  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char utimes ();
+int
+main ()
+{
+return utimes ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_c89_utimes=yes
+else
+  ac_cv_lib_c89_utimes=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c89_utimes" >&5
+$as_echo "$ac_cv_lib_c89_utimes" >&6; }
+if test "x$ac_cv_lib_c89_utimes" = xyes; then :
+  $as_echo "#define HAVE_UTIMES 1" >>confdefs.h
+
+                                        LIBS="$LIBS -lc89"
+fi
+
+
+fi
+done
+
+
+for ac_header in bsd/libutil.h libutil.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fmt_scaled" >&5
+$as_echo_n "checking for library containing fmt_scaled... " >&6; }
+if ${ac_cv_search_fmt_scaled+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char fmt_scaled ();
+int
+main ()
+{
+return fmt_scaled ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' util bsd; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_fmt_scaled=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_fmt_scaled+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_fmt_scaled+:} false; then :
+
+else
+  ac_cv_search_fmt_scaled=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fmt_scaled" >&5
+$as_echo "$ac_cv_search_fmt_scaled" >&6; }
+ac_res=$ac_cv_search_fmt_scaled
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing scan_scaled" >&5
+$as_echo_n "checking for library containing scan_scaled... " >&6; }
+if ${ac_cv_search_scan_scaled+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char scan_scaled ();
+int
+main ()
+{
+return scan_scaled ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' util bsd; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_scan_scaled=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_scan_scaled+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_scan_scaled+:} false; then :
+
+else
+  ac_cv_search_scan_scaled=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_scan_scaled" >&5
+$as_echo "$ac_cv_search_scan_scaled" >&6; }
+ac_res=$ac_cv_search_scan_scaled
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing login" >&5
+$as_echo_n "checking for library containing login... " >&6; }
+if ${ac_cv_search_login+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char login ();
+int
+main ()
+{
+return login ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' util bsd; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_login=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_login+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_login+:} false; then :
+
+else
+  ac_cv_search_login=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_login" >&5
+$as_echo "$ac_cv_search_login" >&6; }
+ac_res=$ac_cv_search_login
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing logout" >&5
+$as_echo_n "checking for library containing logout... " >&6; }
+if ${ac_cv_search_logout+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char logout ();
+int
+main ()
+{
+return logout ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' util bsd; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_logout=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_logout+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_logout+:} false; then :
+
+else
+  ac_cv_search_logout=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_logout" >&5
+$as_echo "$ac_cv_search_logout" >&6; }
+ac_res=$ac_cv_search_logout
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing logwtmp" >&5
+$as_echo_n "checking for library containing logwtmp... " >&6; }
+if ${ac_cv_search_logwtmp+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char logwtmp ();
+int
+main ()
+{
+return logwtmp ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' util bsd; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_logwtmp=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_logwtmp+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_logwtmp+:} false; then :
+
+else
+  ac_cv_search_logwtmp=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_logwtmp" >&5
+$as_echo "$ac_cv_search_logwtmp" >&6; }
+ac_res=$ac_cv_search_logwtmp
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing openpty" >&5
+$as_echo_n "checking for library containing openpty... " >&6; }
+if ${ac_cv_search_openpty+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char openpty ();
+int
+main ()
+{
+return openpty ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' util bsd; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_openpty=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_openpty+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_openpty+:} false; then :
+
+else
+  ac_cv_search_openpty=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_openpty" >&5
+$as_echo "$ac_cv_search_openpty" >&6; }
+ac_res=$ac_cv_search_openpty
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing updwtmp" >&5
+$as_echo_n "checking for library containing updwtmp... " >&6; }
+if ${ac_cv_search_updwtmp+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char updwtmp ();
+int
+main ()
+{
+return updwtmp ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' util bsd; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_updwtmp=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_updwtmp+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_updwtmp+:} false; then :
+
+else
+  ac_cv_search_updwtmp=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_updwtmp" >&5
+$as_echo "$ac_cv_search_updwtmp" >&6; }
+ac_res=$ac_cv_search_updwtmp
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+for ac_func in fmt_scaled scan_scaled login logout openpty updwtmp logwtmp
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+# On some platforms, inet_ntop and gethostbyname may be found in libresolv
+# or libnsl.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntop" >&5
+$as_echo_n "checking for library containing inet_ntop... " >&6; }
+if ${ac_cv_search_inet_ntop+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char inet_ntop ();
+int
+main ()
+{
+return inet_ntop ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' resolv nsl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_inet_ntop=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_inet_ntop+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_inet_ntop+:} false; then :
+
+else
+  ac_cv_search_inet_ntop=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_ntop" >&5
+$as_echo "$ac_cv_search_inet_ntop" >&6; }
+ac_res=$ac_cv_search_inet_ntop
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5
+$as_echo_n "checking for library containing gethostbyname... " >&6; }
+if ${ac_cv_search_gethostbyname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gethostbyname ();
+int
+main ()
+{
+return gethostbyname ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' resolv nsl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_gethostbyname=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_gethostbyname+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_gethostbyname+:} false; then :
+
+else
+  ac_cv_search_gethostbyname=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5
+$as_echo "$ac_cv_search_gethostbyname" >&6; }
+ac_res=$ac_cv_search_gethostbyname
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+
+# "Particular Function Checks"
+# see https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Particular-Functions.html
+for ac_func in strftime
+do :
+  ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime"
+if test "x$ac_cv_func_strftime" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_STRFTIME 1
+_ACEOF
+
+else
+  # strftime is in -lintl on SCO UNIX.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5
+$as_echo_n "checking for strftime in -lintl... " >&6; }
+if ${ac_cv_lib_intl_strftime+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lintl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char strftime ();
+int
+main ()
+{
+return strftime ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_intl_strftime=yes
+else
+  ac_cv_lib_intl_strftime=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5
+$as_echo "$ac_cv_lib_intl_strftime" >&6; }
+if test "x$ac_cv_lib_intl_strftime" = xyes; then :
+  $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h
+
+LIBS="-lintl $LIBS"
+fi
+
+fi
+done
+
+for ac_header in stdlib.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdlib_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_STDLIB_H 1
+_ACEOF
+
+fi
+
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
+$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
+if ${ac_cv_func_malloc_0_nonnull+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_malloc_0_nonnull=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+# include <stdlib.h>
+#else
+char *malloc ();
+#endif
+
+int
+main ()
+{
+return ! malloc (0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_malloc_0_nonnull=yes
+else
+  ac_cv_func_malloc_0_nonnull=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
+$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
+if test $ac_cv_func_malloc_0_nonnull = yes; then :
+
+$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
+
+else
+  $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
+
+   case " $LIBOBJS " in
+  *" malloc.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS malloc.$ac_objext"
+ ;;
+esac
+
+
+$as_echo "#define malloc rpl_malloc" >>confdefs.h
+
+fi
+
+
+for ac_header in stdlib.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdlib_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_STDLIB_H 1
+_ACEOF
+
+fi
+
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5
+$as_echo_n "checking for GNU libc compatible realloc... " >&6; }
+if ${ac_cv_func_realloc_0_nonnull+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_realloc_0_nonnull=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+# include <stdlib.h>
+#else
+char *realloc ();
+#endif
+
+int
+main ()
+{
+return ! realloc (0, 0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_realloc_0_nonnull=yes
+else
+  ac_cv_func_realloc_0_nonnull=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5
+$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; }
+if test $ac_cv_func_realloc_0_nonnull = yes; then :
+
+$as_echo "#define HAVE_REALLOC 1" >>confdefs.h
+
+else
+  $as_echo "#define HAVE_REALLOC 0" >>confdefs.h
+
+   case " $LIBOBJS " in
+  *" realloc.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS realloc.$ac_objext"
+ ;;
+esac
+
+
+$as_echo "#define realloc rpl_realloc" >>confdefs.h
+
+fi
+
+
+# autoconf doesn't have AC_FUNC_CALLOC so fake it if malloc returns NULL;
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if calloc(0, N) returns non-null" >&5
+$as_echo_n "checking if calloc(0, N) returns non-null... " >&6; }
+if test "$cross_compiling" = yes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: assuming same as malloc" >&5
+$as_echo "$as_me: WARNING: cross compiling: assuming same as malloc" >&2;}
+          func_calloc_0_nonnull="$ac_cv_func_malloc_0_nonnull"
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <stdlib.h>
+int
+main ()
+{
+ void *p = calloc(0, 1); exit(p == NULL);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+   func_calloc_0_nonnull=yes
+else
+   func_calloc_0_nonnull=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $func_calloc_0_nonnull" >&5
+$as_echo "$func_calloc_0_nonnull" >&6; }
+
+if test "x$func_calloc_0_nonnull" = "xyes"; then
+
+$as_echo "#define HAVE_CALLOC 1" >>confdefs.h
+
+else
+
+$as_echo "#define HAVE_CALLOC 0" >>confdefs.h
+
+
+$as_echo "#define calloc rpl_calloc" >>confdefs.h
+
+fi
+
+# Check for ALTDIRFUNC glob() extension
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLOB_ALTDIRFUNC support" >&5
+$as_echo_n "checking for GLOB_ALTDIRFUNC support... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                #include <glob.h>
+                #ifdef GLOB_ALTDIRFUNC
+                FOUNDIT
+                #endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "FOUNDIT" >/dev/null 2>&1; then :
+
+
+$as_echo "#define GLOB_HAS_ALTDIRFUNC 1" >>confdefs.h
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+
+fi
+rm -f conftest*
+
+
+# Check for g.gl_matchc glob() extension
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gl_matchc field in glob_t" >&5
+$as_echo_n "checking for gl_matchc field in glob_t... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <glob.h>
+int
+main ()
+{
+ glob_t g; g.gl_matchc = 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+
+$as_echo "#define GLOB_HAS_GL_MATCHC 1" >>confdefs.h
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+# Check for g.gl_statv glob() extension
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gl_statv and GLOB_KEEPSTAT extensions for glob" >&5
+$as_echo_n "checking for gl_statv and GLOB_KEEPSTAT extensions for glob... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <glob.h>
+int
+main ()
+{
+
+#ifndef GLOB_KEEPSTAT
+#error "glob does not support GLOB_KEEPSTAT extension"
+#endif
+glob_t g;
+g.gl_statv = NULL;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+
+$as_echo "#define GLOB_HAS_GL_STATV 1" >>confdefs.h
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ac_fn_c_check_decl "$LINENO" "GLOB_NOMATCH" "ac_cv_have_decl_GLOB_NOMATCH" "#include <glob.h>
+"
+if test "x$ac_cv_have_decl_GLOB_NOMATCH" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GLOB_NOMATCH $ac_have_decl
+_ACEOF
+
+
+ac_fn_c_check_decl "$LINENO" "VIS_ALL" "ac_cv_have_decl_VIS_ALL" "#include <vis.h>
+"
+if test "x$ac_cv_have_decl_VIS_ALL" = xyes; then :
+
+else
+
+$as_echo "#define BROKEN_STRNVIS 1" >>confdefs.h
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct dirent allocates space for d_name" >&5
+$as_echo_n "checking whether struct dirent allocates space for d_name... " >&6; }
+if test "$cross_compiling" = yes; then :
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: assuming BROKEN_ONE_BYTE_DIRENT_D_NAME" >&5
+$as_echo "$as_me: WARNING: cross compiling: assuming BROKEN_ONE_BYTE_DIRENT_D_NAME" >&2;}
+                $as_echo "#define BROKEN_ONE_BYTE_DIRENT_D_NAME 1" >>confdefs.h
+
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <dirent.h>
+int
+main ()
+{
+
+        struct dirent d;
+        exit(sizeof(d.d_name)<=sizeof(char));
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+$as_echo "#define BROKEN_ONE_BYTE_DIRENT_D_NAME 1" >>confdefs.h
+
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /proc/pid/fd directory" >&5
+$as_echo_n "checking for /proc/pid/fd directory... " >&6; }
+if test -d "/proc/$$/fd" ; then
+
+$as_echo "#define HAVE_PROC_PID 1" >>confdefs.h
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+# Check whether user wants to use ldns
+LDNS_MSG="no"
+
+# Check whether --with-ldns was given.
+if test "${with_ldns+set}" = set; then :
+  withval=$with_ldns;
+        ldns=""
+        if test "x$withval" = "xyes" ; then
+                if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ldns-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ldns-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_LDNSCONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $LDNSCONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_LDNSCONFIG="$LDNSCONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_LDNSCONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+LDNSCONFIG=$ac_cv_path_LDNSCONFIG
+if test -n "$LDNSCONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDNSCONFIG" >&5
+$as_echo "$LDNSCONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_LDNSCONFIG"; then
+  ac_pt_LDNSCONFIG=$LDNSCONFIG
+  # Extract the first word of "ldns-config", so it can be a program name with args.
+set dummy ldns-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_LDNSCONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_LDNSCONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_LDNSCONFIG="$ac_pt_LDNSCONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_LDNSCONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_LDNSCONFIG=$ac_cv_path_ac_pt_LDNSCONFIG
+if test -n "$ac_pt_LDNSCONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_LDNSCONFIG" >&5
+$as_echo "$ac_pt_LDNSCONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_LDNSCONFIG" = x; then
+    LDNSCONFIG="no"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    LDNSCONFIG=$ac_pt_LDNSCONFIG
+  fi
+else
+  LDNSCONFIG="$ac_cv_path_LDNSCONFIG"
+fi
+
+                if test "x$LDNSCONFIG" = "xno"; then
+                        LIBS="-lldns $LIBS"
+                        ldns=yes
+                else
+                        LIBS="$LIBS `$LDNSCONFIG --libs`"
+                        CPPFLAGS="$CPPFLAGS `$LDNSCONFIG --cflags`"
+                        ldns=yes
+                fi
+        elif test "x$withval" != "xno" ; then
+                        CPPFLAGS="$CPPFLAGS -I${withval}/include"
+                        LDFLAGS="$LDFLAGS -L${withval}/lib"
+                        LIBS="-lldns $LIBS"
+                        ldns=yes
+        fi
+
+        # Verify that it works.
+        if test "x$ldns" = "xyes" ; then
+
+$as_echo "#define HAVE_LDNS 1" >>confdefs.h
+
+                LDNS_MSG="yes"
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldns support" >&5
+$as_echo_n "checking for ldns support... " >&6; }
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#include <ldns/ldns.h>
+int main() { ldns_status status = ldns_verify_trusted(NULL, NULL, NULL, NULL); status=LDNS_STATUS_OK; exit(0); }
+
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+
+                                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                                        as_fn_error $? "** Incomplete or missing ldns libraries." "$LINENO" 5
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+        fi
+
+fi
+
+
+# Check whether user wants libedit support
+LIBEDIT_MSG="no"
+
+# Check whether --with-libedit was given.
+if test "${with_libedit+set}" = set; then :
+  withval=$with_libedit;  if test "x$withval" != "xno" ; then
+                if test "x$withval" = "xyes" ; then
+                        if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKGCONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKGCONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKGCONFIG=$ac_cv_path_PKGCONFIG
+if test -n "$PKGCONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5
+$as_echo "$PKGCONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKGCONFIG"; then
+  ac_pt_PKGCONFIG=$PKGCONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKGCONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKGCONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKGCONFIG="$ac_pt_PKGCONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKGCONFIG=$ac_cv_path_ac_pt_PKGCONFIG
+if test -n "$ac_pt_PKGCONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKGCONFIG" >&5
+$as_echo "$ac_pt_PKGCONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKGCONFIG" = x; then
+    PKGCONFIG="no"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKGCONFIG=$ac_pt_PKGCONFIG
+  fi
+else
+  PKGCONFIG="$ac_cv_path_PKGCONFIG"
+fi
+
+                        if test "x$PKGCONFIG" != "xno"; then
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $PKGCONFIG knows about libedit" >&5
+$as_echo_n "checking if $PKGCONFIG knows about libedit... " >&6; }
+                                if "$PKGCONFIG" libedit; then
+                                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                                        use_pkgconfig_for_libedit=yes
+                                else
+                                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                                fi
+                        fi
+                else
+                        CPPFLAGS="$CPPFLAGS -I${withval}/include"
+                        if test -n "${rpath_opt}"; then
+                                LDFLAGS="-L${withval}/lib ${rpath_opt}${withval}/lib ${LDFLAGS}"
+                        else
+                                LDFLAGS="-L${withval}/lib ${LDFLAGS}"
+                        fi
+                fi
+                if test "x$use_pkgconfig_for_libedit" = "xyes"; then
+                        LIBEDIT=`$PKGCONFIG --libs libedit`
+                        CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`"
+                else
+                        LIBEDIT="-ledit -lcurses"
+                fi
+                OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'`
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for el_init in -ledit" >&5
+$as_echo_n "checking for el_init in -ledit... " >&6; }
+if ${ac_cv_lib_edit_el_init+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ledit  $OTHERLIBS
+                 $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char el_init ();
+int
+main ()
+{
+return el_init ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_edit_el_init=yes
+else
+  ac_cv_lib_edit_el_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_el_init" >&5
+$as_echo "$ac_cv_lib_edit_el_init" >&6; }
+if test "x$ac_cv_lib_edit_el_init" = xyes; then :
+
+$as_echo "#define USE_LIBEDIT 1" >>confdefs.h
+
+                          LIBEDIT_MSG="yes"
+
+
+else
+   as_fn_error $? "libedit not found" "$LINENO" 5
+fi
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libedit version is compatible" >&5
+$as_echo_n "checking if libedit version is compatible... " >&6; }
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <histedit.h>
+int
+main ()
+{
+
+        int i = H_SETSIZE;
+        el_init("", NULL, NULL, NULL);
+        exit(0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                      as_fn_error $? "libedit version is not compatible" "$LINENO" 5
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+        fi
+
+fi
+
+
+AUDIT_MODULE=none
+
+# Check whether --with-audit was given.
+if test "${with_audit+set}" = set; then :
+  withval=$with_audit;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for supported audit module" >&5
+$as_echo_n "checking for supported audit module... " >&6; }
+          case "$withval" in
+          bsm)
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: bsm" >&5
+$as_echo "bsm" >&6; }
+                AUDIT_MODULE=bsm
+                                for ac_header in bsm/audit.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "bsm/audit.h" "ac_cv_header_bsm_audit_h" "
+#ifdef HAVE_TIME_H
+# include <time.h>
+#endif
+
+
+"
+if test "x$ac_cv_header_bsm_audit_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_BSM_AUDIT_H 1
+_ACEOF
+
+else
+  as_fn_error $? "BSM enabled and bsm/audit.h not found" "$LINENO" 5
+fi
+
+done
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaudit in -lbsm" >&5
+$as_echo_n "checking for getaudit in -lbsm... " >&6; }
+if ${ac_cv_lib_bsm_getaudit+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lbsm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char getaudit ();
+int
+main ()
+{
+return getaudit ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_bsm_getaudit=yes
+else
+  ac_cv_lib_bsm_getaudit=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsm_getaudit" >&5
+$as_echo "$ac_cv_lib_bsm_getaudit" >&6; }
+if test "x$ac_cv_lib_bsm_getaudit" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBBSM 1
+_ACEOF
+
+  LIBS="-lbsm $LIBS"
+
+else
+  as_fn_error $? "BSM enabled and required library not found" "$LINENO" 5
+fi
+
+                for ac_func in getaudit
+do :
+  ac_fn_c_check_func "$LINENO" "getaudit" "ac_cv_func_getaudit"
+if test "x$ac_cv_func_getaudit" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GETAUDIT 1
+_ACEOF
+
+else
+  as_fn_error $? "BSM enabled and required function not found" "$LINENO" 5
+fi
+done
+
+                # These are optional
+                for ac_func in getaudit_addr aug_get_machine
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+$as_echo "#define USE_BSM_AUDIT 1" >>confdefs.h
+
+                if test "$sol2ver" -ge 11; then
+                        SSHDLIBS="$SSHDLIBS -lscf"
+
+$as_echo "#define BROKEN_BSM_API 1" >>confdefs.h
+
+                fi
+                ;;
+          linux)
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: linux" >&5
+$as_echo "linux" >&6; }
+                AUDIT_MODULE=linux
+                                for ac_header in libaudit.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "libaudit.h" "ac_cv_header_libaudit_h" "$ac_includes_default"
+if test "x$ac_cv_header_libaudit_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBAUDIT_H 1
+_ACEOF
+
+fi
+
+done
+
+                SSHDLIBS="$SSHDLIBS -laudit"
+
+$as_echo "#define USE_LINUX_AUDIT 1" >>confdefs.h
+
+                ;;
+          debug)
+                AUDIT_MODULE=debug
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: debug" >&5
+$as_echo "debug" >&6; }
+
+$as_echo "#define SSH_AUDIT_EVENTS 1" >>confdefs.h
+
+                ;;
+          no)
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                ;;
+          *)
+                as_fn_error $? "Unknown audit module $withval" "$LINENO" 5
+                ;;
+        esac
+
+fi
+
+
+
+# Check whether --with-pie was given.
+if test "${with_pie+set}" = set; then :
+  withval=$with_pie;
+        if test "x$withval" = "xno"; then
+                use_pie=no
+        fi
+        if test "x$withval" = "xyes"; then
+                use_pie=yes
+        fi
+
+
+fi
+
+if test "x$use_pie" = "x"; then
+        use_pie=no
+fi
+if test "x$use_toolchain_hardening" != "x1" && test "x$use_pie" = "xauto"; then
+        # Turn off automatic PIE when toolchain hardening is off.
+        use_pie=no
+fi
+if test "x$use_pie" = "xauto"; then
+        # Automatic PIE requires gcc >= 4.x
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc >= 4.x" >&5
+$as_echo_n "checking for gcc >= 4.x... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !defined(__GNUC__) || __GNUC__ < 4
+#error gcc is too old
+#endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+          use_pie=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+if test "x$use_pie" != "xno"; then
+        SAVED_CFLAGS="$CFLAGS"
+        SAVED_LDFLAGS="$LDFLAGS"
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -fPIE" >&5
+$as_echo_n "checking if $CC supports compile flag -fPIE... " >&6; }
+        saved_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $WERROR -fPIE"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-fPIE"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                CFLAGS="$saved_CFLAGS"
+else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                 CFLAGS="$saved_CFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  CFLAGS="$saved_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+}
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $LD supports link flag -pie" >&5
+$as_echo_n "checking if $LD supports link flag -pie... " >&6; }
+        saved_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS $WERROR -pie"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-pie"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        long long p = n * o;
+        printf("%d %d %d %f %f %lld %lld %lld\n", i, j, k, l, m, n, o, p);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  LDFLAGS="$saved_LDFLAGS"
+else
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                  LDFLAGS="$saved_LDFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  LDFLAGS="$saved_LDFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+}
+        # We use both -fPIE and -pie or neither.
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether both -fPIE and -pie are supported" >&5
+$as_echo_n "checking whether both -fPIE and -pie are supported... " >&6; }
+        if echo "x $CFLAGS"  | grep ' -fPIE' >/dev/null 2>&1 && \
+           echo "x $LDFLAGS" | grep ' -pie'  >/dev/null 2>&1 ; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                CFLAGS="$SAVED_CFLAGS"
+                LDFLAGS="$SAVED_LDFLAGS"
+        fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -fPIC is accepted" >&5
+$as_echo_n "checking whether -fPIC is accepted... " >&6; }
+SAVED_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -fPIC"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <stdlib.h>
+int
+main ()
+{
+ exit(0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    PICFLAG="-fPIC";
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    PICFLAG="";
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+CFLAGS="$SAVED_CFLAGS"
+
+
+for ac_func in  \
+        Blowfish_initstate \
+        Blowfish_expandstate \
+        Blowfish_expand0state \
+        Blowfish_stream2word \
+        SHA256Update \
+        SHA384Update \
+        SHA512Update \
+        asprintf \
+        b64_ntop \
+        __b64_ntop \
+        b64_pton \
+        __b64_pton \
+        bcopy \
+        bcrypt_pbkdf \
+        bindresvport_sa \
+        blf_enc \
+        bzero \
+        cap_rights_limit \
+        clock \
+        closefrom \
+        dirfd \
+        endgrent \
+        err \
+        errx \
+        explicit_bzero \
+        fchmod \
+        fchmodat \
+        fchown \
+        fchownat \
+        flock \
+        fnmatch \
+        freeaddrinfo \
+        freezero \
+        fstatfs \
+        fstatvfs \
+        futimes \
+        getaddrinfo \
+        getcwd \
+        getgrouplist \
+        getline \
+        getnameinfo \
+        getopt \
+        getpagesize \
+        getpeereid \
+        getpeerucred \
+        getpgid \
+        _getpty \
+        getrlimit \
+        getrandom \
+        getsid \
+        getttyent \
+        glob \
+        group_from_gid \
+        inet_aton \
+        inet_ntoa \
+        inet_ntop \
+        innetgr \
+        llabs \
+        localtime_r \
+        login_getcapbool \
+        md5_crypt \
+        memmem \
+        memmove \
+        memset_s \
+        mkdtemp \
+        ngetaddrinfo \
+        nsleep \
+        ogetaddrinfo \
+        openlog_r \
+        pledge \
+        poll \
+        prctl \
+        pstat \
+        raise \
+        readpassphrase \
+        reallocarray \
+        realpath \
+        recvmsg \
+        recallocarray \
+        rresvport_af \
+        sendmsg \
+        setdtablesize \
+        setegid \
+        setenv \
+        seteuid \
+        setgroupent \
+        setgroups \
+        setlinebuf \
+        setlogin \
+        setpassent\
+        setpcred \
+        setproctitle \
+        setregid \
+        setreuid \
+        setrlimit \
+        setsid \
+        setvbuf \
+        sigaction \
+        sigvec \
+        snprintf \
+        socketpair \
+        statfs \
+        statvfs \
+        strcasestr \
+        strdup \
+        strerror \
+        strlcat \
+        strlcpy \
+        strmode \
+        strndup \
+        strnlen \
+        strnvis \
+        strptime \
+        strsignal \
+        strtonum \
+        strtoll \
+        strtoul \
+        strtoull \
+        swap32 \
+        sysconf \
+        tcgetpgrp \
+        timingsafe_bcmp \
+        truncate \
+        unsetenv \
+        updwtmpx \
+        utimensat \
+        user_from_uid \
+        usleep \
+        vasprintf \
+        vsnprintf \
+        waitpid \
+        warn \
+
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+ac_fn_c_check_decl "$LINENO" "bzero" "ac_cv_have_decl_bzero" "$ac_includes_default"
+if test "x$ac_cv_have_decl_bzero" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_BZERO $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "memmem" "ac_cv_have_decl_memmem" "$ac_includes_default"
+if test "x$ac_cv_have_decl_memmem" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_MEMMEM $ac_have_decl
+_ACEOF
+
+
+for ac_func in mblen mbtowc nl_langinfo wcwidth
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+TEST_SSH_UTF8=${TEST_SSH_UTF8:=yes}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for utf8 locale support" >&5
+$as_echo_n "checking for utf8 locale support... " >&6; }
+if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: assuming yes" >&5
+$as_echo "$as_me: WARNING: cross compiling: assuming yes" >&2;}
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <locale.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+
+        char *loc = setlocale(LC_CTYPE, "en_US.UTF-8");
+        if (loc != NULL)
+                exit(0);
+        exit(1);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+         TEST_SSH_UTF8=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <ctype.h>
+int
+main ()
+{
+ return (isblank('a'));
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+$as_echo "#define HAVE_ISBLANK 1" >>confdefs.h
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+disable_pkcs11=
+# Check whether --enable-pkcs11 was given.
+if test "${enable_pkcs11+set}" = set; then :
+  enableval=$enable_pkcs11;
+                if test "x$enableval" = "xno" ; then
+                        disable_pkcs11=1
+                fi
+
+
+fi
+
+
+disable_sk=
+# Check whether --enable-security-key was given.
+if test "${enable_security_key+set}" = set; then :
+  enableval=$enable_security_key;
+                if test "x$enableval" = "xno" ; then
+                        disable_sk=1
+                fi
+
+
+fi
+
+enable_sk_internal=
+
+# Check whether --with-security-key-builtin was given.
+if test "${with_security_key_builtin+set}" = set; then :
+  withval=$with_security_key_builtin;
+                if test "x$withval" != "xno" ; then
+                        enable_sk_internal=yes
+                fi
+
+
+fi
+
+test "x$disable_sk" != "x" && enable_sk_internal=""
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+$as_echo_n "checking for library containing dlopen... " >&6; }
+if ${ac_cv_search_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' dl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_dlopen=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_dlopen+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_dlopen+:} false; then :
+
+else
+  ac_cv_search_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
+$as_echo "$ac_cv_search_dlopen" >&6; }
+ac_res=$ac_cv_search_dlopen
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+for ac_func in dlopen
+do :
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLOPEN 1
+_ACEOF
+
+fi
+done
+
+ac_fn_c_check_decl "$LINENO" "RTLD_NOW" "ac_cv_have_decl_RTLD_NOW" "#include <dlfcn.h>
+"
+if test "x$ac_cv_have_decl_RTLD_NOW" = xyes; then :
+
+fi
+
+
+# IRIX has a const char return value for gai_strerror()
+for ac_func in gai_strerror
+do :
+  ac_fn_c_check_func "$LINENO" "gai_strerror" "ac_cv_func_gai_strerror"
+if test "x$ac_cv_func_gai_strerror" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GAI_STRERROR 1
+_ACEOF
+
+        $as_echo "#define HAVE_GAI_STRERROR 1" >>confdefs.h
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+
+const char *gai_strerror(int);
+
+int
+main ()
+{
+
+        char *str;
+        str = gai_strerror(0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+
+$as_echo "#define HAVE_CONST_GAI_STRERROR_PROTO 1" >>confdefs.h
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+done
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing nanosleep" >&5
+$as_echo_n "checking for library containing nanosleep... " >&6; }
+if ${ac_cv_search_nanosleep+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char nanosleep ();
+int
+main ()
+{
+return nanosleep ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' rt posix4; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_nanosleep=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_nanosleep+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_nanosleep+:} false; then :
+
+else
+  ac_cv_search_nanosleep=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_nanosleep" >&5
+$as_echo "$ac_cv_search_nanosleep" >&6; }
+ac_res=$ac_cv_search_nanosleep
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+$as_echo "#define HAVE_NANOSLEEP 1" >>confdefs.h
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5
+$as_echo_n "checking for library containing clock_gettime... " >&6; }
+if ${ac_cv_search_clock_gettime+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char clock_gettime ();
+int
+main ()
+{
+return clock_gettime ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' rt; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_clock_gettime=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_clock_gettime+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_clock_gettime+:} false; then :
+
+else
+  ac_cv_search_clock_gettime=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5
+$as_echo "$ac_cv_search_clock_gettime" >&6; }
+ac_res=$ac_cv_search_clock_gettime
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+$as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
+
+fi
+
+
+ac_fn_c_check_decl "$LINENO" "strsep" "ac_cv_have_decl_strsep" "
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+
+"
+if test "x$ac_cv_have_decl_strsep" = xyes; then :
+  for ac_func in strsep
+do :
+  ac_fn_c_check_func "$LINENO" "strsep" "ac_cv_func_strsep"
+if test "x$ac_cv_func_strsep" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_STRSEP 1
+_ACEOF
+
+fi
+done
+
+fi
+
+
+ac_fn_c_check_decl "$LINENO" "tcsendbreak" "ac_cv_have_decl_tcsendbreak" "#include <termios.h>
+
+"
+if test "x$ac_cv_have_decl_tcsendbreak" = xyes; then :
+  $as_echo "#define HAVE_TCSENDBREAK 1" >>confdefs.h
+
+else
+  for ac_func in tcsendbreak
+do :
+  ac_fn_c_check_func "$LINENO" "tcsendbreak" "ac_cv_func_tcsendbreak"
+if test "x$ac_cv_func_tcsendbreak" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_TCSENDBREAK 1
+_ACEOF
+
+fi
+done
+
+fi
+
+
+ac_fn_c_check_decl "$LINENO" "h_errno" "ac_cv_have_decl_h_errno" "#include <netdb.h>
+"
+if test "x$ac_cv_have_decl_h_errno" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_H_ERRNO $ac_have_decl
+_ACEOF
+
+
+ac_fn_c_check_decl "$LINENO" "SHUT_RD" "ac_cv_have_decl_SHUT_RD" "
+#include <sys/types.h>
+#include <sys/socket.h>
+
+"
+if test "x$ac_cv_have_decl_SHUT_RD" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_SHUT_RD $ac_have_decl
+_ACEOF
+
+
+ac_fn_c_check_decl "$LINENO" "O_NONBLOCK" "ac_cv_have_decl_O_NONBLOCK" "
+#include <sys/types.h>
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
+
+"
+if test "x$ac_cv_have_decl_O_NONBLOCK" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_O_NONBLOCK $ac_have_decl
+_ACEOF
+
+
+ac_fn_c_check_decl "$LINENO" "readv" "ac_cv_have_decl_readv" "
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <unistd.h>
+
+"
+if test "x$ac_cv_have_decl_readv" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_READV $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "writev" "ac_cv_have_decl_writev" "
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <unistd.h>
+
+"
+if test "x$ac_cv_have_decl_writev" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_WRITEV $ac_have_decl
+_ACEOF
+
+
+ac_fn_c_check_decl "$LINENO" "MAXSYMLINKS" "ac_cv_have_decl_MAXSYMLINKS" "
+#include <sys/param.h>
+
+"
+if test "x$ac_cv_have_decl_MAXSYMLINKS" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_MAXSYMLINKS $ac_have_decl
+_ACEOF
+
+
+ac_fn_c_check_decl "$LINENO" "offsetof" "ac_cv_have_decl_offsetof" "
+#include <stddef.h>
+
+"
+if test "x$ac_cv_have_decl_offsetof" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_OFFSETOF $ac_have_decl
+_ACEOF
+
+
+# extra bits for select(2)
+ac_fn_c_check_decl "$LINENO" "howmany" "ac_cv_have_decl_howmany" "
+#include <sys/param.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_SYSMACROS_H
+#include <sys/sysmacros.h>
+#endif
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+"
+if test "x$ac_cv_have_decl_howmany" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_HOWMANY $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "NFDBITS" "ac_cv_have_decl_NFDBITS" "
+#include <sys/param.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_SYSMACROS_H
+#include <sys/sysmacros.h>
+#endif
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+"
+if test "x$ac_cv_have_decl_NFDBITS" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_NFDBITS $ac_have_decl
+_ACEOF
+
+ac_fn_c_check_type "$LINENO" "fd_mask" "ac_cv_type_fd_mask" "
+#include <sys/param.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+"
+if test "x$ac_cv_type_fd_mask" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_FD_MASK 1
+_ACEOF
+
+
+fi
+
+
+for ac_func in setresuid
+do :
+  ac_fn_c_check_func "$LINENO" "setresuid" "ac_cv_func_setresuid"
+if test "x$ac_cv_func_setresuid" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SETRESUID 1
+_ACEOF
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if setresuid seems to work" >&5
+$as_echo_n "checking if setresuid seems to work... " >&6; }
+        if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking setresuid" >&5
+$as_echo "$as_me: WARNING: cross compiling: not checking setresuid" >&2;}
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <errno.h>
+
+int
+main ()
+{
+
+        errno=0;
+        setresuid(0,0,0);
+        if (errno==ENOSYS)
+                exit(1);
+        else
+                exit(0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+
+$as_echo "#define BROKEN_SETRESUID 1" >>confdefs.h
+
+                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: not implemented" >&5
+$as_echo "not implemented" >&6; }
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+fi
+done
+
+
+for ac_func in setresgid
+do :
+  ac_fn_c_check_func "$LINENO" "setresgid" "ac_cv_func_setresgid"
+if test "x$ac_cv_func_setresgid" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SETRESGID 1
+_ACEOF
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if setresgid seems to work" >&5
+$as_echo_n "checking if setresgid seems to work... " >&6; }
+        if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking setresuid" >&5
+$as_echo "$as_me: WARNING: cross compiling: not checking setresuid" >&2;}
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <errno.h>
+
+int
+main ()
+{
+
+        errno=0;
+        setresgid(0,0,0);
+        if (errno==ENOSYS)
+                exit(1);
+        else
+                exit(0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+
+$as_echo "#define BROKEN_SETRESGID 1" >>confdefs.h
+
+                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: not implemented" >&5
+$as_echo "not implemented" >&6; }
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+fi
+done
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fflush(NULL)" >&5
+$as_echo_n "checking for working fflush(NULL)... " >&6; }
+if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: assuming working" >&5
+$as_echo "$as_me: WARNING: cross compiling: assuming working" >&2;}
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+fflush(NULL); exit(0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+$as_echo "#define FFLUSH_NULL_BUG 1" >>confdefs.h
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+for ac_func in gettimeofday time
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+for ac_func in endutent getutent getutid getutline pututline setutent
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+for ac_func in utmpname
+do :
+  ac_fn_c_check_func "$LINENO" "utmpname" "ac_cv_func_utmpname"
+if test "x$ac_cv_func_utmpname" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_UTMPNAME 1
+_ACEOF
+
+fi
+done
+
+for ac_func in endutxent getutxent getutxid getutxline getutxuser pututxline
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+for ac_func in setutxdb setutxent utmpxname
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+for ac_func in getlastlogxbyname
+do :
+  ac_fn_c_check_func "$LINENO" "getlastlogxbyname" "ac_cv_func_getlastlogxbyname"
+if test "x$ac_cv_func_getlastlogxbyname" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GETLASTLOGXBYNAME 1
+_ACEOF
+
+fi
+done
+
+
+ac_fn_c_check_func "$LINENO" "daemon" "ac_cv_func_daemon"
+if test "x$ac_cv_func_daemon" = xyes; then :
+
+$as_echo "#define HAVE_DAEMON 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for daemon in -lbsd" >&5
+$as_echo_n "checking for daemon in -lbsd... " >&6; }
+if ${ac_cv_lib_bsd_daemon+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lbsd  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char daemon ();
+int
+main ()
+{
+return daemon ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_bsd_daemon=yes
+else
+  ac_cv_lib_bsd_daemon=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_daemon" >&5
+$as_echo "$ac_cv_lib_bsd_daemon" >&6; }
+if test "x$ac_cv_lib_bsd_daemon" = xyes; then :
+  LIBS="$LIBS -lbsd"; $as_echo "#define HAVE_DAEMON 1" >>confdefs.h
+
+fi
+
+
+fi
+
+
+ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
+if test "x$ac_cv_func_getpagesize" = xyes; then :
+
+$as_echo "#define HAVE_GETPAGESIZE 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpagesize in -lucb" >&5
+$as_echo_n "checking for getpagesize in -lucb... " >&6; }
+if ${ac_cv_lib_ucb_getpagesize+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lucb  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char getpagesize ();
+int
+main ()
+{
+return getpagesize ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_ucb_getpagesize=yes
+else
+  ac_cv_lib_ucb_getpagesize=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ucb_getpagesize" >&5
+$as_echo "$ac_cv_lib_ucb_getpagesize" >&6; }
+if test "x$ac_cv_lib_ucb_getpagesize" = xyes; then :
+  LIBS="$LIBS -lucb"; $as_echo "#define HAVE_GETPAGESIZE 1" >>confdefs.h
+
+fi
+
+
+fi
+
+
+# Check for broken snprintf
+if test "x$ac_cv_func_snprintf" = "xyes" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether snprintf correctly terminates long strings" >&5
+$as_echo_n "checking whether snprintf correctly terminates long strings... " >&6; }
+        if test "$cross_compiling" = yes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: Assuming working snprintf()" >&5
+$as_echo "$as_me: WARNING: cross compiling: Assuming working snprintf()" >&2;}
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <stdio.h>
+int
+main ()
+{
+
+        char b[5];
+        snprintf(b,5,"123456789");
+        exit(b[4]!='\0');
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+$as_echo "#define BROKEN_SNPRINTF 1" >>confdefs.h
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ****** Your snprintf() function is broken, complain to your vendor" >&5
+$as_echo "$as_me: WARNING: ****** Your snprintf() function is broken, complain to your vendor" >&2;}
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+
+if test "x$ac_cv_func_snprintf" = "xyes" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether snprintf understands %zu" >&5
+$as_echo_n "checking whether snprintf understands %zu... " >&6; }
+        if test "$cross_compiling" = yes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: Assuming working snprintf()" >&5
+$as_echo "$as_me: WARNING: cross compiling: Assuming working snprintf()" >&2;}
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <stdio.h>
+
+int
+main ()
+{
+
+        size_t a = 1, b = 2;
+        char z[128];
+        snprintf(z, sizeof z, "%zu%zu", a, b);
+        exit(strcmp(z, "12"));
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+$as_echo "#define BROKEN_SNPRINTF 1" >>confdefs.h
+
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+
+# We depend on vsnprintf returning the right thing on overflow: the
+# number of characters it tried to create (as per SUSv3)
+if test "x$ac_cv_func_vsnprintf" = "xyes" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether vsnprintf returns correct values on overflow" >&5
+$as_echo_n "checking whether vsnprintf returns correct values on overflow... " >&6; }
+        if test "$cross_compiling" = yes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: Assuming working vsnprintf()" >&5
+$as_echo "$as_me: WARNING: cross compiling: Assuming working vsnprintf()" >&2;}
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+int x_snprintf(char *str, size_t count, const char *fmt, ...)
+{
+        size_t ret;
+        va_list ap;
+
+        va_start(ap, fmt);
+        ret = vsnprintf(str, count, fmt, ap);
+        va_end(ap);
+        return ret;
+}
+
+int
+main ()
+{
+
+char x[1];
+if (x_snprintf(x, 1, "%s %d", "hello", 12345) != 11)
+        return 1;
+if (x_snprintf(NULL, 0, "%s %d", "hello", 12345) != 11)
+        return 1;
+return 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+$as_echo "#define BROKEN_SNPRINTF 1" >>confdefs.h
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ****** Your vsnprintf() function is broken, complain to your vendor" >&5
+$as_echo "$as_me: WARNING: ****** Your vsnprintf() function is broken, complain to your vendor" >&2;}
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+
+# On systems where [v]snprintf is broken, but is declared in stdio,
+# check that the fmt argument is const char * or just char *.
+# This is only useful for when BROKEN_SNPRINTF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether snprintf can declare const char *fmt" >&5
+$as_echo_n "checking whether snprintf can declare const char *fmt... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+int snprintf(char *a, size_t b, const char *c, ...) { return 0; }
+
+int
+main ()
+{
+
+        snprintf(0, 0, 0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define SNPRINTF_CONST const" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    $as_echo "#define SNPRINTF_CONST /* not const */" >>confdefs.h
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+# Check for missing getpeereid (or equiv) support
+NO_PEERCHECK=""
+if test "x$ac_cv_func_getpeereid" != "xyes" -a "x$ac_cv_func_getpeerucred" != "xyes"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system supports SO_PEERCRED getsockopt" >&5
+$as_echo_n "checking whether system supports SO_PEERCRED getsockopt... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+int
+main ()
+{
+int i = SO_PEERCRED;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_SO_PEERCRED 1" >>confdefs.h
+
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                NO_PEERCHECK=1
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+if test "x$ac_cv_func_mkdtemp" = "xyes" ; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for (overly) strict mkstemp" >&5
+$as_echo_n "checking for (overly) strict mkstemp... " >&6; }
+if test "$cross_compiling" = yes; then :
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                $as_echo "#define HAVE_STRICT_MKSTEMP 1" >>confdefs.h
+
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+
+int
+main ()
+{
+
+        char template[]="conftest.mkstemp-test";
+        if (mkstemp(template) == -1)
+                exit(1);
+        unlink(template);
+        exit(0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+else
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_STRICT_MKSTEMP 1" >>confdefs.h
+
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+
+if test ! -z "$check_for_openpty_ctty_bug"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if openpty correctly handles controlling tty" >&5
+$as_echo_n "checking if openpty correctly handles controlling tty... " >&6; }
+        if test "$cross_compiling" = yes; then :
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compiling, assuming yes" >&5
+$as_echo "cross-compiling, assuming yes" >&6; }
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+#include <sys/fcntl.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+int
+main ()
+{
+
+        pid_t pid;
+        int fd, ptyfd, ttyfd, status;
+
+        pid = fork();
+        if (pid < 0) {          /* failed */
+                exit(1);
+        } else if (pid > 0) {   /* parent */
+                waitpid(pid, &status, 0);
+                if (WIFEXITED(status))
+                        exit(WEXITSTATUS(status));
+                else
+                        exit(2);
+        } else {                /* child */
+                close(0); close(1); close(2);
+                setsid();
+                openpty(&ptyfd, &ttyfd, NULL, NULL, NULL);
+                fd = open("/dev/tty", O_RDWR | O_NOCTTY);
+                if (fd >= 0)
+                        exit(3);        /* Acquired ctty: broken */
+                else
+                        exit(0);        /* Did not acquire ctty: OK */
+        }
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                        $as_echo "#define SSHD_ACQUIRES_CTTY 1" >>confdefs.h
+
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+
+if test "x$ac_cv_func_getaddrinfo" = "xyes" && \
+    test "x$check_for_hpux_broken_getaddrinfo" = "x1"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo seems to work" >&5
+$as_echo_n "checking if getaddrinfo seems to work... " >&6; }
+        if test "$cross_compiling" = yes; then :
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compiling, assuming yes" >&5
+$as_echo "cross-compiling, assuming yes" >&6; }
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <errno.h>
+#include <netinet/in.h>
+
+#define TEST_PORT "2222"
+
+int
+main ()
+{
+
+        int err, sock;
+        struct addrinfo *gai_ai, *ai, hints;
+        char ntop[NI_MAXHOST], strport[NI_MAXSERV], *name = NULL;
+
+        memset(&hints, 0, sizeof(hints));
+        hints.ai_family = PF_UNSPEC;
+        hints.ai_socktype = SOCK_STREAM;
+        hints.ai_flags = AI_PASSIVE;
+
+        err = getaddrinfo(name, TEST_PORT, &hints, &gai_ai);
+        if (err != 0) {
+                fprintf(stderr, "getaddrinfo failed (%s)", gai_strerror(err));
+                exit(1);
+        }
+
+        for (ai = gai_ai; ai != NULL; ai = ai->ai_next) {
+                if (ai->ai_family != AF_INET6)
+                        continue;
+
+                err = getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop,
+                    sizeof(ntop), strport, sizeof(strport),
+                    NI_NUMERICHOST|NI_NUMERICSERV);
+
+                if (err != 0) {
+                        if (err == EAI_SYSTEM)
+                                perror("getnameinfo EAI_SYSTEM");
+                        else
+                                fprintf(stderr, "getnameinfo failed: %s\n",
+                                    gai_strerror(err));
+                        exit(2);
+                }
+
+                sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+                if (sock < 0)
+                        perror("socket");
+                if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) {
+                        if (errno == EBADF)
+                                exit(3);
+                }
+        }
+        exit(0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                        $as_echo "#define BROKEN_GETADDRINFO 1" >>confdefs.h
+
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+
+if test "x$ac_cv_func_getaddrinfo" = "xyes" && \
+    test "x$check_for_aix_broken_getaddrinfo" = "x1"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo seems to work" >&5
+$as_echo_n "checking if getaddrinfo seems to work... " >&6; }
+        if test "$cross_compiling" = yes; then :
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compiling, assuming no" >&5
+$as_echo "cross-compiling, assuming no" >&6; }
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <errno.h>
+#include <netinet/in.h>
+
+#define TEST_PORT "2222"
+
+int
+main ()
+{
+
+        int err, sock;
+        struct addrinfo *gai_ai, *ai, hints;
+        char ntop[NI_MAXHOST], strport[NI_MAXSERV], *name = NULL;
+
+        memset(&hints, 0, sizeof(hints));
+        hints.ai_family = PF_UNSPEC;
+        hints.ai_socktype = SOCK_STREAM;
+        hints.ai_flags = AI_PASSIVE;
+
+        err = getaddrinfo(name, TEST_PORT, &hints, &gai_ai);
+        if (err != 0) {
+                fprintf(stderr, "getaddrinfo failed (%s)", gai_strerror(err));
+                exit(1);
+        }
+
+        for (ai = gai_ai; ai != NULL; ai = ai->ai_next) {
+                if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6)
+                        continue;
+
+                err = getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop,
+                    sizeof(ntop), strport, sizeof(strport),
+                    NI_NUMERICHOST|NI_NUMERICSERV);
+
+                if (ai->ai_family == AF_INET && err != 0) {
+                        perror("getnameinfo");
+                        exit(2);
+                }
+        }
+        exit(0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define AIX_GETNAMEINFO_HACK 1" >>confdefs.h
+
+
+else
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                        $as_echo "#define BROKEN_GETADDRINFO 1" >>confdefs.h
+
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+
+if test "x$ac_cv_func_getaddrinfo" = "xyes"; then
+        ac_fn_c_check_decl "$LINENO" "AI_NUMERICSERV" "ac_cv_have_decl_AI_NUMERICSERV" "#include <sys/types.h>
+             #include <sys/socket.h>
+             #include <netdb.h>
+"
+if test "x$ac_cv_have_decl_AI_NUMERICSERV" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_AI_NUMERICSERV $ac_have_decl
+_ACEOF
+
+fi
+
+if test "x$check_for_conflicting_getspnam" = "x1"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for conflicting getspnam in shadow.h" >&5
+$as_echo_n "checking for conflicting getspnam in shadow.h... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <shadow.h>
+int
+main ()
+{
+ exit(0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+else
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define GETSPNAM_CONFLICTING_DEFS 1" >>confdefs.h
+
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+if test "x$ac_cv_func_strnvis" = "xyes"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strnvis" >&5
+$as_echo_n "checking for working strnvis... " >&6; }
+        if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: assuming broken" >&5
+$as_echo "$as_me: WARNING: cross compiling: assuming broken" >&2;}
+
+$as_echo "#define BROKEN_STRNVIS 1" >>confdefs.h
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <signal.h>
+#include <stdlib.h>
+#include <string.h>
+#include <vis.h>
+static void sighandler(int sig) { _exit(1); }
+
+int
+main ()
+{
+
+        char dst[16];
+
+        signal(SIGSEGV, sighandler);
+        if (strnvis(dst, "src", 4, 0) && strcmp(dst, "src") == 0)
+                exit(0);
+        exit(1)
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+$as_echo "#define BROKEN_STRNVIS 1" >>confdefs.h
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+
+for ac_func in getpgrp
+do :
+  ac_fn_c_check_func "$LINENO" "getpgrp" "ac_cv_func_getpgrp"
+if test "x$ac_cv_func_getpgrp" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GETPGRP 1
+_ACEOF
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if getpgrp accepts zero args" >&5
+$as_echo_n "checking if getpgrp accepts zero args... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+ getpgrp();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define GETPGRP_VOID 1" >>confdefs.h
+
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+$as_echo "#define GETPGRP_VOID 0" >>confdefs.h
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+done
+
+
+# Search for OpenSSL
+saved_CPPFLAGS="$CPPFLAGS"
+saved_LDFLAGS="$LDFLAGS"
+
+# Check whether --with-ssl-dir was given.
+if test "${with_ssl_dir+set}" = set; then :
+  withval=$with_ssl_dir;
+                if test "x$openssl" = "xno" ; then
+                        as_fn_error $? "cannot use --with-ssl-dir when OpenSSL disabled" "$LINENO" 5
+                fi
+                if test "x$withval" != "xno" ; then
+                        case "$withval" in
+                                # Relative paths
+                                ./*|../*)       withval="`pwd`/$withval"
+                        esac
+                        if test -d "$withval/lib"; then
+                                if test -n "${rpath_opt}"; then
+                                        LDFLAGS="-L${withval}/lib ${rpath_opt}${withval}/lib ${LDFLAGS}"
+                                else
+                                        LDFLAGS="-L${withval}/lib ${LDFLAGS}"
+                                fi
+                        elif test -d "$withval/lib64"; then
+                                if test -n "${rpath_opt}"; then
+                                        LDFLAGS="-L${withval}/lib64 ${rpath_opt}${withval}/lib64 ${LDFLAGS}"
+                                else
+                                        LDFLAGS="-L${withval}/lib64 ${LDFLAGS}"
+                                fi
+                        else
+                                if test -n "${rpath_opt}"; then
+                                        LDFLAGS="-L${withval} ${rpath_opt}${withval} ${LDFLAGS}"
+                                else
+                                        LDFLAGS="-L${withval} ${LDFLAGS}"
+                                fi
+                        fi
+                        if test -d "$withval/include"; then
+                                CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
+                        else
+                                CPPFLAGS="-I${withval} ${CPPFLAGS}"
+                        fi
+                fi
+
+
+fi
+
+
+
+# Check whether --with-openssl-header-check was given.
+if test "${with_openssl_header_check+set}" = set; then :
+  withval=$with_openssl_header_check;
+                if test "x$withval" = "xno" ; then
+                        openssl_check_nonfatal=1
+                fi
+
+
+fi
+
+
+openssl_engine=no
+
+# Check whether --with-ssl-engine was given.
+if test "${with_ssl_engine+set}" = set; then :
+  withval=$with_ssl_engine;
+                if test "x$withval" != "xno" ; then
+                        if test "x$openssl" = "xno" ; then
+                                as_fn_error $? "cannot use --with-ssl-engine when OpenSSL disabled" "$LINENO" 5
+                        fi
+                        openssl_engine=yes
+                fi
+
+
+fi
+
+
+if test "x$openssl" = "xyes" ; then
+        LIBS="-lcrypto $LIBS"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char RAND_add ();
+int
+main ()
+{
+return RAND_add ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+else
+  as_fn_error $? "*** working libcrypto not found, check config.log" "$LINENO" 5
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+        ac_fn_c_check_header_mongrel "$LINENO" "openssl/opensslv.h" "ac_cv_header_openssl_opensslv_h" "$ac_includes_default"
+if test "x$ac_cv_header_openssl_opensslv_h" = xyes; then :
+
+else
+  as_fn_error $? "*** OpenSSL headers missing - please install first or check config.log ***" "$LINENO" 5
+fi
+
+
+
+        # Determine OpenSSL header version
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenSSL header version" >&5
+$as_echo_n "checking OpenSSL header version... " >&6; }
+        if test "$cross_compiling" = yes; then :
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5
+$as_echo "$as_me: WARNING: cross compiling: not checking" >&2;}
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+        #include <stdlib.h>
+        #include <stdio.h>
+        #include <string.h>
+        #include <openssl/opensslv.h>
+        #define DATA "conftest.sslincver"
+
+int
+main ()
+{
+
+                FILE *fd;
+                int rc;
+
+                fd = fopen(DATA,"w");
+                if(fd == NULL)
+                        exit(1);
+
+                if ((rc = fprintf(fd, "%08lx (%s)\n",
+                    (unsigned long)OPENSSL_VERSION_NUMBER,
+                     OPENSSL_VERSION_TEXT)) < 0)
+                        exit(1);
+
+                exit(0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+                        ssl_header_ver=`cat conftest.sslincver`
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ssl_header_ver" >&5
+$as_echo "$ssl_header_ver" >&6; }
+
+else
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+                        as_fn_error $? "OpenSSL version header not found." "$LINENO" 5
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+        # Determining OpenSSL library version is version dependent.
+        for ac_func in OpenSSL_version OpenSSL_version_num
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+        # Determine OpenSSL library version
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenSSL library version" >&5
+$as_echo_n "checking OpenSSL library version... " >&6; }
+        if test "$cross_compiling" = yes; then :
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5
+$as_echo "$as_me: WARNING: cross compiling: not checking" >&2;}
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+        #include <stdio.h>
+        #include <string.h>
+        #include <openssl/opensslv.h>
+        #include <openssl/crypto.h>
+        #define DATA "conftest.ssllibver"
+
+int
+main ()
+{
+
+                FILE *fd;
+                int rc;
+
+                fd = fopen(DATA,"w");
+                if(fd == NULL)
+                        exit(1);
+#ifndef OPENSSL_VERSION
+# define OPENSSL_VERSION SSLEAY_VERSION
+#endif
+#ifndef HAVE_OPENSSL_VERSION
+# define OpenSSL_version        SSLeay_version
+#endif
+#ifndef HAVE_OPENSSL_VERSION_NUM
+# define OpenSSL_version_num    SSLeay
+#endif
+                if ((rc = fprintf(fd, "%08lx (%s)\n",
+                    (unsigned long)OpenSSL_version_num(),
+                    OpenSSL_version(OPENSSL_VERSION))) < 0)
+                        exit(1);
+
+                exit(0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+                        ssl_library_ver=`cat conftest.ssllibver`
+                        # Check version is supported.
+                        case "$ssl_library_ver" in
+                        10000*|0*)
+                                as_fn_error $? "OpenSSL >= 1.0.1 required (have \"$ssl_library_ver\")" "$LINENO" 5
+                                ;;
+                        100*)   ;; # 1.0.x
+                        101000[0123456]*)
+                                # https://github.com/openssl/openssl/pull/4613
+                                as_fn_error $? "OpenSSL 1.1.x versions prior to 1.1.0g have a bug that breaks their use with OpenSSH (have \"$ssl_library_ver\")" "$LINENO" 5
+                                ;;
+                        101*)   ;; # 1.1.x
+                        200*)   ;; # LibreSSL
+                        300*)   ;; # OpenSSL development branch.
+                        *)
+                                as_fn_error $? "Unknown/unsupported OpenSSL version (\"$ssl_library_ver\")" "$LINENO" 5
+                                ;;
+                        esac
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ssl_library_ver" >&5
+$as_echo "$ssl_library_ver" >&6; }
+
+else
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+                        as_fn_error $? "OpenSSL library not found." "$LINENO" 5
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+        # Sanity check OpenSSL headers
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OpenSSL's headers match the library" >&5
+$as_echo_n "checking whether OpenSSL's headers match the library... " >&6; }
+        if test "$cross_compiling" = yes; then :
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5
+$as_echo "$as_me: WARNING: cross compiling: not checking" >&2;}
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+        #include <string.h>
+        #include <openssl/opensslv.h>
+        #include <openssl/crypto.h>
+
+int
+main ()
+{
+
+#ifndef HAVE_OPENSSL_VERSION_NUM
+# define OpenSSL_version_num    SSLeay
+#endif
+                exit(OpenSSL_version_num() == OPENSSL_VERSION_NUMBER ? 0 : 1);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                        if test "x$openssl_check_nonfatal" = "x"; then
+                                as_fn_error $? "Your OpenSSL headers do not match your
+        library. Check config.log for details.
+        If you are sure your installation is consistent, you can disable the check
+        by running \"./configure --without-openssl-header-check\".
+        Also see contrib/findssl.sh for help identifying header/library mismatches.
+        " "$LINENO" 5
+                        else
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your OpenSSL headers do not match your
+        library. Check config.log for details.
+        Also see contrib/findssl.sh for help identifying header/library mismatches." >&5
+$as_echo "$as_me: WARNING: Your OpenSSL headers do not match your
+        library. Check config.log for details.
+        Also see contrib/findssl.sh for help identifying header/library mismatches." >&2;}
+                        fi
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if programs using OpenSSL functions will link" >&5
+$as_echo_n "checking if programs using OpenSSL functions will link... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <openssl/err.h>
+int
+main ()
+{
+ ERR_load_crypto_strings();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                        saved_LIBS="$LIBS"
+                        LIBS="$LIBS -ldl"
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if programs using OpenSSL need -ldl" >&5
+$as_echo_n "checking if programs using OpenSSL need -ldl... " >&6; }
+                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <openssl/err.h>
+int
+main ()
+{
+ ERR_load_crypto_strings();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+                                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+                                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                                        LIBS="$saved_LIBS"
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+        for ac_func in  \
+                BN_is_prime_ex \
+                DSA_generate_parameters_ex \
+                EVP_CIPHER_CTX_ctrl \
+                EVP_DigestFinal_ex \
+                EVP_DigestInit_ex \
+                EVP_MD_CTX_cleanup \
+                EVP_MD_CTX_copy_ex \
+                EVP_MD_CTX_init \
+                HMAC_CTX_init \
+                RSA_generate_key_ex \
+                RSA_get_default_method \
+
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+        # OpenSSL_add_all_algorithms may be a macro.
+        ac_fn_c_check_func "$LINENO" "OpenSSL_add_all_algorithms" "ac_cv_func_OpenSSL_add_all_algorithms"
+if test "x$ac_cv_func_OpenSSL_add_all_algorithms" = xyes; then :
+
+$as_echo "#define HAVE_OPENSSL_ADD_ALL_ALGORITHMS 1" >>confdefs.h
+
+else
+  ac_fn_c_check_decl "$LINENO" "OpenSSL_add_all_algorithms" "ac_cv_have_decl_OpenSSL_add_all_algorithms" "#include <openssl/evp.h>
+
+"
+if test "x$ac_cv_have_decl_OpenSSL_add_all_algorithms" = xyes; then :
+
+$as_echo "#define HAVE_OPENSSL_ADD_ALL_ALGORITHMS 1" >>confdefs.h
+
+fi
+
+
+fi
+
+
+        # LibreSSL/OpenSSL 1.1x API
+        for ac_func in  \
+                OPENSSL_init_crypto \
+                DH_get0_key \
+                DH_get0_pqg \
+                DH_set0_key \
+                DH_set_length \
+                DH_set0_pqg \
+                DSA_get0_key \
+                DSA_get0_pqg \
+                DSA_set0_key \
+                DSA_set0_pqg \
+                DSA_SIG_get0 \
+                DSA_SIG_set0 \
+                ECDSA_SIG_get0 \
+                ECDSA_SIG_set0 \
+                EVP_CIPHER_CTX_iv \
+                EVP_CIPHER_CTX_iv_noconst \
+                EVP_CIPHER_CTX_get_iv \
+                EVP_CIPHER_CTX_set_iv \
+                RSA_get0_crt_params \
+                RSA_get0_factors \
+                RSA_get0_key \
+                RSA_set0_crt_params \
+                RSA_set0_factors \
+                RSA_set0_key \
+                RSA_meth_free \
+                RSA_meth_dup \
+                RSA_meth_set1_name \
+                RSA_meth_get_finish \
+                RSA_meth_set_priv_enc \
+                RSA_meth_set_priv_dec \
+                RSA_meth_set_finish \
+                EVP_PKEY_get0_RSA \
+                EVP_MD_CTX_new \
+                EVP_MD_CTX_free \
+
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+        if test "x$openssl_engine" = "xyes" ; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL ENGINE support" >&5
+$as_echo_n "checking for OpenSSL ENGINE support... " >&6; }
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+        #include <openssl/engine.h>
+
+int
+main ()
+{
+
+                                ENGINE_load_builtin_engines();
+                                ENGINE_register_all_complete();
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define USE_OPENSSL_ENGINE 1" >>confdefs.h
+
+
+else
+   as_fn_error $? "OpenSSL ENGINE support not found" "$LINENO" 5
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+        fi
+
+        # Check for OpenSSL without EVP_aes_{192,256}_cbc
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OpenSSL has crippled AES support" >&5
+$as_echo_n "checking whether OpenSSL has crippled AES support... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+        #include <string.h>
+        #include <openssl/evp.h>
+
+int
+main ()
+{
+
+                exit(EVP_aes_192_cbc() == NULL || EVP_aes_256_cbc() == NULL);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+else
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define OPENSSL_LOBOTOMISED_AES 1" >>confdefs.h
+
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+        # Check for OpenSSL with EVP_aes_*ctr
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OpenSSL has AES CTR via EVP" >&5
+$as_echo_n "checking whether OpenSSL has AES CTR via EVP... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+        #include <string.h>
+        #include <openssl/evp.h>
+
+int
+main ()
+{
+
+                exit(EVP_aes_128_ctr() == NULL ||
+                    EVP_aes_192_cbc() == NULL ||
+                    EVP_aes_256_cbc() == NULL);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define OPENSSL_HAVE_EVPCTR 1" >>confdefs.h
+
+
+else
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+        # Check for OpenSSL with EVP_aes_*gcm
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OpenSSL has AES GCM via EVP" >&5
+$as_echo_n "checking whether OpenSSL has AES GCM via EVP... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+        #include <string.h>
+        #include <openssl/evp.h>
+
+int
+main ()
+{
+
+                exit(EVP_aes_128_gcm() == NULL ||
+                    EVP_aes_256_gcm() == NULL ||
+                    EVP_CTRL_GCM_SET_IV_FIXED == 0 ||
+                    EVP_CTRL_GCM_IV_GEN == 0 ||
+                    EVP_CTRL_GCM_SET_TAG == 0 ||
+                    EVP_CTRL_GCM_GET_TAG == 0 ||
+                    EVP_CIPHER_CTX_ctrl(NULL, 0, 0, NULL) == 0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define OPENSSL_HAVE_EVPGCM 1" >>confdefs.h
+
+
+else
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                        unsupported_algorithms="$unsupported_cipers \
+                           aes128-gcm@openssh.com \
+                           aes256-gcm@openssh.com"
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if EVP_DigestUpdate returns an int" >&5
+$as_echo_n "checking if EVP_DigestUpdate returns an int... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+        #include <string.h>
+        #include <openssl/evp.h>
+
+int
+main ()
+{
+
+                if(EVP_DigestUpdate(NULL, NULL,0))
+                        exit(0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+$as_echo "#define OPENSSL_EVP_DIGESTUPDATE_VOID 1" >>confdefs.h
+
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+        # Some systems want crypt() from libcrypt, *not* the version in OpenSSL,
+        # because the system crypt() is more featureful.
+        if test "x$check_for_libcrypt_before" = "x1"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
+$as_echo_n "checking for crypt in -lcrypt... " >&6; }
+if ${ac_cv_lib_crypt_crypt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypt  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char crypt ();
+int
+main ()
+{
+return crypt ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_crypt_crypt=yes
+else
+  ac_cv_lib_crypt_crypt=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
+$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
+if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBCRYPT 1
+_ACEOF
+
+  LIBS="-lcrypt $LIBS"
+
+fi
+
+        fi
+
+        # Some Linux systems (Slackware) need crypt() from libcrypt, *not* the
+        # version in OpenSSL.
+        if test "x$check_for_libcrypt_later" = "x1"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
+$as_echo_n "checking for crypt in -lcrypt... " >&6; }
+if ${ac_cv_lib_crypt_crypt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypt  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char crypt ();
+int
+main ()
+{
+return crypt ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_crypt_crypt=yes
+else
+  ac_cv_lib_crypt_crypt=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
+$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
+if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
+  LIBS="$LIBS -lcrypt"
+fi
+
+        fi
+        for ac_func in crypt DES_crypt
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+        # Check for SHA256, SHA384 and SHA512 support in OpenSSL
+        for ac_func in EVP_sha256 EVP_sha384 EVP_sha512
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+        # Check complete ECC support in OpenSSL
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OpenSSL has NID_X9_62_prime256v1" >&5
+$as_echo_n "checking whether OpenSSL has NID_X9_62_prime256v1... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+        #include <openssl/ec.h>
+        #include <openssl/ecdh.h>
+        #include <openssl/ecdsa.h>
+        #include <openssl/evp.h>
+        #include <openssl/objects.h>
+        #include <openssl/opensslv.h>
+
+int
+main ()
+{
+
+                EC_KEY *e = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
+                const EVP_MD *m = EVP_sha256(); /* We need this too */
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                  enable_nistp256=1
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OpenSSL has NID_secp384r1" >&5
+$as_echo_n "checking whether OpenSSL has NID_secp384r1... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+        #include <openssl/ec.h>
+        #include <openssl/ecdh.h>
+        #include <openssl/ecdsa.h>
+        #include <openssl/evp.h>
+        #include <openssl/objects.h>
+        #include <openssl/opensslv.h>
+
+int
+main ()
+{
+
+                EC_KEY *e = EC_KEY_new_by_curve_name(NID_secp384r1);
+                const EVP_MD *m = EVP_sha384(); /* We need this too */
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                  enable_nistp384=1
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OpenSSL has NID_secp521r1" >&5
+$as_echo_n "checking whether OpenSSL has NID_secp521r1... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+        #include <openssl/ec.h>
+        #include <openssl/ecdh.h>
+        #include <openssl/ecdsa.h>
+        #include <openssl/evp.h>
+        #include <openssl/objects.h>
+        #include <openssl/opensslv.h>
+
+int
+main ()
+{
+
+                EC_KEY *e = EC_KEY_new_by_curve_name(NID_secp521r1);
+                const EVP_MD *m = EVP_sha512(); /* We need this too */
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if OpenSSL's NID_secp521r1 is functional" >&5
+$as_echo_n "checking if OpenSSL's NID_secp521r1 is functional... " >&6; }
+                  if test "$cross_compiling" = yes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross-compiling: assuming yes" >&5
+$as_echo "$as_me: WARNING: cross-compiling: assuming yes" >&2;}
+                          enable_nistp521=1
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+        #include <openssl/ec.h>
+        #include <openssl/ecdh.h>
+        #include <openssl/ecdsa.h>
+        #include <openssl/evp.h>
+        #include <openssl/objects.h>
+        #include <openssl/opensslv.h>
+
+int
+main ()
+{
+
+                        EC_KEY *e = EC_KEY_new_by_curve_name(NID_secp521r1);
+                        const EVP_MD *m = EVP_sha512(); /* We need this too */
+                        exit(e == NULL || m == NULL);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                          enable_nistp521=1
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+        COMMENT_OUT_ECC="#no ecc#"
+        TEST_SSH_ECC=no
+
+        if test x$enable_nistp256 = x1 || test x$enable_nistp384 = x1 || \
+            test x$enable_nistp521 = x1; then
+
+$as_echo "#define OPENSSL_HAS_ECC 1" >>confdefs.h
+
+                for ac_func in EC_KEY_METHOD_new
+do :
+  ac_fn_c_check_func "$LINENO" "EC_KEY_METHOD_new" "ac_cv_func_EC_KEY_METHOD_new"
+if test "x$ac_cv_func_EC_KEY_METHOD_new" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_EC_KEY_METHOD_NEW 1
+_ACEOF
+
+fi
+done
+
+                openssl_ecc=yes
+        else
+                openssl_ecc=no
+        fi
+        if test x$enable_nistp256 = x1; then
+
+$as_echo "#define OPENSSL_HAS_NISTP256 1" >>confdefs.h
+
+                TEST_SSH_ECC=yes
+                COMMENT_OUT_ECC=""
+        else
+                unsupported_algorithms="$unsupported_algorithms \
+                        ecdsa-sha2-nistp256 \
+                        ecdh-sha2-nistp256 \
+                        ecdsa-sha2-nistp256-cert-v01@openssh.com"
+        fi
+        if test x$enable_nistp384 = x1; then
+
+$as_echo "#define OPENSSL_HAS_NISTP384 1" >>confdefs.h
+
+                TEST_SSH_ECC=yes
+                COMMENT_OUT_ECC=""
+        else
+                unsupported_algorithms="$unsupported_algorithms \
+                        ecdsa-sha2-nistp384 \
+                        ecdh-sha2-nistp384 \
+                        ecdsa-sha2-nistp384-cert-v01@openssh.com"
+        fi
+        if test x$enable_nistp521 = x1; then
+
+$as_echo "#define OPENSSL_HAS_NISTP521 1" >>confdefs.h
+
+                TEST_SSH_ECC=yes
+                COMMENT_OUT_ECC=""
+        else
+                unsupported_algorithms="$unsupported_algorithms \
+                        ecdh-sha2-nistp521 \
+                        ecdsa-sha2-nistp521 \
+                        ecdsa-sha2-nistp521-cert-v01@openssh.com"
+        fi
+
+
+
+else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
+$as_echo_n "checking for crypt in -lcrypt... " >&6; }
+if ${ac_cv_lib_crypt_crypt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypt  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char crypt ();
+int
+main ()
+{
+return crypt ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_crypt_crypt=yes
+else
+  ac_cv_lib_crypt_crypt=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
+$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
+if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
+  LIBS="$LIBS -lcrypt"
+fi
+
+        for ac_func in crypt
+do :
+  ac_fn_c_check_func "$LINENO" "crypt" "ac_cv_func_crypt"
+if test "x$ac_cv_func_crypt" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_CRYPT 1
+_ACEOF
+
+fi
+done
+
+fi
+
+# PKCS11/U2F depend on OpenSSL and dlopen().
+enable_pkcs11=yes
+enable_sk=yes
+if test "x$openssl" != "xyes" ; then
+        enable_pkcs11="disabled; missing libcrypto"
+        enable_sk="disabled; missing libcrypto"
+fi
+if test "x$openssl_ecc" != "xyes" ; then
+        enable_sk="disabled; OpenSSL has no ECC support"
+fi
+if test "x$ac_cv_func_dlopen" != "xyes" ; then
+        enable_pkcs11="disabled; missing dlopen(3)"
+        enable_sk="disabled; missing dlopen(3)"
+fi
+if test "x$ac_cv_have_decl_RTLD_NOW" != "xyes" ; then
+        enable_pkcs11="disabled; missing RTLD_NOW"
+        enable_sk="disabled; missing RTLD_NOW"
+fi
+if test ! -z "$disable_pkcs11" ; then
+        enable_pkcs11="disabled by user"
+fi
+if test ! -z "$disable_sk" ; then
+        enable_sk="disabled by user"
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable PKCS11" >&5
+$as_echo_n "checking whether to enable PKCS11... " >&6; }
+if test "x$enable_pkcs11" = "xyes" ; then
+
+$as_echo "#define ENABLE_PKCS11 /**/" >>confdefs.h
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_pkcs11" >&5
+$as_echo "$enable_pkcs11" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable U2F" >&5
+$as_echo_n "checking whether to enable U2F... " >&6; }
+if test "x$enable_sk" = "xyes" ; then
+
+$as_echo "#define ENABLE_SK /**/" >>confdefs.h
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_sk" >&5
+$as_echo "$enable_sk" >&6; }
+
+# Now check for built-in security key support.
+if test "x$enable_sk" = "xyes" -a "x$enable_sk_internal" = "xyes" ; then
+        if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKGCONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKGCONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKGCONFIG=$ac_cv_path_PKGCONFIG
+if test -n "$PKGCONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5
+$as_echo "$PKGCONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKGCONFIG"; then
+  ac_pt_PKGCONFIG=$PKGCONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKGCONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKGCONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKGCONFIG="$ac_pt_PKGCONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKGCONFIG=$ac_cv_path_ac_pt_PKGCONFIG
+if test -n "$ac_pt_PKGCONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKGCONFIG" >&5
+$as_echo "$ac_pt_PKGCONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKGCONFIG" = x; then
+    PKGCONFIG="no"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKGCONFIG=$ac_pt_PKGCONFIG
+  fi
+else
+  PKGCONFIG="$ac_cv_path_PKGCONFIG"
+fi
+
+        use_pkgconfig_for_libfido2=
+        if test "x$PKGCONFIG" != "xno"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $PKGCONFIG knows about libfido2" >&5
+$as_echo_n "checking if $PKGCONFIG knows about libfido2... " >&6; }
+                if "$PKGCONFIG" libfido2; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                        use_pkgconfig_for_libfido2=yes
+                else
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                fi
+        fi
+        if test "x$use_pkgconfig_for_libfido2" = "xyes"; then
+                LIBFIDO2=`$PKGCONFIG --libs libfido2`
+                CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libfido2`"
+        else
+                LIBFIDO2="-lfido2 -lcbor"
+        fi
+        OTHERLIBS=`echo $LIBFIDO2 | sed 's/-lfido2//'`
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fido_init in -lfido2" >&5
+$as_echo_n "checking for fido_init in -lfido2... " >&6; }
+if ${ac_cv_lib_fido2_fido_init+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lfido2  $OTHERLIBS
+         $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char fido_init ();
+int
+main ()
+{
+return fido_init ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_fido2_fido_init=yes
+else
+  ac_cv_lib_fido2_fido_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fido2_fido_init" >&5
+$as_echo "$ac_cv_lib_fido2_fido_init" >&6; }
+if test "x$ac_cv_lib_fido2_fido_init" = xyes; then :
+
+
+
+$as_echo "#define ENABLE_SK_INTERNAL /**/" >>confdefs.h
+
+                        enable_sk="built-in"
+
+fi
+
+fi
+
+for ac_func in  \
+        arc4random \
+        arc4random_buf \
+        arc4random_stir \
+        arc4random_uniform \
+
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+saved_LIBS="$LIBS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ia_openinfo in -liaf" >&5
+$as_echo_n "checking for ia_openinfo in -liaf... " >&6; }
+if ${ac_cv_lib_iaf_ia_openinfo+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-liaf  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ia_openinfo ();
+int
+main ()
+{
+return ia_openinfo ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_iaf_ia_openinfo=yes
+else
+  ac_cv_lib_iaf_ia_openinfo=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iaf_ia_openinfo" >&5
+$as_echo "$ac_cv_lib_iaf_ia_openinfo" >&6; }
+if test "x$ac_cv_lib_iaf_ia_openinfo" = xyes; then :
+
+        LIBS="$LIBS -liaf"
+        for ac_func in set_id
+do :
+  ac_fn_c_check_func "$LINENO" "set_id" "ac_cv_func_set_id"
+if test "x$ac_cv_func_set_id" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SET_ID 1
+_ACEOF
+ SSHDLIBS="$SSHDLIBS -liaf"
+
+$as_echo "#define HAVE_LIBIAF 1" >>confdefs.h
+
+
+fi
+done
+
+
+fi
+
+LIBS="$saved_LIBS"
+
+### Configure cryptographic random number support
+
+# Check whether OpenSSL seeds itself
+if test "x$openssl" = "xyes" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OpenSSL's PRNG is internally seeded" >&5
+$as_echo_n "checking whether OpenSSL's PRNG is internally seeded... " >&6; }
+        if test "$cross_compiling" = yes; then :
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: assuming yes" >&5
+$as_echo "$as_me: WARNING: cross compiling: assuming yes" >&2;}
+                        # This is safe, since we will fatal() at runtime if
+                        # OpenSSL is not seeded correctly.
+                        OPENSSL_SEEDS_ITSELF=yes
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+        #include <string.h>
+        #include <openssl/rand.h>
+
+int
+main ()
+{
+
+                exit(RAND_status() == 1 ? 0 : 1);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+                        OPENSSL_SEEDS_ITSELF=yes
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+
+# PRNGD TCP socket
+
+# Check whether --with-prngd-port was given.
+if test "${with_prngd_port+set}" = set; then :
+  withval=$with_prngd_port;
+                case "$withval" in
+                no)
+                        withval=""
+                        ;;
+                [0-9]*)
+                        ;;
+                *)
+                        as_fn_error $? "You must specify a numeric port number for --with-prngd-port" "$LINENO" 5
+                        ;;
+                esac
+                if test ! -z "$withval" ; then
+                        PRNGD_PORT="$withval"
+
+cat >>confdefs.h <<_ACEOF
+#define PRNGD_PORT $PRNGD_PORT
+_ACEOF
+
+                fi
+
+
+fi
+
+
+# PRNGD Unix domain socket
+
+# Check whether --with-prngd-socket was given.
+if test "${with_prngd_socket+set}" = set; then :
+  withval=$with_prngd_socket;
+                case "$withval" in
+                yes)
+                        withval="/var/run/egd-pool"
+                        ;;
+                no)
+                        withval=""
+                        ;;
+                /*)
+                        ;;
+                *)
+                        as_fn_error $? "You must specify an absolute path to the entropy socket" "$LINENO" 5
+                        ;;
+                esac
+
+                if test ! -z "$withval" ; then
+                        if test ! -z "$PRNGD_PORT" ; then
+                                as_fn_error $? "You may not specify both a PRNGD/EGD port and socket" "$LINENO" 5
+                        fi
+                        if test ! -r "$withval" ; then
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Entropy socket is not readable" >&5
+$as_echo "$as_me: WARNING: Entropy socket is not readable" >&2;}
+                        fi
+                        PRNGD_SOCKET="$withval"
+
+cat >>confdefs.h <<_ACEOF
+#define PRNGD_SOCKET "$PRNGD_SOCKET"
+_ACEOF
+
+                fi
+
+else
+
+                # Check for existing socket only if we don't have a random device already
+                if test "x$OPENSSL_SEEDS_ITSELF" != "xyes" ; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PRNGD/EGD socket" >&5
+$as_echo_n "checking for PRNGD/EGD socket... " >&6; }
+                        # Insert other locations here
+                        for sock in /var/run/egd-pool /dev/egd-pool /etc/entropy; do
+                                if test -r $sock && $TEST_MINUS_S_SH -c "test -S $sock -o -p $sock" ; then
+                                        PRNGD_SOCKET="$sock"
+                                        cat >>confdefs.h <<_ACEOF
+#define PRNGD_SOCKET "$PRNGD_SOCKET"
+_ACEOF
+
+                                        break;
+                                fi
+                        done
+                        if test ! -z "$PRNGD_SOCKET" ; then
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PRNGD_SOCKET" >&5
+$as_echo "$PRNGD_SOCKET" >&6; }
+                        else
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+                        fi
+                fi
+
+
+fi
+
+
+# Which randomness source do we use?
+if test ! -z "$PRNGD_PORT" ; then
+        RAND_MSG="PRNGd port $PRNGD_PORT"
+elif test ! -z "$PRNGD_SOCKET" ; then
+        RAND_MSG="PRNGd socket $PRNGD_SOCKET"
+elif test ! -z "$OPENSSL_SEEDS_ITSELF" ; then
+
+$as_echo "#define OPENSSL_PRNG_ONLY 1" >>confdefs.h
+
+        RAND_MSG="OpenSSL internal ONLY"
+elif test "x$openssl" = "xno" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OpenSSH will use /dev/urandom as a source of random numbers. It will fail if this device is not supported or accessible" >&5
+$as_echo "$as_me: WARNING: OpenSSH will use /dev/urandom as a source of random numbers. It will fail if this device is not supported or accessible" >&2;}
+else
+        as_fn_error $? "OpenSSH has no source of random numbers. Please configure OpenSSL with an entropy source or re-run configure using one of the --with-prngd-port or --with-prngd-socket options" "$LINENO" 5
+fi
+
+# Check for PAM libs
+PAM_MSG="no"
+
+# Check whether --with-pam was given.
+if test "${with_pam+set}" = set; then :
+  withval=$with_pam;
+                if test "x$withval" != "xno" ; then
+                        if test "x$ac_cv_header_security_pam_appl_h" != "xyes" && \
+                           test "x$ac_cv_header_pam_pam_appl_h" != "xyes" ; then
+                                as_fn_error $? "PAM headers not found" "$LINENO" 5
+                        fi
+
+                        saved_LIBS="$LIBS"
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBDL 1
+_ACEOF
+
+  LIBS="-ldl $LIBS"
+
+fi
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_set_item in -lpam" >&5
+$as_echo_n "checking for pam_set_item in -lpam... " >&6; }
+if ${ac_cv_lib_pam_pam_set_item+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpam  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pam_set_item ();
+int
+main ()
+{
+return pam_set_item ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_pam_pam_set_item=yes
+else
+  ac_cv_lib_pam_pam_set_item=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_set_item" >&5
+$as_echo "$ac_cv_lib_pam_pam_set_item" >&6; }
+if test "x$ac_cv_lib_pam_pam_set_item" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPAM 1
+_ACEOF
+
+  LIBS="-lpam $LIBS"
+
+else
+  as_fn_error $? "*** libpam missing" "$LINENO" 5
+fi
+
+                        for ac_func in pam_getenvlist
+do :
+  ac_fn_c_check_func "$LINENO" "pam_getenvlist" "ac_cv_func_pam_getenvlist"
+if test "x$ac_cv_func_pam_getenvlist" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PAM_GETENVLIST 1
+_ACEOF
+
+fi
+done
+
+                        for ac_func in pam_putenv
+do :
+  ac_fn_c_check_func "$LINENO" "pam_putenv" "ac_cv_func_pam_putenv"
+if test "x$ac_cv_func_pam_putenv" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PAM_PUTENV 1
+_ACEOF
+
+fi
+done
+
+                        LIBS="$saved_LIBS"
+
+                        PAM_MSG="yes"
+
+                        SSHDLIBS="$SSHDLIBS -lpam"
+
+$as_echo "#define USE_PAM 1" >>confdefs.h
+
+
+                        if test $ac_cv_lib_dl_dlopen = yes; then
+                                case "$LIBS" in
+                                *-ldl*)
+                                        # libdl already in LIBS
+                                        ;;
+                                *)
+                                        SSHDLIBS="$SSHDLIBS -ldl"
+                                        ;;
+                                esac
+                        fi
+                fi
+
+
+fi
+
+
+
+# Check whether --with-pam-service was given.
+if test "${with_pam_service+set}" = set; then :
+  withval=$with_pam_service;
+                if test "x$withval" != "xno" && \
+                   test "x$withval" != "xyes" ; then
+
+cat >>confdefs.h <<_ACEOF
+#define SSHD_PAM_SERVICE "$withval"
+_ACEOF
+
+                fi
+
+
+fi
+
+
+# Check for older PAM
+if test "x$PAM_MSG" = "xyes" ; then
+        # Check PAM strerror arguments (old PAM)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pam_strerror takes only one argument" >&5
+$as_echo_n "checking whether pam_strerror takes only one argument... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#if defined(HAVE_SECURITY_PAM_APPL_H)
+#include <security/pam_appl.h>
+#elif defined (HAVE_PAM_PAM_APPL_H)
+#include <pam/pam_appl.h>
+#endif
+
+int
+main ()
+{
+
+(void)pam_strerror((pam_handle_t *)NULL, -1);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+else
+
+
+$as_echo "#define HAVE_OLD_PAM 1" >>confdefs.h
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                        PAM_MSG="yes (old library)"
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+case "$host" in
+*-*-cygwin*)
+        SSH_PRIVSEP_USER=CYGWIN_SSH_PRIVSEP_USER
+        ;;
+*)
+        SSH_PRIVSEP_USER=sshd
+        ;;
+esac
+
+# Check whether --with-privsep-user was given.
+if test "${with_privsep_user+set}" = set; then :
+  withval=$with_privsep_user;
+                if test -n "$withval"  &&  test "x$withval" != "xno"  &&  \
+                    test "x${withval}" != "xyes"; then
+                        SSH_PRIVSEP_USER=$withval
+                fi
+
+
+fi
+
+if test "x$SSH_PRIVSEP_USER" = "xCYGWIN_SSH_PRIVSEP_USER" ; then
+
+cat >>confdefs.h <<_ACEOF
+#define SSH_PRIVSEP_USER CYGWIN_SSH_PRIVSEP_USER
+_ACEOF
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define SSH_PRIVSEP_USER "$SSH_PRIVSEP_USER"
+_ACEOF
+
+fi
+
+
+if test "x$have_linux_no_new_privs" = "x1" ; then
+ac_fn_c_check_decl "$LINENO" "SECCOMP_MODE_FILTER" "ac_cv_have_decl_SECCOMP_MODE_FILTER" "
+        #include <sys/types.h>
+        #include <linux/seccomp.h>
+
+"
+if test "x$ac_cv_have_decl_SECCOMP_MODE_FILTER" = xyes; then :
+  have_seccomp_filter=1
+fi
+
+fi
+if test "x$have_seccomp_filter" = "x1" ; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for seccomp_filter support" >&5
+$as_echo_n "checking kernel for seccomp_filter support... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                #include <errno.h>
+                #include <elf.h>
+                #include <linux/audit.h>
+                #include <linux/seccomp.h>
+                #include <stdlib.h>
+                #include <sys/prctl.h>
+
+int
+main ()
+{
+ int i = $seccomp_audit_arch;
+           errno = 0;
+           prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, NULL, 0, 0);
+           exit(errno == EFAULT ? 0 : 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                # Disable seccomp filter as a target
+                have_seccomp_filter=0
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+
+# Decide which sandbox style to use
+sandbox_arg=""
+
+# Check whether --with-sandbox was given.
+if test "${with_sandbox+set}" = set; then :
+  withval=$with_sandbox;
+                if test "x$withval" = "xyes" ; then
+                        sandbox_arg=""
+                else
+                        sandbox_arg="$withval"
+                fi
+
+
+fi
+
+
+# Some platforms (seems to be the ones that have a kernel poll(2)-type
+# function with which they implement select(2)) use an extra file descriptor
+# when calling select(2), which means we can't use the rlimit sandbox.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if select works with descriptor rlimit" >&5
+$as_echo_n "checking if select works with descriptor rlimit... " >&6; }
+if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: assuming yes" >&5
+$as_echo "$as_me: WARNING: cross compiling: assuming yes" >&2;}
+         select_works_with_rlimit=yes
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <sys/resource.h>
+#ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#endif
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+
+        struct rlimit rl_zero;
+        int fd, r;
+        fd_set fds;
+        struct timeval tv;
+
+        fd = open("/dev/null", O_RDONLY);
+        FD_ZERO(&fds);
+        FD_SET(fd, &fds);
+        rl_zero.rlim_cur = rl_zero.rlim_max = 0;
+        setrlimit(RLIMIT_FSIZE, &rl_zero);
+        setrlimit(RLIMIT_NOFILE, &rl_zero);
+        tv.tv_sec = 1;
+        tv.tv_usec = 0;
+        r = select(fd+1, &fds, NULL, NULL, &tv);
+        exit (r == -1 ? 1 : 0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+         select_works_with_rlimit=yes
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+         select_works_with_rlimit=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if setrlimit(RLIMIT_NOFILE,{0,0}) works" >&5
+$as_echo_n "checking if setrlimit(RLIMIT_NOFILE,{0,0}) works... " >&6; }
+if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: assuming yes" >&5
+$as_echo "$as_me: WARNING: cross compiling: assuming yes" >&2;}
+         rlimit_nofile_zero_works=yes
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <sys/resource.h>
+#include <errno.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+
+        struct rlimit rl_zero;
+        int r;
+
+        rl_zero.rlim_cur = rl_zero.rlim_max = 0;
+        r = setrlimit(RLIMIT_NOFILE, &rl_zero);
+        exit (r == -1 ? 1 : 0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+         rlimit_nofile_zero_works=yes
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+         rlimit_nofile_zero_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if setrlimit RLIMIT_FSIZE works" >&5
+$as_echo_n "checking if setrlimit RLIMIT_FSIZE works... " >&6; }
+if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: assuming yes" >&5
+$as_echo "$as_me: WARNING: cross compiling: assuming yes" >&2;}
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/resource.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+
+                struct rlimit rl_zero;
+
+                rl_zero.rlim_cur = rl_zero.rlim_max = 0;
+                exit(setrlimit(RLIMIT_FSIZE, &rl_zero) != 0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+$as_echo "#define SANDBOX_SKIP_RLIMIT_FSIZE 1" >>confdefs.h
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+if test "x$sandbox_arg" = "xpledge" || \
+   ( test -z "$sandbox_arg" && test "x$ac_cv_func_pledge" = "xyes" ) ; then
+        test "x$ac_cv_func_pledge" != "xyes" && \
+                as_fn_error $? "pledge sandbox requires pledge(2) support" "$LINENO" 5
+        SANDBOX_STYLE="pledge"
+
+$as_echo "#define SANDBOX_PLEDGE 1" >>confdefs.h
+
+elif test "x$sandbox_arg" = "xsystrace" || \
+   ( test -z "$sandbox_arg" && test "x$have_systr_policy_kill" = "x1" ) ; then
+        test "x$have_systr_policy_kill" != "x1" && \
+                as_fn_error $? "systrace sandbox requires systrace headers and SYSTR_POLICY_KILL support" "$LINENO" 5
+        SANDBOX_STYLE="systrace"
+
+$as_echo "#define SANDBOX_SYSTRACE 1" >>confdefs.h
+
+elif test "x$sandbox_arg" = "xdarwin" || \
+     ( test -z "$sandbox_arg" && test "x$ac_cv_func_sandbox_init" = "xyes" && \
+       test "x$ac_cv_header_sandbox_h" = "xyes") ; then
+        test "x$ac_cv_func_sandbox_init" != "xyes" -o \
+             "x$ac_cv_header_sandbox_h" != "xyes" && \
+                as_fn_error $? "Darwin seatbelt sandbox requires sandbox.h and sandbox_init function" "$LINENO" 5
+        SANDBOX_STYLE="darwin"
+
+$as_echo "#define SANDBOX_DARWIN 1" >>confdefs.h
+
+elif test "x$sandbox_arg" = "xseccomp_filter" || \
+     ( test -z "$sandbox_arg" && \
+       test "x$have_seccomp_filter" = "x1" && \
+       test "x$ac_cv_header_elf_h" = "xyes" && \
+       test "x$ac_cv_header_linux_audit_h" = "xyes" && \
+       test "x$ac_cv_header_linux_filter_h" = "xyes" && \
+       test "x$seccomp_audit_arch" != "x" && \
+       test "x$have_linux_no_new_privs" = "x1" && \
+       test "x$ac_cv_func_prctl" = "xyes" ) ; then
+        test "x$seccomp_audit_arch" = "x" && \
+                as_fn_error $? "seccomp_filter sandbox not supported on $host" "$LINENO" 5
+        test "x$have_linux_no_new_privs" != "x1" && \
+                as_fn_error $? "seccomp_filter sandbox requires PR_SET_NO_NEW_PRIVS" "$LINENO" 5
+        test "x$have_seccomp_filter" != "x1" && \
+                as_fn_error $? "seccomp_filter sandbox requires seccomp headers" "$LINENO" 5
+        test "x$ac_cv_func_prctl" != "xyes" && \
+                as_fn_error $? "seccomp_filter sandbox requires prctl function" "$LINENO" 5
+        SANDBOX_STYLE="seccomp_filter"
+
+$as_echo "#define SANDBOX_SECCOMP_FILTER 1" >>confdefs.h
+
+elif test "x$sandbox_arg" = "xcapsicum" || \
+     ( test -z "$sandbox_arg" && \
+       test "x$ac_cv_header_sys_capsicum_h" = "xyes" && \
+       test "x$ac_cv_func_cap_rights_limit" = "xyes") ; then
+       test "x$ac_cv_header_sys_capsicum_h" != "xyes" && \
+                as_fn_error $? "capsicum sandbox requires sys/capsicum.h header" "$LINENO" 5
+       test "x$ac_cv_func_cap_rights_limit" != "xyes" && \
+                as_fn_error $? "capsicum sandbox requires cap_rights_limit function" "$LINENO" 5
+       SANDBOX_STYLE="capsicum"
+
+$as_echo "#define SANDBOX_CAPSICUM 1" >>confdefs.h
+
+elif test "x$sandbox_arg" = "xrlimit" || \
+     ( test -z "$sandbox_arg" && test "x$ac_cv_func_setrlimit" = "xyes" && \
+       test "x$select_works_with_rlimit" = "xyes" && \
+       test "x$rlimit_nofile_zero_works" = "xyes" ) ; then
+        test "x$ac_cv_func_setrlimit" != "xyes" && \
+                as_fn_error $? "rlimit sandbox requires setrlimit function" "$LINENO" 5
+        test "x$select_works_with_rlimit" != "xyes" && \
+                as_fn_error $? "rlimit sandbox requires select to work with rlimit" "$LINENO" 5
+        SANDBOX_STYLE="rlimit"
+
+$as_echo "#define SANDBOX_RLIMIT 1" >>confdefs.h
+
+elif test "x$sandbox_arg" = "xsolaris" || \
+   ( test -z "$sandbox_arg" && test "x$SOLARIS_PRIVS" = "xyes" ) ; then
+        SANDBOX_STYLE="solaris"
+
+$as_echo "#define SANDBOX_SOLARIS 1" >>confdefs.h
+
+elif test -z "$sandbox_arg" || test "x$sandbox_arg" = "xno" || \
+     test "x$sandbox_arg" = "xnone" || test "x$sandbox_arg" = "xnull" ; then
+        SANDBOX_STYLE="none"
+
+$as_echo "#define SANDBOX_NULL 1" >>confdefs.h
+
+else
+        as_fn_error $? "unsupported --with-sandbox" "$LINENO" 5
+fi
+
+# Cheap hack to ensure NEWS-OS libraries are arranged right.
+if test ! -z "$SONY" ; then
+  LIBS="$LIBS -liberty";
+fi
+
+# Check for  long long datatypes
+ac_fn_c_check_type "$LINENO" "long long" "ac_cv_type_long_long" "$ac_includes_default"
+if test "x$ac_cv_type_long_long" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_LONG_LONG 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_type "$LINENO" "unsigned long long" "ac_cv_type_unsigned_long_long" "$ac_includes_default"
+if test "x$ac_cv_type_unsigned_long_long" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_UNSIGNED_LONG_LONG 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_type "$LINENO" "long double" "ac_cv_type_long_double" "$ac_includes_default"
+if test "x$ac_cv_type_long_double" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_LONG_DOUBLE 1
+_ACEOF
+
+
+fi
+
+
+# Check datatype sizes
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short int" >&5
+$as_echo_n "checking size of short int... " >&6; }
+if ${ac_cv_sizeof_short_int+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short int))" "ac_cv_sizeof_short_int"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_short_int" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (short int)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_short_int=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short_int" >&5
+$as_echo "$ac_cv_sizeof_short_int" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_SHORT_INT $ac_cv_sizeof_short_int
+_ACEOF
+
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+$as_echo_n "checking size of int... " >&6; }
+if ${ac_cv_sizeof_int+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_int" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (int)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_int=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
+$as_echo "$ac_cv_sizeof_int" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+_ACEOF
+
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long int" >&5
+$as_echo_n "checking size of long int... " >&6; }
+if ${ac_cv_sizeof_long_int+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long int))" "ac_cv_sizeof_long_int"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long_int" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (long int)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_long_int=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_int" >&5
+$as_echo "$ac_cv_sizeof_long_int" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG_INT $ac_cv_sizeof_long_int
+_ACEOF
+
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long int" >&5
+$as_echo_n "checking size of long long int... " >&6; }
+if ${ac_cv_sizeof_long_long_int+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long int))" "ac_cv_sizeof_long_long_int"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long_long_int" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (long long int)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_long_long_int=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long_int" >&5
+$as_echo "$ac_cv_sizeof_long_long_int" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int
+_ACEOF
+
+
+
+# Sanity check long long for some platforms (AIX)
+if test "x$ac_cv_sizeof_long_long_int" = "x4" ; then
+        ac_cv_sizeof_long_long_int=0
+fi
+
+# compute LLONG_MIN and LLONG_MAX if we don't know them.
+if test -z "$have_llong_max"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for max value of long long" >&5
+$as_echo_n "checking for max value of long long... " >&6; }
+        if test "$cross_compiling" = yes; then :
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5
+$as_echo "$as_me: WARNING: cross compiling: not checking" >&2;}
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+/* Why is this so damn hard? */
+#ifdef __GNUC__
+# undef __GNUC__
+#endif
+#define __USE_ISOC99
+#include <limits.h>
+#define DATA "conftest.llminmax"
+#define my_abs(a) ((a) < 0 ? ((a) * -1) : (a))
+
+/*
+ * printf in libc on some platforms (eg old Tru64) does not understand %lld so
+ * we do this the hard way.
+ */
+static int
+fprint_ll(FILE *f, long long n)
+{
+        unsigned int i;
+        int l[sizeof(long long) * 8];
+
+        if (n < 0)
+                if (fprintf(f, "-") < 0)
+                        return -1;
+        for (i = 0; n != 0; i++) {
+                l[i] = my_abs(n % 10);
+                n /= 10;
+        }
+        do {
+                if (fprintf(f, "%d", l[--i]) < 0)
+                        return -1;
+        } while (i != 0);
+        if (fprintf(f, " ") < 0)
+                return -1;
+        return 0;
+}
+
+int
+main ()
+{
+
+        FILE *f;
+        long long i, llmin, llmax = 0;
+
+        if((f = fopen(DATA,"w")) == NULL)
+                exit(1);
+
+#if defined(LLONG_MIN) && defined(LLONG_MAX)
+        fprintf(stderr, "Using system header for LLONG_MIN and LLONG_MAX\n");
+        llmin = LLONG_MIN;
+        llmax = LLONG_MAX;
+#else
+        fprintf(stderr, "Calculating  LLONG_MIN and LLONG_MAX\n");
+        /* This will work on one's complement and two's complement */
+        for (i = 1; i > llmax; i <<= 1, i++)
+                llmax = i;
+        llmin = llmax + 1LL;    /* wrap */
+#endif
+
+        /* Sanity check */
+        if (llmin + 1 < llmin || llmin - 1 < llmin || llmax + 1 > llmax
+            || llmax - 1 > llmax || llmin == llmax || llmin == 0
+            || llmax == 0 || llmax < LONG_MAX || llmin > LONG_MIN) {
+                fprintf(f, "unknown unknown\n");
+                exit(2);
+        }
+
+        if (fprint_ll(f, llmin) < 0)
+                exit(3);
+        if (fprint_ll(f, llmax) < 0)
+                exit(4);
+        if (fclose(f) < 0)
+                exit(5);
+        exit(0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+                        llong_min=`$AWK '{print $1}' conftest.llminmax`
+                        llong_max=`$AWK '{print $2}' conftest.llminmax`
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $llong_max" >&5
+$as_echo "$llong_max" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define LLONG_MAX ${llong_max}LL
+_ACEOF
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for min value of long long" >&5
+$as_echo_n "checking for min value of long long... " >&6; }
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $llong_min" >&5
+$as_echo "$llong_min" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define LLONG_MIN ${llong_min}LL
+_ACEOF
+
+
+else
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+
+ac_fn_c_check_decl "$LINENO" "UINT32_MAX" "ac_cv_have_decl_UINT32_MAX" "
+#ifdef HAVE_SYS_LIMITS_H
+# include <sys/limits.h>
+#endif
+#ifdef HAVE_LIMITS_H
+# include <limits.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+
+"
+if test "x$ac_cv_have_decl_UINT32_MAX" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_UINT32_MAX $ac_have_decl
+_ACEOF
+
+
+# More checks for data types
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for u_int type" >&5
+$as_echo_n "checking for u_int type... " >&6; }
+if ${ac_cv_have_u_int+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <sys/types.h>
+int
+main ()
+{
+ u_int a; a = 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_u_int="yes"
+else
+   ac_cv_have_u_int="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_u_int" >&5
+$as_echo "$ac_cv_have_u_int" >&6; }
+if test "x$ac_cv_have_u_int" = "xyes" ; then
+
+$as_echo "#define HAVE_U_INT 1" >>confdefs.h
+
+        have_u_int=1
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for intXX_t types" >&5
+$as_echo_n "checking for intXX_t types... " >&6; }
+if ${ac_cv_have_intxx_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <sys/types.h>
+int
+main ()
+{
+ int8_t a; int16_t b; int32_t c; a = b = c = 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_intxx_t="yes"
+else
+   ac_cv_have_intxx_t="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_intxx_t" >&5
+$as_echo "$ac_cv_have_intxx_t" >&6; }
+if test "x$ac_cv_have_intxx_t" = "xyes" ; then
+
+$as_echo "#define HAVE_INTXX_T 1" >>confdefs.h
+
+        have_intxx_t=1
+fi
+
+if (test -z "$have_intxx_t" && \
+           test "x$ac_cv_header_stdint_h" = "xyes")
+then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intXX_t types in stdint.h" >&5
+$as_echo_n "checking for intXX_t types in stdint.h... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <stdint.h>
+int
+main ()
+{
+ int8_t a; int16_t b; int32_t c; a = b = c = 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        $as_echo "#define HAVE_INTXX_T 1" >>confdefs.h
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for int64_t type" >&5
+$as_echo_n "checking for int64_t type... " >&6; }
+if ${ac_cv_have_int64_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#include <sys/socket.h>
+#ifdef HAVE_SYS_BITYPES_H
+# include <sys/bitypes.h>
+#endif
+
+int
+main ()
+{
+
+int64_t a; a = 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_int64_t="yes"
+else
+   ac_cv_have_int64_t="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_int64_t" >&5
+$as_echo "$ac_cv_have_int64_t" >&6; }
+if test "x$ac_cv_have_int64_t" = "xyes" ; then
+
+$as_echo "#define HAVE_INT64_T 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for u_intXX_t types" >&5
+$as_echo_n "checking for u_intXX_t types... " >&6; }
+if ${ac_cv_have_u_intxx_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <sys/types.h>
+int
+main ()
+{
+ u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_u_intxx_t="yes"
+else
+   ac_cv_have_u_intxx_t="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_u_intxx_t" >&5
+$as_echo "$ac_cv_have_u_intxx_t" >&6; }
+if test "x$ac_cv_have_u_intxx_t" = "xyes" ; then
+
+$as_echo "#define HAVE_U_INTXX_T 1" >>confdefs.h
+
+        have_u_intxx_t=1
+fi
+
+if test -z "$have_u_intxx_t" ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for u_intXX_t types in sys/socket.h" >&5
+$as_echo_n "checking for u_intXX_t types in sys/socket.h... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <sys/socket.h>
+int
+main ()
+{
+ u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        $as_echo "#define HAVE_U_INTXX_T 1" >>confdefs.h
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for u_int64_t types" >&5
+$as_echo_n "checking for u_int64_t types... " >&6; }
+if ${ac_cv_have_u_int64_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <sys/types.h>
+int
+main ()
+{
+ u_int64_t a; a = 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_u_int64_t="yes"
+else
+   ac_cv_have_u_int64_t="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_u_int64_t" >&5
+$as_echo "$ac_cv_have_u_int64_t" >&6; }
+if test "x$ac_cv_have_u_int64_t" = "xyes" ; then
+
+$as_echo "#define HAVE_U_INT64_T 1" >>confdefs.h
+
+        have_u_int64_t=1
+fi
+
+if (test -z "$have_u_int64_t" && \
+           test "x$ac_cv_header_sys_bitypes_h" = "xyes")
+then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for u_int64_t type in sys/bitypes.h" >&5
+$as_echo_n "checking for u_int64_t type in sys/bitypes.h... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <sys/bitypes.h>
+int
+main ()
+{
+ u_int64_t a; a = 1
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        $as_echo "#define HAVE_U_INT64_T 1" >>confdefs.h
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+if test -z "$have_u_intxx_t" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uintXX_t types" >&5
+$as_echo_n "checking for uintXX_t types... " >&6; }
+if ${ac_cv_have_uintxx_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+
+int
+main ()
+{
+
+        uint8_t a;
+        uint16_t b;
+        uint32_t c;
+        a = b = c = 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_uintxx_t="yes"
+else
+   ac_cv_have_uintxx_t="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_uintxx_t" >&5
+$as_echo "$ac_cv_have_uintxx_t" >&6; }
+        if test "x$ac_cv_have_uintxx_t" = "xyes" ; then
+
+$as_echo "#define HAVE_UINTXX_T 1" >>confdefs.h
+
+        fi
+fi
+
+if (test -z "$have_uintxx_t" && \
+           test "x$ac_cv_header_stdint_h" = "xyes")
+then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uintXX_t types in stdint.h" >&5
+$as_echo_n "checking for uintXX_t types in stdint.h... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <stdint.h>
+int
+main ()
+{
+ uint8_t a; uint16_t b; uint32_t c; a = b = c = 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        $as_echo "#define HAVE_UINTXX_T 1" >>confdefs.h
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+if (test -z "$have_uintxx_t" && \
+           test "x$ac_cv_header_inttypes_h" = "xyes")
+then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uintXX_t types in inttypes.h" >&5
+$as_echo_n "checking for uintXX_t types in inttypes.h... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <inttypes.h>
+int
+main ()
+{
+ uint8_t a; uint16_t b; uint32_t c; a = b = c = 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        $as_echo "#define HAVE_UINTXX_T 1" >>confdefs.h
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+if (test -z "$have_u_intxx_t" || test -z "$have_intxx_t" && \
+           test "x$ac_cv_header_sys_bitypes_h" = "xyes")
+then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intXX_t and u_intXX_t types in sys/bitypes.h" >&5
+$as_echo_n "checking for intXX_t and u_intXX_t types in sys/bitypes.h... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/bitypes.h>
+
+int
+main ()
+{
+
+                        int8_t a; int16_t b; int32_t c;
+                        u_int8_t e; u_int16_t f; u_int32_t g;
+                        a = b = c = e = f = g = 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                        $as_echo "#define HAVE_U_INTXX_T 1" >>confdefs.h
+
+                        $as_echo "#define HAVE_INTXX_T 1" >>confdefs.h
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for u_char" >&5
+$as_echo_n "checking for u_char... " >&6; }
+if ${ac_cv_have_u_char+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <sys/types.h>
+int
+main ()
+{
+ u_char foo; foo = 125;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_u_char="yes"
+else
+   ac_cv_have_u_char="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_u_char" >&5
+$as_echo "$ac_cv_have_u_char" >&6; }
+if test "x$ac_cv_have_u_char" = "xyes" ; then
+
+$as_echo "#define HAVE_U_CHAR 1" >>confdefs.h
+
+fi
+
+ac_fn_c_check_type "$LINENO" "intmax_t" "ac_cv_type_intmax_t" "
+#include <sys/types.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+
+"
+if test "x$ac_cv_type_intmax_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_INTMAX_T 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_type "$LINENO" "uintmax_t" "ac_cv_type_uintmax_t" "
+#include <sys/types.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+
+"
+if test "x$ac_cv_type_uintmax_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_UINTMAX_T 1
+_ACEOF
+
+
+fi
+
+
+
+   ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "#include <sys/types.h>
+#include <sys/socket.h>
+"
+if test "x$ac_cv_type_socklen_t" = xyes; then :
+
+else
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t equivalent" >&5
+$as_echo_n "checking for socklen_t equivalent... " >&6; }
+      if ${curl_cv_socklen_t_equiv+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+         # Systems have either "struct sockaddr *" or
+         # "void *" as the second argument to getpeername
+         curl_cv_socklen_t_equiv=
+         for arg2 in "struct sockaddr" void; do
+            for t in int size_t unsigned long "unsigned long"; do
+               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                  #include <sys/types.h>
+                  #include <sys/socket.h>
+
+                  int getpeername (int, $arg2 *, $t *);
+
+int
+main ()
+{
+
+                  $t len;
+                  getpeername(0,0,&len);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                  curl_cv_socklen_t_equiv="$t"
+                  break
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+            done
+         done
+
+         if test "x$curl_cv_socklen_t_equiv" = x; then
+            as_fn_error $? "Cannot find a type to use in place of socklen_t" "$LINENO" 5
+         fi
+
+fi
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $curl_cv_socklen_t_equiv" >&5
+$as_echo "$curl_cv_socklen_t_equiv" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define socklen_t $curl_cv_socklen_t_equiv
+_ACEOF
+
+fi
+
+
+
+ac_fn_c_check_type "$LINENO" "sig_atomic_t" "ac_cv_type_sig_atomic_t" "#include <signal.h>
+"
+if test "x$ac_cv_type_sig_atomic_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SIG_ATOMIC_T 1
+_ACEOF
+
+
+fi
+
+ac_fn_c_check_type "$LINENO" "fsblkcnt_t" "ac_cv_type_fsblkcnt_t" "
+#include <sys/types.h>
+#ifdef HAVE_SYS_BITYPES_H
+#include <sys/bitypes.h>
+#endif
+#ifdef HAVE_SYS_STATFS_H
+#include <sys/statfs.h>
+#endif
+#ifdef HAVE_SYS_STATVFS_H
+#include <sys/statvfs.h>
+#endif
+
+"
+if test "x$ac_cv_type_fsblkcnt_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_FSBLKCNT_T 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_type "$LINENO" "fsfilcnt_t" "ac_cv_type_fsfilcnt_t" "
+#include <sys/types.h>
+#ifdef HAVE_SYS_BITYPES_H
+#include <sys/bitypes.h>
+#endif
+#ifdef HAVE_SYS_STATFS_H
+#include <sys/statfs.h>
+#endif
+#ifdef HAVE_SYS_STATVFS_H
+#include <sys/statvfs.h>
+#endif
+
+"
+if test "x$ac_cv_type_fsfilcnt_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_FSFILCNT_T 1
+_ACEOF
+
+
+fi
+
+
+ac_fn_c_check_member "$LINENO" "struct statfs" "f_files" "ac_cv_member_struct_statfs_f_files" "
+#include <sys/param.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_BITYPES_H
+#include <sys/bitypes.h>
+#endif
+#ifdef HAVE_SYS_STATFS_H
+#include <sys/statfs.h>
+#endif
+#ifdef HAVE_SYS_STATVFS_H
+#include <sys/statvfs.h>
+#endif
+#ifdef HAVE_SYS_VFS_H
+#include <sys/vfs.h>
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+
+"
+if test "x$ac_cv_member_struct_statfs_f_files" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STATFS_F_FILES 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_member "$LINENO" "struct statfs" "f_flags" "ac_cv_member_struct_statfs_f_flags" "
+#include <sys/param.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_BITYPES_H
+#include <sys/bitypes.h>
+#endif
+#ifdef HAVE_SYS_STATFS_H
+#include <sys/statfs.h>
+#endif
+#ifdef HAVE_SYS_STATVFS_H
+#include <sys/statvfs.h>
+#endif
+#ifdef HAVE_SYS_VFS_H
+#include <sys/vfs.h>
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+
+"
+if test "x$ac_cv_member_struct_statfs_f_flags" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STATFS_F_FLAGS 1
+_ACEOF
+
+
+fi
+
+
+
+ac_fn_c_check_type "$LINENO" "in_addr_t" "ac_cv_type_in_addr_t" "#include <sys/types.h>
+#include <netinet/in.h>
+"
+if test "x$ac_cv_type_in_addr_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_IN_ADDR_T 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_type "$LINENO" "in_port_t" "ac_cv_type_in_port_t" "#include <sys/types.h>
+#include <netinet/in.h>
+"
+if test "x$ac_cv_type_in_port_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_IN_PORT_T 1
+_ACEOF
+
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for size_t" >&5
+$as_echo_n "checking for size_t... " >&6; }
+if ${ac_cv_have_size_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <sys/types.h>
+int
+main ()
+{
+ size_t foo; foo = 1235;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_size_t="yes"
+else
+   ac_cv_have_size_t="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_size_t" >&5
+$as_echo "$ac_cv_have_size_t" >&6; }
+if test "x$ac_cv_have_size_t" = "xyes" ; then
+
+$as_echo "#define HAVE_SIZE_T 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
+$as_echo_n "checking for ssize_t... " >&6; }
+if ${ac_cv_have_ssize_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <sys/types.h>
+int
+main ()
+{
+ ssize_t foo; foo = 1235;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_ssize_t="yes"
+else
+   ac_cv_have_ssize_t="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_ssize_t" >&5
+$as_echo "$ac_cv_have_ssize_t" >&6; }
+if test "x$ac_cv_have_ssize_t" = "xyes" ; then
+
+$as_echo "#define HAVE_SSIZE_T 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_t" >&5
+$as_echo_n "checking for clock_t... " >&6; }
+if ${ac_cv_have_clock_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <time.h>
+int
+main ()
+{
+ clock_t foo; foo = 1235;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_clock_t="yes"
+else
+   ac_cv_have_clock_t="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_clock_t" >&5
+$as_echo "$ac_cv_have_clock_t" >&6; }
+if test "x$ac_cv_have_clock_t" = "xyes" ; then
+
+$as_echo "#define HAVE_CLOCK_T 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sa_family_t" >&5
+$as_echo_n "checking for sa_family_t... " >&6; }
+if ${ac_cv_have_sa_family_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+
+int
+main ()
+{
+ sa_family_t foo; foo = 1235;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_sa_family_t="yes"
+else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+int
+main ()
+{
+ sa_family_t foo; foo = 1235;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_sa_family_t="yes"
+else
+   ac_cv_have_sa_family_t="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_sa_family_t" >&5
+$as_echo "$ac_cv_have_sa_family_t" >&6; }
+if test "x$ac_cv_have_sa_family_t" = "xyes" ; then
+
+$as_echo "#define HAVE_SA_FAMILY_T 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pid_t" >&5
+$as_echo_n "checking for pid_t... " >&6; }
+if ${ac_cv_have_pid_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <sys/types.h>
+int
+main ()
+{
+ pid_t foo; foo = 1235;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_pid_t="yes"
+else
+   ac_cv_have_pid_t="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_pid_t" >&5
+$as_echo "$ac_cv_have_pid_t" >&6; }
+if test "x$ac_cv_have_pid_t" = "xyes" ; then
+
+$as_echo "#define HAVE_PID_T 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mode_t" >&5
+$as_echo_n "checking for mode_t... " >&6; }
+if ${ac_cv_have_mode_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <sys/types.h>
+int
+main ()
+{
+ mode_t foo; foo = 1235;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_mode_t="yes"
+else
+   ac_cv_have_mode_t="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_mode_t" >&5
+$as_echo "$ac_cv_have_mode_t" >&6; }
+if test "x$ac_cv_have_mode_t" = "xyes" ; then
+
+$as_echo "#define HAVE_MODE_T 1" >>confdefs.h
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5
+$as_echo_n "checking for struct sockaddr_storage... " >&6; }
+if ${ac_cv_have_struct_sockaddr_storage+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+
+int
+main ()
+{
+ struct sockaddr_storage s;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_struct_sockaddr_storage="yes"
+else
+   ac_cv_have_struct_sockaddr_storage="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_struct_sockaddr_storage" >&5
+$as_echo "$ac_cv_have_struct_sockaddr_storage" >&6; }
+if test "x$ac_cv_have_struct_sockaddr_storage" = "xyes" ; then
+
+$as_echo "#define HAVE_STRUCT_SOCKADDR_STORAGE 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_in6" >&5
+$as_echo_n "checking for struct sockaddr_in6... " >&6; }
+if ${ac_cv_have_struct_sockaddr_in6+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <netinet/in.h>
+
+int
+main ()
+{
+ struct sockaddr_in6 s; s.sin6_family = 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_struct_sockaddr_in6="yes"
+else
+   ac_cv_have_struct_sockaddr_in6="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_struct_sockaddr_in6" >&5
+$as_echo "$ac_cv_have_struct_sockaddr_in6" >&6; }
+if test "x$ac_cv_have_struct_sockaddr_in6" = "xyes" ; then
+
+$as_echo "#define HAVE_STRUCT_SOCKADDR_IN6 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct in6_addr" >&5
+$as_echo_n "checking for struct in6_addr... " >&6; }
+if ${ac_cv_have_struct_in6_addr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <netinet/in.h>
+
+int
+main ()
+{
+ struct in6_addr s; s.s6_addr[0] = 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_struct_in6_addr="yes"
+else
+   ac_cv_have_struct_in6_addr="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_struct_in6_addr" >&5
+$as_echo "$ac_cv_have_struct_in6_addr" >&6; }
+if test "x$ac_cv_have_struct_in6_addr" = "xyes" ; then
+
+$as_echo "#define HAVE_STRUCT_IN6_ADDR 1" >>confdefs.h
+
+
+        ac_fn_c_check_member "$LINENO" "struct sockaddr_in6" "sin6_scope_id" "ac_cv_member_struct_sockaddr_in6_sin6_scope_id" "
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include <netinet/in.h>
+
+"
+if test "x$ac_cv_member_struct_sockaddr_in6_sin6_scope_id" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
+_ACEOF
+
+
+fi
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct addrinfo" >&5
+$as_echo_n "checking for struct addrinfo... " >&6; }
+if ${ac_cv_have_struct_addrinfo+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+
+int
+main ()
+{
+ struct addrinfo s; s.ai_flags = AI_PASSIVE;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_struct_addrinfo="yes"
+else
+   ac_cv_have_struct_addrinfo="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_struct_addrinfo" >&5
+$as_echo "$ac_cv_have_struct_addrinfo" >&6; }
+if test "x$ac_cv_have_struct_addrinfo" = "xyes" ; then
+
+$as_echo "#define HAVE_STRUCT_ADDRINFO 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+if ${ac_cv_header_time+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/time.h>
+#include <time.h>
+
+int
+main ()
+{
+if ((struct tm *) 0)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_time=yes
+else
+  ac_cv_header_time=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
+$as_echo "$ac_cv_header_time" >&6; }
+if test $ac_cv_header_time = yes; then
+
+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timeval" >&5
+$as_echo_n "checking for struct timeval... " >&6; }
+if ${ac_cv_have_struct_timeval+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <sys/time.h>
+int
+main ()
+{
+ struct timeval tv; tv.tv_sec = 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_struct_timeval="yes"
+else
+   ac_cv_have_struct_timeval="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_struct_timeval" >&5
+$as_echo "$ac_cv_have_struct_timeval" >&6; }
+if test "x$ac_cv_have_struct_timeval" = "xyes" ; then
+
+$as_echo "#define HAVE_STRUCT_TIMEVAL 1" >>confdefs.h
+
+        have_struct_timeval=1
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec" >&5
+$as_echo_n "checking for struct timespec... " >&6; }
+if ${ac_cv_have_struct_timespec+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+    #ifdef TIME_WITH_SYS_TIME
+    # include <sys/time.h>
+    # include <time.h>
+    #else
+    # ifdef HAVE_SYS_TIME_H
+    #  include <sys/time.h>
+    # else
+    #  include <time.h>
+    # endif
+    #endif
+
+int
+main ()
+{
+ struct timespec ts; ts.tv_sec = 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_struct_timespec="yes"
+else
+   ac_cv_have_struct_timespec="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_struct_timespec" >&5
+$as_echo "$ac_cv_have_struct_timespec" >&6; }
+if test "x$ac_cv_have_struct_timespec" = "xyes" ; then
+
+$as_echo "#define HAVE_STRUCT_TIMESPEC 1" >>confdefs.h
+
+        have_struct_timespec=1
+fi
+
+# We need int64_t or else certain parts of the compile will fail.
+if test "x$ac_cv_have_int64_t" = "xno" && \
+        test "x$ac_cv_sizeof_long_int" != "x8" && \
+        test "x$ac_cv_sizeof_long_long_int" = "x0" ; then
+        echo "OpenSSH requires int64_t support.  Contact your vendor or install"
+        echo "an alternative compiler (I.E., GCC) before continuing."
+        echo ""
+        exit 1;
+else
+        if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: Assuming working snprintf()" >&5
+$as_echo "$as_me: WARNING: cross compiling: Assuming working snprintf()" >&2;}
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+#include <string.h>
+#ifdef HAVE_SNPRINTF
+main()
+{
+        char buf[50];
+        char expected_out[50];
+        int mazsize = 50 ;
+#if (SIZEOF_LONG_INT == 8)
+        long int num = 0x7fffffffffffffff;
+#else
+        long long num = 0x7fffffffffffffffll;
+#endif
+        strcpy(expected_out, "9223372036854775807");
+        snprintf(buf, mazsize, "%lld", num);
+        if(strcmp(buf, expected_out) != 0)
+                exit(1);
+        exit(0);
+}
+#else
+main() { exit(0); }
+#endif
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+   true
+else
+   $as_echo "#define BROKEN_SNPRINTF 1" >>confdefs.h
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+
+
+# look for field 'ut_host' in header 'utmp.h'
+                ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
+                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_host
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_host field in utmp.h" >&5
+$as_echo_n "checking for ut_host field in utmp.h... " >&6; }
+        if eval \${$ossh_varname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <utmp.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "ut_host" >/dev/null 2>&1; then :
+                        eval "$ossh_varname=yes"
+else
+                        eval "$ossh_varname=no"
+fi
+rm -f conftest*
+
+fi
+
+        ossh_result=`eval 'echo $'"$ossh_varname"`
+        if test -n "`echo $ossh_varname`"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5
+$as_echo "$ossh_result" >&6; }
+                if test "x$ossh_result" = "xyes"; then
+
+$as_echo "#define HAVE_HOST_IN_UTMP 1" >>confdefs.h
+
+                fi
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+
+
+# look for field 'ut_host' in header 'utmpx.h'
+                ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
+                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_host
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_host field in utmpx.h" >&5
+$as_echo_n "checking for ut_host field in utmpx.h... " >&6; }
+        if eval \${$ossh_varname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <utmpx.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "ut_host" >/dev/null 2>&1; then :
+                        eval "$ossh_varname=yes"
+else
+                        eval "$ossh_varname=no"
+fi
+rm -f conftest*
+
+fi
+
+        ossh_result=`eval 'echo $'"$ossh_varname"`
+        if test -n "`echo $ossh_varname`"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5
+$as_echo "$ossh_result" >&6; }
+                if test "x$ossh_result" = "xyes"; then
+
+$as_echo "#define HAVE_HOST_IN_UTMPX 1" >>confdefs.h
+
+                fi
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+
+
+# look for field 'syslen' in header 'utmpx.h'
+                ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
+                ossh_varname="ossh_cv_$ossh_safe""_has_"syslen
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for syslen field in utmpx.h" >&5
+$as_echo_n "checking for syslen field in utmpx.h... " >&6; }
+        if eval \${$ossh_varname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <utmpx.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "syslen" >/dev/null 2>&1; then :
+                        eval "$ossh_varname=yes"
+else
+                        eval "$ossh_varname=no"
+fi
+rm -f conftest*
+
+fi
+
+        ossh_result=`eval 'echo $'"$ossh_varname"`
+        if test -n "`echo $ossh_varname`"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5
+$as_echo "$ossh_result" >&6; }
+                if test "x$ossh_result" = "xyes"; then
+
+$as_echo "#define HAVE_SYSLEN_IN_UTMPX 1" >>confdefs.h
+
+                fi
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+
+
+# look for field 'ut_pid' in header 'utmp.h'
+                ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
+                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_pid
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_pid field in utmp.h" >&5
+$as_echo_n "checking for ut_pid field in utmp.h... " >&6; }
+        if eval \${$ossh_varname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <utmp.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "ut_pid" >/dev/null 2>&1; then :
+                        eval "$ossh_varname=yes"
+else
+                        eval "$ossh_varname=no"
+fi
+rm -f conftest*
+
+fi
+
+        ossh_result=`eval 'echo $'"$ossh_varname"`
+        if test -n "`echo $ossh_varname`"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5
+$as_echo "$ossh_result" >&6; }
+                if test "x$ossh_result" = "xyes"; then
+
+$as_echo "#define HAVE_PID_IN_UTMP 1" >>confdefs.h
+
+                fi
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+
+
+# look for field 'ut_type' in header 'utmp.h'
+                ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
+                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_type
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_type field in utmp.h" >&5
+$as_echo_n "checking for ut_type field in utmp.h... " >&6; }
+        if eval \${$ossh_varname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <utmp.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "ut_type" >/dev/null 2>&1; then :
+                        eval "$ossh_varname=yes"
+else
+                        eval "$ossh_varname=no"
+fi
+rm -f conftest*
+
+fi
+
+        ossh_result=`eval 'echo $'"$ossh_varname"`
+        if test -n "`echo $ossh_varname`"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5
+$as_echo "$ossh_result" >&6; }
+                if test "x$ossh_result" = "xyes"; then
+
+$as_echo "#define HAVE_TYPE_IN_UTMP 1" >>confdefs.h
+
+                fi
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+
+
+# look for field 'ut_type' in header 'utmpx.h'
+                ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
+                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_type
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_type field in utmpx.h" >&5
+$as_echo_n "checking for ut_type field in utmpx.h... " >&6; }
+        if eval \${$ossh_varname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <utmpx.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "ut_type" >/dev/null 2>&1; then :
+                        eval "$ossh_varname=yes"
+else
+                        eval "$ossh_varname=no"
+fi
+rm -f conftest*
+
+fi
+
+        ossh_result=`eval 'echo $'"$ossh_varname"`
+        if test -n "`echo $ossh_varname`"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5
+$as_echo "$ossh_result" >&6; }
+                if test "x$ossh_result" = "xyes"; then
+
+$as_echo "#define HAVE_TYPE_IN_UTMPX 1" >>confdefs.h
+
+                fi
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+
+
+# look for field 'ut_tv' in header 'utmp.h'
+                ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
+                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_tv
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_tv field in utmp.h" >&5
+$as_echo_n "checking for ut_tv field in utmp.h... " >&6; }
+        if eval \${$ossh_varname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <utmp.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "ut_tv" >/dev/null 2>&1; then :
+                        eval "$ossh_varname=yes"
+else
+                        eval "$ossh_varname=no"
+fi
+rm -f conftest*
+
+fi
+
+        ossh_result=`eval 'echo $'"$ossh_varname"`
+        if test -n "`echo $ossh_varname`"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5
+$as_echo "$ossh_result" >&6; }
+                if test "x$ossh_result" = "xyes"; then
+
+$as_echo "#define HAVE_TV_IN_UTMP 1" >>confdefs.h
+
+                fi
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+
+
+# look for field 'ut_id' in header 'utmp.h'
+                ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
+                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_id
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_id field in utmp.h" >&5
+$as_echo_n "checking for ut_id field in utmp.h... " >&6; }
+        if eval \${$ossh_varname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <utmp.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "ut_id" >/dev/null 2>&1; then :
+                        eval "$ossh_varname=yes"
+else
+                        eval "$ossh_varname=no"
+fi
+rm -f conftest*
+
+fi
+
+        ossh_result=`eval 'echo $'"$ossh_varname"`
+        if test -n "`echo $ossh_varname`"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5
+$as_echo "$ossh_result" >&6; }
+                if test "x$ossh_result" = "xyes"; then
+
+$as_echo "#define HAVE_ID_IN_UTMP 1" >>confdefs.h
+
+                fi
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+
+
+# look for field 'ut_id' in header 'utmpx.h'
+                ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
+                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_id
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_id field in utmpx.h" >&5
+$as_echo_n "checking for ut_id field in utmpx.h... " >&6; }
+        if eval \${$ossh_varname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <utmpx.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "ut_id" >/dev/null 2>&1; then :
+                        eval "$ossh_varname=yes"
+else
+                        eval "$ossh_varname=no"
+fi
+rm -f conftest*
+
+fi
+
+        ossh_result=`eval 'echo $'"$ossh_varname"`
+        if test -n "`echo $ossh_varname`"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5
+$as_echo "$ossh_result" >&6; }
+                if test "x$ossh_result" = "xyes"; then
+
+$as_echo "#define HAVE_ID_IN_UTMPX 1" >>confdefs.h
+
+                fi
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+
+
+# look for field 'ut_addr' in header 'utmp.h'
+                ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
+                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_addr field in utmp.h" >&5
+$as_echo_n "checking for ut_addr field in utmp.h... " >&6; }
+        if eval \${$ossh_varname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <utmp.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "ut_addr" >/dev/null 2>&1; then :
+                        eval "$ossh_varname=yes"
+else
+                        eval "$ossh_varname=no"
+fi
+rm -f conftest*
+
+fi
+
+        ossh_result=`eval 'echo $'"$ossh_varname"`
+        if test -n "`echo $ossh_varname`"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5
+$as_echo "$ossh_result" >&6; }
+                if test "x$ossh_result" = "xyes"; then
+
+$as_echo "#define HAVE_ADDR_IN_UTMP 1" >>confdefs.h
+
+                fi
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+
+
+# look for field 'ut_addr' in header 'utmpx.h'
+                ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
+                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_addr field in utmpx.h" >&5
+$as_echo_n "checking for ut_addr field in utmpx.h... " >&6; }
+        if eval \${$ossh_varname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <utmpx.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "ut_addr" >/dev/null 2>&1; then :
+                        eval "$ossh_varname=yes"
+else
+                        eval "$ossh_varname=no"
+fi
+rm -f conftest*
+
+fi
+
+        ossh_result=`eval 'echo $'"$ossh_varname"`
+        if test -n "`echo $ossh_varname`"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5
+$as_echo "$ossh_result" >&6; }
+                if test "x$ossh_result" = "xyes"; then
+
+$as_echo "#define HAVE_ADDR_IN_UTMPX 1" >>confdefs.h
+
+                fi
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+
+
+# look for field 'ut_addr_v6' in header 'utmp.h'
+                ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
+                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr_v6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_addr_v6 field in utmp.h" >&5
+$as_echo_n "checking for ut_addr_v6 field in utmp.h... " >&6; }
+        if eval \${$ossh_varname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <utmp.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "ut_addr_v6" >/dev/null 2>&1; then :
+                        eval "$ossh_varname=yes"
+else
+                        eval "$ossh_varname=no"
+fi
+rm -f conftest*
+
+fi
+
+        ossh_result=`eval 'echo $'"$ossh_varname"`
+        if test -n "`echo $ossh_varname`"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5
+$as_echo "$ossh_result" >&6; }
+                if test "x$ossh_result" = "xyes"; then
+
+$as_echo "#define HAVE_ADDR_V6_IN_UTMP 1" >>confdefs.h
+
+                fi
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+
+
+# look for field 'ut_addr_v6' in header 'utmpx.h'
+                ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
+                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr_v6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_addr_v6 field in utmpx.h" >&5
+$as_echo_n "checking for ut_addr_v6 field in utmpx.h... " >&6; }
+        if eval \${$ossh_varname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <utmpx.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "ut_addr_v6" >/dev/null 2>&1; then :
+                        eval "$ossh_varname=yes"
+else
+                        eval "$ossh_varname=no"
+fi
+rm -f conftest*
+
+fi
+
+        ossh_result=`eval 'echo $'"$ossh_varname"`
+        if test -n "`echo $ossh_varname`"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5
+$as_echo "$ossh_result" >&6; }
+                if test "x$ossh_result" = "xyes"; then
+
+$as_echo "#define HAVE_ADDR_V6_IN_UTMPX 1" >>confdefs.h
+
+                fi
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+
+
+# look for field 'ut_exit' in header 'utmp.h'
+                ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
+                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_exit
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_exit field in utmp.h" >&5
+$as_echo_n "checking for ut_exit field in utmp.h... " >&6; }
+        if eval \${$ossh_varname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <utmp.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "ut_exit" >/dev/null 2>&1; then :
+                        eval "$ossh_varname=yes"
+else
+                        eval "$ossh_varname=no"
+fi
+rm -f conftest*
+
+fi
+
+        ossh_result=`eval 'echo $'"$ossh_varname"`
+        if test -n "`echo $ossh_varname`"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5
+$as_echo "$ossh_result" >&6; }
+                if test "x$ossh_result" = "xyes"; then
+
+$as_echo "#define HAVE_EXIT_IN_UTMP 1" >>confdefs.h
+
+                fi
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+
+
+# look for field 'ut_time' in header 'utmp.h'
+                ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
+                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_time
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_time field in utmp.h" >&5
+$as_echo_n "checking for ut_time field in utmp.h... " >&6; }
+        if eval \${$ossh_varname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <utmp.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "ut_time" >/dev/null 2>&1; then :
+                        eval "$ossh_varname=yes"
+else
+                        eval "$ossh_varname=no"
+fi
+rm -f conftest*
+
+fi
+
+        ossh_result=`eval 'echo $'"$ossh_varname"`
+        if test -n "`echo $ossh_varname`"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5
+$as_echo "$ossh_result" >&6; }
+                if test "x$ossh_result" = "xyes"; then
+
+$as_echo "#define HAVE_TIME_IN_UTMP 1" >>confdefs.h
+
+                fi
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+
+
+# look for field 'ut_time' in header 'utmpx.h'
+                ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
+                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_time
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_time field in utmpx.h" >&5
+$as_echo_n "checking for ut_time field in utmpx.h... " >&6; }
+        if eval \${$ossh_varname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <utmpx.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "ut_time" >/dev/null 2>&1; then :
+                        eval "$ossh_varname=yes"
+else
+                        eval "$ossh_varname=no"
+fi
+rm -f conftest*
+
+fi
+
+        ossh_result=`eval 'echo $'"$ossh_varname"`
+        if test -n "`echo $ossh_varname`"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5
+$as_echo "$ossh_result" >&6; }
+                if test "x$ossh_result" = "xyes"; then
+
+$as_echo "#define HAVE_TIME_IN_UTMPX 1" >>confdefs.h
+
+                fi
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+
+
+# look for field 'ut_tv' in header 'utmpx.h'
+                ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
+                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_tv
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_tv field in utmpx.h" >&5
+$as_echo_n "checking for ut_tv field in utmpx.h... " >&6; }
+        if eval \${$ossh_varname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <utmpx.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "ut_tv" >/dev/null 2>&1; then :
+                        eval "$ossh_varname=yes"
+else
+                        eval "$ossh_varname=no"
+fi
+rm -f conftest*
+
+fi
+
+        ossh_result=`eval 'echo $'"$ossh_varname"`
+        if test -n "`echo $ossh_varname`"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ossh_result" >&5
+$as_echo "$ossh_result" >&6; }
+                if test "x$ossh_result" = "xyes"; then
+
+$as_echo "#define HAVE_TV_IN_UTMPX 1" >>confdefs.h
+
+                fi
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+
+
+ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_blksize" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
+_ACEOF
+
+
+fi
+
+ac_fn_c_check_member "$LINENO" "struct stat" "st_mtim" "ac_cv_member_struct_stat_st_mtim" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_mtim" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_MTIM 1
+_ACEOF
+
+
+fi
+
+ac_fn_c_check_member "$LINENO" "struct stat" "st_mtime" "ac_cv_member_struct_stat_st_mtime" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_mtime" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_MTIME 1
+_ACEOF
+
+
+fi
+
+ac_fn_c_check_member "$LINENO" "struct passwd" "pw_gecos" "ac_cv_member_struct_passwd_pw_gecos" "
+#include <sys/types.h>
+#include <pwd.h>
+
+"
+if test "x$ac_cv_member_struct_passwd_pw_gecos" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_PASSWD_PW_GECOS 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_member "$LINENO" "struct passwd" "pw_class" "ac_cv_member_struct_passwd_pw_class" "
+#include <sys/types.h>
+#include <pwd.h>
+
+"
+if test "x$ac_cv_member_struct_passwd_pw_class" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_PASSWD_PW_CLASS 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_member "$LINENO" "struct passwd" "pw_change" "ac_cv_member_struct_passwd_pw_change" "
+#include <sys/types.h>
+#include <pwd.h>
+
+"
+if test "x$ac_cv_member_struct_passwd_pw_change" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_PASSWD_PW_CHANGE 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_member "$LINENO" "struct passwd" "pw_expire" "ac_cv_member_struct_passwd_pw_expire" "
+#include <sys/types.h>
+#include <pwd.h>
+
+"
+if test "x$ac_cv_member_struct_passwd_pw_expire" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_PASSWD_PW_EXPIRE 1
+_ACEOF
+
+
+fi
+
+
+ac_fn_c_check_member "$LINENO" "struct __res_state" "retrans" "ac_cv_member_struct___res_state_retrans" "
+#include <stdio.h>
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+
+"
+if test "x$ac_cv_member_struct___res_state_retrans" = xyes; then :
+
+else
+
+$as_echo "#define __res_state state" >>confdefs.h
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ss_family field in struct sockaddr_storage" >&5
+$as_echo_n "checking for ss_family field in struct sockaddr_storage... " >&6; }
+if ${ac_cv_have_ss_family_in_struct_ss+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+
+int
+main ()
+{
+ struct sockaddr_storage s; s.ss_family = 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_ss_family_in_struct_ss="yes"
+else
+   ac_cv_have_ss_family_in_struct_ss="no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_ss_family_in_struct_ss" >&5
+$as_echo "$ac_cv_have_ss_family_in_struct_ss" >&6; }
+if test "x$ac_cv_have_ss_family_in_struct_ss" = "xyes" ; then
+
+$as_echo "#define HAVE_SS_FAMILY_IN_SS 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __ss_family field in struct sockaddr_storage" >&5
+$as_echo_n "checking for __ss_family field in struct sockaddr_storage... " >&6; }
+if ${ac_cv_have___ss_family_in_struct_ss+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+
+int
+main ()
+{
+ struct sockaddr_storage s; s.__ss_family = 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have___ss_family_in_struct_ss="yes"
+else
+   ac_cv_have___ss_family_in_struct_ss="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have___ss_family_in_struct_ss" >&5
+$as_echo "$ac_cv_have___ss_family_in_struct_ss" >&6; }
+if test "x$ac_cv_have___ss_family_in_struct_ss" = "xyes" ; then
+
+$as_echo "#define HAVE___SS_FAMILY_IN_SS 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for msg_accrights field in struct msghdr" >&5
+$as_echo_n "checking for msg_accrights field in struct msghdr... " >&6; }
+if ${ac_cv_have_accrights_in_msghdr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+
+int
+main ()
+{
+
+#ifdef msg_accrights
+#error "msg_accrights is a macro"
+exit(1);
+#endif
+struct msghdr m;
+m.msg_accrights = 0;
+exit(0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_accrights_in_msghdr="yes"
+else
+   ac_cv_have_accrights_in_msghdr="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_accrights_in_msghdr" >&5
+$as_echo "$ac_cv_have_accrights_in_msghdr" >&6; }
+if test "x$ac_cv_have_accrights_in_msghdr" = "xyes" ; then
+
+$as_echo "#define HAVE_ACCRIGHTS_IN_MSGHDR 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if struct statvfs.f_fsid is integral type" >&5
+$as_echo_n "checking if struct statvfs.f_fsid is integral type... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/param.h>
+#include <sys/stat.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+#ifdef HAVE_SYS_STATVFS_H
+#include <sys/statvfs.h>
+#endif
+
+int
+main ()
+{
+ struct statvfs s; s.f_fsid = 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if fsid_t has member val" >&5
+$as_echo_n "checking if fsid_t has member val... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/statvfs.h>
+
+int
+main ()
+{
+ fsid_t t; t.val[0] = 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define FSID_HAS_VAL 1" >>confdefs.h
+
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if f_fsid has member __val" >&5
+$as_echo_n "checking if f_fsid has member __val... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/statvfs.h>
+
+int
+main ()
+{
+ fsid_t t; t.__val[0] = 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define FSID_HAS___VAL 1" >>confdefs.h
+
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for msg_control field in struct msghdr" >&5
+$as_echo_n "checking for msg_control field in struct msghdr... " >&6; }
+if ${ac_cv_have_control_in_msghdr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+
+int
+main ()
+{
+
+#ifdef msg_control
+#error "msg_control is a macro"
+exit(1);
+#endif
+struct msghdr m;
+m.msg_control = 0;
+exit(0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_control_in_msghdr="yes"
+else
+   ac_cv_have_control_in_msghdr="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_control_in_msghdr" >&5
+$as_echo "$ac_cv_have_control_in_msghdr" >&6; }
+if test "x$ac_cv_have_control_in_msghdr" = "xyes" ; then
+
+$as_echo "#define HAVE_CONTROL_IN_MSGHDR 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libc defines __progname" >&5
+$as_echo_n "checking if libc defines __progname... " >&6; }
+if ${ac_cv_libc_defines___progname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+ extern char *__progname; printf("%s", __progname);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_libc_defines___progname="yes"
+else
+   ac_cv_libc_defines___progname="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libc_defines___progname" >&5
+$as_echo "$ac_cv_libc_defines___progname" >&6; }
+if test "x$ac_cv_libc_defines___progname" = "xyes" ; then
+
+$as_echo "#define HAVE___PROGNAME 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC implements __FUNCTION__" >&5
+$as_echo_n "checking whether $CC implements __FUNCTION__... " >&6; }
+if ${ac_cv_cc_implements___FUNCTION__+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <stdio.h>
+int
+main ()
+{
+ printf("%s", __FUNCTION__);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_cc_implements___FUNCTION__="yes"
+else
+   ac_cv_cc_implements___FUNCTION__="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_implements___FUNCTION__" >&5
+$as_echo "$ac_cv_cc_implements___FUNCTION__" >&6; }
+if test "x$ac_cv_cc_implements___FUNCTION__" = "xyes" ; then
+
+$as_echo "#define HAVE___FUNCTION__ 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC implements __func__" >&5
+$as_echo_n "checking whether $CC implements __func__... " >&6; }
+if ${ac_cv_cc_implements___func__+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <stdio.h>
+int
+main ()
+{
+ printf("%s", __func__);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_cc_implements___func__="yes"
+else
+   ac_cv_cc_implements___func__="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_implements___func__" >&5
+$as_echo "$ac_cv_cc_implements___func__" >&6; }
+if test "x$ac_cv_cc_implements___func__" = "xyes" ; then
+
+$as_echo "#define HAVE___func__ 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether va_copy exists" >&5
+$as_echo_n "checking whether va_copy exists... " >&6; }
+if ${ac_cv_have_va_copy+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdarg.h>
+va_list x,y;
+
+int
+main ()
+{
+ va_copy(x,y);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_have_va_copy="yes"
+else
+   ac_cv_have_va_copy="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_va_copy" >&5
+$as_echo "$ac_cv_have_va_copy" >&6; }
+if test "x$ac_cv_have_va_copy" = "xyes" ; then
+
+$as_echo "#define HAVE_VA_COPY 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __va_copy exists" >&5
+$as_echo_n "checking whether __va_copy exists... " >&6; }
+if ${ac_cv_have___va_copy+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdarg.h>
+va_list x,y;
+
+int
+main ()
+{
+ __va_copy(x,y);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_have___va_copy="yes"
+else
+   ac_cv_have___va_copy="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have___va_copy" >&5
+$as_echo "$ac_cv_have___va_copy" >&6; }
+if test "x$ac_cv_have___va_copy" = "xyes" ; then
+
+$as_echo "#define HAVE___VA_COPY 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getopt has optreset support" >&5
+$as_echo_n "checking whether getopt has optreset support... " >&6; }
+if ${ac_cv_have_getopt_optreset+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <getopt.h>
+int
+main ()
+{
+ extern int optreset; optreset = 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_have_getopt_optreset="yes"
+else
+   ac_cv_have_getopt_optreset="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_getopt_optreset" >&5
+$as_echo "$ac_cv_have_getopt_optreset" >&6; }
+if test "x$ac_cv_have_getopt_optreset" = "xyes" ; then
+
+$as_echo "#define HAVE_GETOPT_OPTRESET 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libc defines sys_errlist" >&5
+$as_echo_n "checking if libc defines sys_errlist... " >&6; }
+if ${ac_cv_libc_defines_sys_errlist+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+ extern const char *const sys_errlist[]; printf("%s", sys_errlist[0]);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_libc_defines_sys_errlist="yes"
+else
+   ac_cv_libc_defines_sys_errlist="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libc_defines_sys_errlist" >&5
+$as_echo "$ac_cv_libc_defines_sys_errlist" >&6; }
+if test "x$ac_cv_libc_defines_sys_errlist" = "xyes" ; then
+
+$as_echo "#define HAVE_SYS_ERRLIST 1" >>confdefs.h
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libc defines sys_nerr" >&5
+$as_echo_n "checking if libc defines sys_nerr... " >&6; }
+if ${ac_cv_libc_defines_sys_nerr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+ extern int sys_nerr; printf("%i", sys_nerr);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_libc_defines_sys_nerr="yes"
+else
+   ac_cv_libc_defines_sys_nerr="no"
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libc_defines_sys_nerr" >&5
+$as_echo "$ac_cv_libc_defines_sys_nerr" >&6; }
+if test "x$ac_cv_libc_defines_sys_nerr" = "xyes" ; then
+
+$as_echo "#define HAVE_SYS_NERR 1" >>confdefs.h
+
+fi
+
+# Check libraries needed by DNS fingerprint support
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getrrsetbyname" >&5
+$as_echo_n "checking for library containing getrrsetbyname... " >&6; }
+if ${ac_cv_search_getrrsetbyname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char getrrsetbyname ();
+int
+main ()
+{
+return getrrsetbyname ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' resolv; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_getrrsetbyname=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_getrrsetbyname+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_getrrsetbyname+:} false; then :
+
+else
+  ac_cv_search_getrrsetbyname=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getrrsetbyname" >&5
+$as_echo "$ac_cv_search_getrrsetbyname" >&6; }
+ac_res=$ac_cv_search_getrrsetbyname
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+$as_echo "#define HAVE_GETRRSETBYNAME 1" >>confdefs.h
+
+else
+
+                # Needed by our getrrsetbyname()
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing res_query" >&5
+$as_echo_n "checking for library containing res_query... " >&6; }
+if ${ac_cv_search_res_query+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char res_query ();
+int
+main ()
+{
+return res_query ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' resolv; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_res_query=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_res_query+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_res_query+:} false; then :
+
+else
+  ac_cv_search_res_query=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_query" >&5
+$as_echo "$ac_cv_search_res_query" >&6; }
+ac_res=$ac_cv_search_res_query
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dn_expand" >&5
+$as_echo_n "checking for library containing dn_expand... " >&6; }
+if ${ac_cv_search_dn_expand+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dn_expand ();
+int
+main ()
+{
+return dn_expand ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' resolv; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_dn_expand=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_dn_expand+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_dn_expand+:} false; then :
+
+else
+  ac_cv_search_dn_expand=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dn_expand" >&5
+$as_echo "$ac_cv_search_dn_expand" >&6; }
+ac_res=$ac_cv_search_dn_expand
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if res_query will link" >&5
+$as_echo_n "checking if res_query will link... " >&6; }
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <netdb.h>
+#include <resolv.h>
+
+int
+main ()
+{
+
+        res_query (0, 0, 0, 0, 0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                    saved_LIBS="$LIBS"
+                    LIBS="$LIBS -lresolv"
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_query in -lresolv" >&5
+$as_echo_n "checking for res_query in -lresolv... " >&6; }
+                    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <netdb.h>
+#include <resolv.h>
+
+int
+main ()
+{
+
+        res_query (0, 0, 0, 0, 0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  LIBS="$saved_LIBS"
+                         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+                for ac_func in _getshort _getlong
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+                ac_fn_c_check_decl "$LINENO" "_getshort" "ac_cv_have_decl__getshort" "#include <sys/types.h>
+                    #include <arpa/nameser.h>
+"
+if test "x$ac_cv_have_decl__getshort" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL__GETSHORT $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "_getlong" "ac_cv_have_decl__getlong" "#include <sys/types.h>
+                    #include <arpa/nameser.h>
+"
+if test "x$ac_cv_have_decl__getlong" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL__GETLONG $ac_have_decl
+_ACEOF
+
+                ac_fn_c_check_member "$LINENO" "HEADER" "ad" "ac_cv_member_HEADER_ad" "#include <arpa/nameser.h>
+"
+if test "x$ac_cv_member_HEADER_ad" = xyes; then :
+
+$as_echo "#define HAVE_HEADER_AD 1" >>confdefs.h
+
+fi
+
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if struct __res_state _res is an extern" >&5
+$as_echo_n "checking if struct __res_state _res is an extern... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+extern struct __res_state _res;
+
+int
+main ()
+{
+
+struct __res_state *volatile p = &_res;  /* force resolution of _res */
+return 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE__RES_EXTERN 1" >>confdefs.h
+
+
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+# Check whether user wants SELinux support
+SELINUX_MSG="no"
+LIBSELINUX=""
+
+# Check whether --with-selinux was given.
+if test "${with_selinux+set}" = set; then :
+  withval=$with_selinux;  if test "x$withval" != "xno" ; then
+                save_LIBS="$LIBS"
+
+$as_echo "#define WITH_SELINUX 1" >>confdefs.h
+
+                SELINUX_MSG="yes"
+                ac_fn_c_check_header_mongrel "$LINENO" "selinux/selinux.h" "ac_cv_header_selinux_selinux_h" "$ac_includes_default"
+if test "x$ac_cv_header_selinux_selinux_h" = xyes; then :
+
+else
+  as_fn_error $? "SELinux support requires selinux.h header" "$LINENO" 5
+fi
+
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setexeccon in -lselinux" >&5
+$as_echo_n "checking for setexeccon in -lselinux... " >&6; }
+if ${ac_cv_lib_selinux_setexeccon+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lselinux  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char setexeccon ();
+int
+main ()
+{
+return setexeccon ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_selinux_setexeccon=yes
+else
+  ac_cv_lib_selinux_setexeccon=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_setexeccon" >&5
+$as_echo "$ac_cv_lib_selinux_setexeccon" >&6; }
+if test "x$ac_cv_lib_selinux_setexeccon" = xyes; then :
+   LIBSELINUX="-lselinux"
+                          LIBS="$LIBS -lselinux"
+
+else
+  as_fn_error $? "SELinux support requires libselinux library" "$LINENO" 5
+fi
+
+                SSHLIBS="$SSHLIBS $LIBSELINUX"
+                SSHDLIBS="$SSHDLIBS $LIBSELINUX"
+                for ac_func in getseuserbyname get_default_context_with_level
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+                LIBS="$save_LIBS"
+        fi
+
+fi
+
+
+
+
+# Check whether user wants Kerberos 5 support
+KRB5_MSG="no"
+
+# Check whether --with-kerberos5 was given.
+if test "${with_kerberos5+set}" = set; then :
+  withval=$with_kerberos5;  if test "x$withval" != "xno" ; then
+                if test "x$withval" = "xyes" ; then
+                        KRB5ROOT="/usr/local"
+                else
+                        KRB5ROOT=${withval}
+                fi
+
+
+$as_echo "#define KRB5 1" >>confdefs.h
+
+                KRB5_MSG="yes"
+
+                if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}krb5-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}krb5-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_KRB5CONF+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $KRB5CONF in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_KRB5CONF="$KRB5CONF" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$KRB5ROOT/bin:$PATH"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_KRB5CONF="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+KRB5CONF=$ac_cv_path_KRB5CONF
+if test -n "$KRB5CONF"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KRB5CONF" >&5
+$as_echo "$KRB5CONF" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_KRB5CONF"; then
+  ac_pt_KRB5CONF=$KRB5CONF
+  # Extract the first word of "krb5-config", so it can be a program name with args.
+set dummy krb5-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_KRB5CONF+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_KRB5CONF in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_KRB5CONF="$ac_pt_KRB5CONF" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$KRB5ROOT/bin:$PATH"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_KRB5CONF="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_KRB5CONF=$ac_cv_path_ac_pt_KRB5CONF
+if test -n "$ac_pt_KRB5CONF"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_KRB5CONF" >&5
+$as_echo "$ac_pt_KRB5CONF" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_KRB5CONF" = x; then
+    KRB5CONF="$KRB5ROOT/bin/krb5-config"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    KRB5CONF=$ac_pt_KRB5CONF
+  fi
+else
+  KRB5CONF="$ac_cv_path_KRB5CONF"
+fi
+
+                if test -x $KRB5CONF ; then
+                        K5CFLAGS="`$KRB5CONF --cflags`"
+                        K5LIBS="`$KRB5CONF --libs`"
+                        CPPFLAGS="$CPPFLAGS $K5CFLAGS"
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gssapi support" >&5
+$as_echo_n "checking for gssapi support... " >&6; }
+                        if $KRB5CONF | grep gssapi >/dev/null ; then
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define GSSAPI 1" >>confdefs.h
+
+                                GSSCFLAGS="`$KRB5CONF --cflags gssapi`"
+                                GSSLIBS="`$KRB5CONF --libs gssapi`"
+                                CPPFLAGS="$CPPFLAGS $GSSCFLAGS"
+                        else
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                        fi
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using Heimdal" >&5
+$as_echo_n "checking whether we are using Heimdal... " >&6; }
+                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <krb5.h>
+
+int
+main ()
+{
+ char *tmp = heimdal_version;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HEIMDAL 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+                else
+                        CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include"
+                        LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib"
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using Heimdal" >&5
+$as_echo_n "checking whether we are using Heimdal... " >&6; }
+                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <krb5.h>
+
+int
+main ()
+{
+ char *tmp = heimdal_version;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                                         $as_echo "#define HEIMDAL 1" >>confdefs.h
+
+                                         K5LIBS="-lkrb5"
+                                         K5LIBS="$K5LIBS -lcom_err -lasn1"
+                                         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for net_write in -lroken" >&5
+$as_echo_n "checking for net_write in -lroken... " >&6; }
+if ${ac_cv_lib_roken_net_write+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lroken  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char net_write ();
+int
+main ()
+{
+return net_write ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_roken_net_write=yes
+else
+  ac_cv_lib_roken_net_write=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_roken_net_write" >&5
+$as_echo "$ac_cv_lib_roken_net_write" >&6; }
+if test "x$ac_cv_lib_roken_net_write" = xyes; then :
+  K5LIBS="$K5LIBS -lroken"
+fi
+
+                                         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_cbc_encrypt in -ldes" >&5
+$as_echo_n "checking for des_cbc_encrypt in -ldes... " >&6; }
+if ${ac_cv_lib_des_des_cbc_encrypt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldes  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char des_cbc_encrypt ();
+int
+main ()
+{
+return des_cbc_encrypt ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_des_des_cbc_encrypt=yes
+else
+  ac_cv_lib_des_des_cbc_encrypt=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_des_des_cbc_encrypt" >&5
+$as_echo "$ac_cv_lib_des_des_cbc_encrypt" >&6; }
+if test "x$ac_cv_lib_des_des_cbc_encrypt" = xyes; then :
+  K5LIBS="$K5LIBS -ldes"
+fi
+
+
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                                         K5LIBS="-lkrb5 -lk5crypto -lcom_err"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dn_expand" >&5
+$as_echo_n "checking for library containing dn_expand... " >&6; }
+if ${ac_cv_search_dn_expand+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dn_expand ();
+int
+main ()
+{
+return dn_expand ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' resolv; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_dn_expand=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_dn_expand+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_dn_expand+:} false; then :
+
+else
+  ac_cv_search_dn_expand=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dn_expand" >&5
+$as_echo "$ac_cv_search_dn_expand" >&6; }
+ac_res=$ac_cv_search_dn_expand
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_init_sec_context in -lgssapi_krb5" >&5
+$as_echo_n "checking for gss_init_sec_context in -lgssapi_krb5... " >&6; }
+if ${ac_cv_lib_gssapi_krb5_gss_init_sec_context+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgssapi_krb5  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gss_init_sec_context ();
+int
+main ()
+{
+return gss_init_sec_context ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_gssapi_krb5_gss_init_sec_context=yes
+else
+  ac_cv_lib_gssapi_krb5_gss_init_sec_context=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&5
+$as_echo "$ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&6; }
+if test "x$ac_cv_lib_gssapi_krb5_gss_init_sec_context" = xyes; then :
+   $as_echo "#define GSSAPI 1" >>confdefs.h
+
+                                  GSSLIBS="-lgssapi_krb5"
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_init_sec_context in -lgssapi" >&5
+$as_echo_n "checking for gss_init_sec_context in -lgssapi... " >&6; }
+if ${ac_cv_lib_gssapi_gss_init_sec_context+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgssapi  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gss_init_sec_context ();
+int
+main ()
+{
+return gss_init_sec_context ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_gssapi_gss_init_sec_context=yes
+else
+  ac_cv_lib_gssapi_gss_init_sec_context=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gssapi_gss_init_sec_context" >&5
+$as_echo "$ac_cv_lib_gssapi_gss_init_sec_context" >&6; }
+if test "x$ac_cv_lib_gssapi_gss_init_sec_context" = xyes; then :
+   $as_echo "#define GSSAPI 1" >>confdefs.h
+
+                                          GSSLIBS="-lgssapi"
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_init_sec_context in -lgss" >&5
+$as_echo_n "checking for gss_init_sec_context in -lgss... " >&6; }
+if ${ac_cv_lib_gss_gss_init_sec_context+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgss  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gss_init_sec_context ();
+int
+main ()
+{
+return gss_init_sec_context ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_gss_gss_init_sec_context=yes
+else
+  ac_cv_lib_gss_gss_init_sec_context=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gss_gss_init_sec_context" >&5
+$as_echo "$ac_cv_lib_gss_gss_init_sec_context" >&6; }
+if test "x$ac_cv_lib_gss_gss_init_sec_context" = xyes; then :
+   $as_echo "#define GSSAPI 1" >>confdefs.h
+
+                                                  GSSLIBS="-lgss"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find any suitable gss-api library - build may fail" >&5
+$as_echo "$as_me: WARNING: Cannot find any suitable gss-api library - build may fail" >&2;}
+fi
+
+
+fi
+
+
+fi
+
+
+                        ac_fn_c_check_header_mongrel "$LINENO" "gssapi.h" "ac_cv_header_gssapi_h" "$ac_includes_default"
+if test "x$ac_cv_header_gssapi_h" = xyes; then :
+
+else
+   unset ac_cv_header_gssapi_h
+                                  CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi"
+                                  for ac_header in gssapi.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "gssapi.h" "ac_cv_header_gssapi_h" "$ac_includes_default"
+if test "x$ac_cv_header_gssapi_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GSSAPI_H 1
+_ACEOF
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find any suitable gss-api header - build may fail" >&5
+$as_echo "$as_me: WARNING: Cannot find any suitable gss-api header - build may fail" >&2;}
+
+fi
+
+done
+
+
+
+fi
+
+
+
+                        oldCPP="$CPPFLAGS"
+                        CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi"
+                        ac_fn_c_check_header_mongrel "$LINENO" "gssapi_krb5.h" "ac_cv_header_gssapi_krb5_h" "$ac_includes_default"
+if test "x$ac_cv_header_gssapi_krb5_h" = xyes; then :
+
+else
+   CPPFLAGS="$oldCPP"
+fi
+
+
+
+                fi
+                if test -n "${rpath_opt}" ; then
+                        LDFLAGS="$LDFLAGS ${rpath_opt}${KRB5ROOT}/lib"
+                fi
+                if test ! -z "$blibpath" ; then
+                        blibpath="$blibpath:${KRB5ROOT}/lib"
+                fi
+
+                for ac_header in gssapi.h gssapi/gssapi.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+                for ac_header in gssapi_krb5.h gssapi/gssapi_krb5.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+                for ac_header in gssapi_generic.h gssapi/gssapi_generic.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing k_hasafs" >&5
+$as_echo_n "checking for library containing k_hasafs... " >&6; }
+if ${ac_cv_search_k_hasafs+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char k_hasafs ();
+int
+main ()
+{
+return k_hasafs ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' kafs; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_k_hasafs=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_k_hasafs+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_k_hasafs+:} false; then :
+
+else
+  ac_cv_search_k_hasafs=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_k_hasafs" >&5
+$as_echo "$ac_cv_search_k_hasafs" >&6; }
+ac_res=$ac_cv_search_k_hasafs
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+$as_echo "#define USE_AFS 1" >>confdefs.h
+
+fi
+
+
+                ac_fn_c_check_decl "$LINENO" "GSS_C_NT_HOSTBASED_SERVICE" "ac_cv_have_decl_GSS_C_NT_HOSTBASED_SERVICE" "
+#ifdef HAVE_GSSAPI_H
+# include <gssapi.h>
+#elif defined(HAVE_GSSAPI_GSSAPI_H)
+# include <gssapi/gssapi.h>
+#endif
+
+#ifdef HAVE_GSSAPI_GENERIC_H
+# include <gssapi_generic.h>
+#elif defined(HAVE_GSSAPI_GSSAPI_GENERIC_H)
+# include <gssapi/gssapi_generic.h>
+#endif
+
+"
+if test "x$ac_cv_have_decl_GSS_C_NT_HOSTBASED_SERVICE" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GSS_C_NT_HOSTBASED_SERVICE $ac_have_decl
+_ACEOF
+
+                saved_LIBS="$LIBS"
+                LIBS="$LIBS $K5LIBS"
+                for ac_func in krb5_cc_new_unique krb5_get_error_message krb5_free_error_message
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+                LIBS="$saved_LIBS"
+
+        fi
+
+
+fi
+
+
+
+
+# Looking for programs, paths and files
+
+PRIVSEP_PATH=/var/empty
+
+# Check whether --with-privsep-path was given.
+if test "${with_privsep_path+set}" = set; then :
+  withval=$with_privsep_path;
+                if test -n "$withval"  &&  test "x$withval" != "xno"  &&  \
+                    test "x${withval}" != "xyes"; then
+                        PRIVSEP_PATH=$withval
+                fi
+
+
+fi
+
+
+
+
+# Check whether --with-xauth was given.
+if test "${with_xauth+set}" = set; then :
+  withval=$with_xauth;
+                if test -n "$withval"  &&  test "x$withval" != "xno"  &&  \
+                    test "x${withval}" != "xyes"; then
+                        xauth_path=$withval
+                fi
+
+else
+
+                TestPath="$PATH"
+                TestPath="${TestPath}${PATH_SEPARATOR}/usr/X/bin"
+                TestPath="${TestPath}${PATH_SEPARATOR}/usr/bin/X11"
+                TestPath="${TestPath}${PATH_SEPARATOR}/usr/X11R6/bin"
+                TestPath="${TestPath}${PATH_SEPARATOR}/usr/openwin/bin"
+                # Extract the first word of "xauth", so it can be a program name with args.
+set dummy xauth; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_xauth_path+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $xauth_path in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_xauth_path="$xauth_path" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $TestPath
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_xauth_path="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+xauth_path=$ac_cv_path_xauth_path
+if test -n "$xauth_path"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xauth_path" >&5
+$as_echo "$xauth_path" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+                if (test ! -z "$xauth_path" && test -x "/usr/openwin/bin/xauth") ; then
+                        xauth_path="/usr/openwin/bin/xauth"
+                fi
+
+
+fi
+
+
+STRIP_OPT=-s
+# Check whether --enable-strip was given.
+if test "${enable_strip+set}" = set; then :
+  enableval=$enable_strip;
+                if test "x$enableval" = "xno" ; then
+                        STRIP_OPT=
+                fi
+
+
+fi
+
+
+
+if test -z "$xauth_path" ; then
+        XAUTH_PATH="undefined"
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define XAUTH_PATH "$xauth_path"
+_ACEOF
+
+        XAUTH_PATH=$xauth_path
+
+fi
+
+# Check for mail directory
+
+# Check whether --with-maildir was given.
+if test "${with_maildir+set}" = set; then :
+  withval=$with_maildir;
+        if test "X$withval" != X  &&  test "x$withval" != xno  &&  \
+            test "x${withval}" != xyes; then
+
+cat >>confdefs.h <<_ACEOF
+#define MAIL_DIRECTORY "$withval"
+_ACEOF
+
+            fi
+
+else
+
+        if test "X$maildir" != "X"; then
+            cat >>confdefs.h <<_ACEOF
+#define MAIL_DIRECTORY "$maildir"
+_ACEOF
+
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking Discovering system mail directory" >&5
+$as_echo_n "checking Discovering system mail directory... " >&6; }
+            if test "$cross_compiling" = yes; then :
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: use --with-maildir=/path/to/mail" >&5
+$as_echo "$as_me: WARNING: cross compiling: use --with-maildir=/path/to/mail" >&2;}
+
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdio.h>
+#include <string.h>
+#ifdef HAVE_PATHS_H
+#include <paths.h>
+#endif
+#ifdef HAVE_MAILLOCK_H
+#include <maillock.h>
+#endif
+#define DATA "conftest.maildir"
+
+int
+main ()
+{
+
+        FILE *fd;
+        int rc;
+
+        fd = fopen(DATA,"w");
+        if(fd == NULL)
+                exit(1);
+
+#if defined (_PATH_MAILDIR)
+        if ((rc = fprintf(fd ,"_PATH_MAILDIR:%s\n", _PATH_MAILDIR)) <0)
+                exit(1);
+#elif defined (MAILDIR)
+        if ((rc = fprintf(fd ,"MAILDIR:%s\n", MAILDIR)) <0)
+                exit(1);
+#elif defined (_PATH_MAIL)
+        if ((rc = fprintf(fd ,"_PATH_MAIL:%s\n", _PATH_MAIL)) <0)
+                exit(1);
+#else
+        exit (2);
+#endif
+
+        exit(0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+                    maildir_what=`awk -F: '{print $1}' conftest.maildir`
+                    maildir=`awk -F: '{print $2}' conftest.maildir \
+                        | sed 's|/$||'`
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using: $maildir from $maildir_what" >&5
+$as_echo "Using: $maildir from $maildir_what" >&6; }
+                    if test "x$maildir_what" != "x_PATH_MAILDIR"; then
+                        cat >>confdefs.h <<_ACEOF
+#define MAIL_DIRECTORY "$maildir"
+_ACEOF
+
+                    fi
+
+else
+
+                    if test "X$ac_status" = "X2";then
+# our test program didn't find it. Default to /var/spool/mail
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using: default value of /var/spool/mail" >&5
+$as_echo "Using: default value of /var/spool/mail" >&6; }
+                        cat >>confdefs.h <<_ACEOF
+#define MAIL_DIRECTORY "/var/spool/mail"
+_ACEOF
+
+                     else
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** not found ***" >&5
+$as_echo "*** not found ***" >&6; }
+                     fi
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+        fi
+
+
+fi
+ # maildir
+
+if test ! -z "$cross_compiling" && test "x$cross_compiling" = "xyes"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: Disabling /dev/ptmx test" >&5
+$as_echo "$as_me: WARNING: cross compiling: Disabling /dev/ptmx test" >&2;}
+        disable_ptmx_check=yes
+fi
+if test -z "$no_dev_ptmx" ; then
+        if test "x$disable_ptmx_check" != "xyes" ; then
+                as_ac_File=`$as_echo "ac_cv_file_"/dev/ptmx"" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for \"/dev/ptmx\"" >&5
+$as_echo_n "checking for \"/dev/ptmx\"... " >&6; }
+if eval \${$as_ac_File+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  test "$cross_compiling" = yes &&
+  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r ""/dev/ptmx""; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+eval ac_res=\$$as_ac_File
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DEV_PTMX 1
+_ACEOF
+
+                                have_dev_ptmx=1
+
+
+fi
+
+        fi
+fi
+
+if test ! -z "$cross_compiling" && test "x$cross_compiling" != "xyes"; then
+        as_ac_File=`$as_echo "ac_cv_file_"/dev/ptc"" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for \"/dev/ptc\"" >&5
+$as_echo_n "checking for \"/dev/ptc\"... " >&6; }
+if eval \${$as_ac_File+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  test "$cross_compiling" = yes &&
+  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r ""/dev/ptc""; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+eval ac_res=\$$as_ac_File
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DEV_PTS_AND_PTC 1
+_ACEOF
+
+                        have_dev_ptc=1
+
+
+fi
+
+else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: Disabling /dev/ptc test" >&5
+$as_echo "$as_me: WARNING: cross compiling: Disabling /dev/ptc test" >&2;}
+fi
+
+# Options from here on. Some of these are preset by platform above
+
+# Check whether --with-mantype was given.
+if test "${with_mantype+set}" = set; then :
+  withval=$with_mantype;
+                case "$withval" in
+                man|cat|doc)
+                        MANTYPE=$withval
+                        ;;
+                *)
+                        as_fn_error $? "invalid man type: $withval" "$LINENO" 5
+                        ;;
+                esac
+
+
+fi
+
+if test -z "$MANTYPE"; then
+        if ${MANDOC} ${srcdir}/ssh.1 >/dev/null 2>&1; then
+                MANTYPE=doc
+        elif ${NROFF} -mdoc ${srcdir}/ssh.1 >/dev/null 2>&1; then
+                MANTYPE=doc
+        elif ${NROFF} -man ${srcdir}/ssh.1 >/dev/null 2>&1; then
+                MANTYPE=man
+        else
+                MANTYPE=cat
+        fi
+fi
+
+if test "$MANTYPE" = "doc"; then
+        mansubdir=man;
+else
+        mansubdir=$MANTYPE;
+fi
+
+
+# Check whether to enable MD5 passwords
+MD5_MSG="no"
+
+# Check whether --with-md5-passwords was given.
+if test "${with_md5_passwords+set}" = set; then :
+  withval=$with_md5_passwords;
+                if test "x$withval" != "xno" ; then
+
+$as_echo "#define HAVE_MD5_PASSWORDS 1" >>confdefs.h
+
+                        MD5_MSG="yes"
+                fi
+
+
+fi
+
+
+# Whether to disable shadow password support
+
+# Check whether --with-shadow was given.
+if test "${with_shadow+set}" = set; then :
+  withval=$with_shadow;
+                if test "x$withval" = "xno" ; then
+                        $as_echo "#define DISABLE_SHADOW 1" >>confdefs.h
+
+                        disable_shadow=yes
+                fi
+
+
+fi
+
+
+if test -z "$disable_shadow" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the systems has expire shadow information" >&5
+$as_echo_n "checking if the systems has expire shadow information... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <shadow.h>
+struct spwd sp;
+
+int
+main ()
+{
+ sp.sp_expire = sp.sp_lstchg = sp.sp_inact = 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   sp_expire_available=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+        if test "x$sp_expire_available" = "xyes" ; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAS_SHADOW_EXPIRE 1" >>confdefs.h
+
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+fi
+
+# Use ip address instead of hostname in $DISPLAY
+if test ! -z "$IPADDR_IN_DISPLAY" ; then
+        DISPLAY_HACK_MSG="yes"
+
+$as_echo "#define IPADDR_IN_DISPLAY 1" >>confdefs.h
+
+else
+        DISPLAY_HACK_MSG="no"
+
+# Check whether --with-ipaddr-display was given.
+if test "${with_ipaddr_display+set}" = set; then :
+  withval=$with_ipaddr_display;
+                        if test "x$withval" != "xno" ; then
+                                $as_echo "#define IPADDR_IN_DISPLAY 1" >>confdefs.h
+
+                                DISPLAY_HACK_MSG="yes"
+                        fi
+
+
+fi
+
+fi
+
+# check for /etc/default/login and use it if present.
+# Check whether --enable-etc-default-login was given.
+if test "${enable_etc_default_login+set}" = set; then :
+  enableval=$enable_etc_default_login;  if test "x$enableval" = "xno"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: /etc/default/login handling disabled" >&5
+$as_echo "$as_me: /etc/default/login handling disabled" >&6;}
+                etc_default_login=no
+          else
+                etc_default_login=yes
+          fi
+else
+   if test ! -z "$cross_compiling" && test "x$cross_compiling" = "xyes";
+          then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking /etc/default/login" >&5
+$as_echo "$as_me: WARNING: cross compiling: not checking /etc/default/login" >&2;}
+                etc_default_login=no
+          else
+                etc_default_login=yes
+          fi
+
+fi
+
+
+if test "x$etc_default_login" != "xno"; then
+        as_ac_File=`$as_echo "ac_cv_file_"/etc/default/login"" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for \"/etc/default/login\"" >&5
+$as_echo_n "checking for \"/etc/default/login\"... " >&6; }
+if eval \${$as_ac_File+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  test "$cross_compiling" = yes &&
+  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r ""/etc/default/login""; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+eval ac_res=\$$as_ac_File
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+   external_path_file=/etc/default/login
+fi
+
+        if test "x$external_path_file" = "x/etc/default/login"; then
+
+$as_echo "#define HAVE_ETC_DEFAULT_LOGIN 1" >>confdefs.h
+
+        fi
+fi
+
+if test $ac_cv_func_login_getcapbool = "yes" && \
+        test $ac_cv_header_login_cap_h = "yes" ; then
+        external_path_file=/etc/login.conf
+fi
+
+# Whether to mess with the default path
+SERVER_PATH_MSG="(default)"
+
+# Check whether --with-default-path was given.
+if test "${with_default_path+set}" = set; then :
+  withval=$with_default_path;
+                if test "x$external_path_file" = "x/etc/login.conf" ; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+--with-default-path=PATH has no effect on this system.
+Edit /etc/login.conf instead." >&5
+$as_echo "$as_me: WARNING:
+--with-default-path=PATH has no effect on this system.
+Edit /etc/login.conf instead." >&2;}
+                elif test "x$withval" != "xno" ; then
+                        if test ! -z "$external_path_file" ; then
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+--with-default-path=PATH will only be used if PATH is not defined in
+$external_path_file ." >&5
+$as_echo "$as_me: WARNING:
+--with-default-path=PATH will only be used if PATH is not defined in
+$external_path_file ." >&2;}
+                        fi
+                        user_path="$withval"
+                        SERVER_PATH_MSG="$withval"
+                fi
+
+else
+   if test "x$external_path_file" = "x/etc/login.conf" ; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Make sure the path to scp is in /etc/login.conf" >&5
+$as_echo "$as_me: WARNING: Make sure the path to scp is in /etc/login.conf" >&2;}
+        else
+                if test ! -z "$external_path_file" ; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+If PATH is defined in $external_path_file, ensure the path to scp is included,
+otherwise scp will not work." >&5
+$as_echo "$as_me: WARNING:
+If PATH is defined in $external_path_file, ensure the path to scp is included,
+otherwise scp will not work." >&2;}
+                fi
+                if test "$cross_compiling" = yes; then :
+   user_path="/usr/bin:/bin:/usr/sbin:/sbin"
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* find out what STDPATH is */
+#include <stdio.h>
+#ifdef HAVE_PATHS_H
+# include <paths.h>
+#endif
+#ifndef _PATH_STDPATH
+# ifdef _PATH_USERPATH  /* Irix */
+#  define _PATH_STDPATH _PATH_USERPATH
+# else
+#  define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin"
+# endif
+#endif
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#define DATA "conftest.stdpath"
+
+int
+main ()
+{
+
+        FILE *fd;
+        int rc;
+
+        fd = fopen(DATA,"w");
+        if(fd == NULL)
+                exit(1);
+
+        if ((rc = fprintf(fd,"%s", _PATH_STDPATH)) < 0)
+                exit(1);
+
+        exit(0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+   user_path=`cat conftest.stdpath`
+else
+   user_path="/usr/bin:/bin:/usr/sbin:/sbin"
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+# make sure $bindir is in USER_PATH so scp will work
+                t_bindir="${bindir}"
+                while echo "${t_bindir}" | egrep '\$\{|NONE/' >/dev/null 2>&1; do
+                        t_bindir=`eval echo ${t_bindir}`
+                        case $t_bindir in
+                                NONE/*) t_bindir=`echo $t_bindir | sed "s~NONE~$prefix~"` ;;
+                        esac
+                        case $t_bindir in
+                                NONE/*) t_bindir=`echo $t_bindir | sed "s~NONE~$ac_default_prefix~"` ;;
+                        esac
+                done
+                echo $user_path | grep ":$t_bindir"  > /dev/null 2>&1
+                if test $? -ne 0  ; then
+                        echo $user_path | grep "^$t_bindir"  > /dev/null 2>&1
+                        if test $? -ne 0  ; then
+                                user_path=$user_path:$t_bindir
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: result: Adding $t_bindir to USER_PATH so scp will work" >&5
+$as_echo "Adding $t_bindir to USER_PATH so scp will work" >&6; }
+                        fi
+                fi
+        fi
+
+fi
+
+if test "x$external_path_file" != "x/etc/login.conf" ; then
+
+cat >>confdefs.h <<_ACEOF
+#define USER_PATH "$user_path"
+_ACEOF
+
+
+fi
+
+# Set superuser path separately to user path
+
+# Check whether --with-superuser-path was given.
+if test "${with_superuser_path+set}" = set; then :
+  withval=$with_superuser_path;
+                if test -n "$withval"  &&  test "x$withval" != "xno"  &&  \
+                    test "x${withval}" != "xyes"; then
+
+cat >>confdefs.h <<_ACEOF
+#define SUPERUSER_PATH "$withval"
+_ACEOF
+
+                        superuser_path=$withval
+                fi
+
+
+fi
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need to convert IPv4 in IPv6-mapped addresses" >&5
+$as_echo_n "checking if we need to convert IPv4 in IPv6-mapped addresses... " >&6; }
+IPV4_IN6_HACK_MSG="no"
+
+# Check whether --with-4in6 was given.
+if test "${with_4in6+set}" = set; then :
+  withval=$with_4in6;
+                if test "x$withval" != "xno" ; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define IPV4_IN_IPV6 1" >>confdefs.h
+
+                        IPV4_IN6_HACK_MSG="yes"
+                else
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                fi
+
+else
+
+                if test "x$inet6_default_4in6" = "xyes"; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (default)" >&5
+$as_echo "yes (default)" >&6; }
+                        $as_echo "#define IPV4_IN_IPV6 1" >>confdefs.h
+
+                        IPV4_IN6_HACK_MSG="yes"
+                else
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (default)" >&5
+$as_echo "no (default)" >&6; }
+                fi
+
+
+fi
+
+
+# Whether to enable BSD auth support
+BSD_AUTH_MSG=no
+
+# Check whether --with-bsd-auth was given.
+if test "${with_bsd_auth+set}" = set; then :
+  withval=$with_bsd_auth;
+                if test "x$withval" != "xno" ; then
+
+$as_echo "#define BSD_AUTH 1" >>confdefs.h
+
+                        BSD_AUTH_MSG=yes
+                fi
+
+
+fi
+
+
+# Where to place sshd.pid
+piddir=/var/run
+# make sure the directory exists
+if test ! -d $piddir ; then
+        piddir=`eval echo ${sysconfdir}`
+        case $piddir in
+                NONE/*) piddir=`echo $piddir | sed "s~NONE~$ac_default_prefix~"` ;;
+        esac
+fi
+
+
+# Check whether --with-pid-dir was given.
+if test "${with_pid_dir+set}" = set; then :
+  withval=$with_pid_dir;
+                if test -n "$withval"  &&  test "x$withval" != "xno"  &&  \
+                    test "x${withval}" != "xyes"; then
+                        piddir=$withval
+                        if test ! -d $piddir ; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ** no $piddir directory on this system **" >&5
+$as_echo "$as_me: WARNING: ** no $piddir directory on this system **" >&2;}
+                        fi
+                fi
+
+
+fi
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define _PATH_SSH_PIDDIR "$piddir"
+_ACEOF
+
+
+
+# Check whether --enable-lastlog was given.
+if test "${enable_lastlog+set}" = set; then :
+  enableval=$enable_lastlog;
+                if test "x$enableval" = "xno" ; then
+                        $as_echo "#define DISABLE_LASTLOG 1" >>confdefs.h
+
+                fi
+
+
+fi
+
+# Check whether --enable-utmp was given.
+if test "${enable_utmp+set}" = set; then :
+  enableval=$enable_utmp;
+                if test "x$enableval" = "xno" ; then
+                        $as_echo "#define DISABLE_UTMP 1" >>confdefs.h
+
+                fi
+
+
+fi
+
+# Check whether --enable-utmpx was given.
+if test "${enable_utmpx+set}" = set; then :
+  enableval=$enable_utmpx;
+                if test "x$enableval" = "xno" ; then
+
+$as_echo "#define DISABLE_UTMPX 1" >>confdefs.h
+
+                fi
+
+
+fi
+
+# Check whether --enable-wtmp was given.
+if test "${enable_wtmp+set}" = set; then :
+  enableval=$enable_wtmp;
+                if test "x$enableval" = "xno" ; then
+                        $as_echo "#define DISABLE_WTMP 1" >>confdefs.h
+
+                fi
+
+
+fi
+
+# Check whether --enable-wtmpx was given.
+if test "${enable_wtmpx+set}" = set; then :
+  enableval=$enable_wtmpx;
+                if test "x$enableval" = "xno" ; then
+
+$as_echo "#define DISABLE_WTMPX 1" >>confdefs.h
+
+                fi
+
+
+fi
+
+# Check whether --enable-libutil was given.
+if test "${enable_libutil+set}" = set; then :
+  enableval=$enable_libutil;
+                if test "x$enableval" = "xno" ; then
+                        $as_echo "#define DISABLE_LOGIN 1" >>confdefs.h
+
+                fi
+
+
+fi
+
+# Check whether --enable-pututline was given.
+if test "${enable_pututline+set}" = set; then :
+  enableval=$enable_pututline;
+                if test "x$enableval" = "xno" ; then
+
+$as_echo "#define DISABLE_PUTUTLINE 1" >>confdefs.h
+
+                fi
+
+
+fi
+
+# Check whether --enable-pututxline was given.
+if test "${enable_pututxline+set}" = set; then :
+  enableval=$enable_pututxline;
+                if test "x$enableval" = "xno" ; then
+
+$as_echo "#define DISABLE_PUTUTXLINE 1" >>confdefs.h
+
+                fi
+
+
+fi
+
+
+# Check whether --with-lastlog was given.
+if test "${with_lastlog+set}" = set; then :
+  withval=$with_lastlog;
+                if test "x$withval" = "xno" ; then
+                        $as_echo "#define DISABLE_LASTLOG 1" >>confdefs.h
+
+                elif test -n "$withval"  &&  test "x${withval}" != "xyes"; then
+                        conf_lastlog_location=$withval
+                fi
+
+
+fi
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if your system defines LASTLOG_FILE" >&5
+$as_echo_n "checking if your system defines LASTLOG_FILE... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <utmp.h>
+#ifdef HAVE_LASTLOG_H
+#  include <lastlog.h>
+#endif
+#ifdef HAVE_PATHS_H
+#  include <paths.h>
+#endif
+#ifdef HAVE_LOGIN_H
+# include <login.h>
+#endif
+
+int
+main ()
+{
+ char *lastlog = LASTLOG_FILE;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if your system defines _PATH_LASTLOG" >&5
+$as_echo_n "checking if your system defines _PATH_LASTLOG... " >&6; }
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <utmp.h>
+#ifdef HAVE_LASTLOG_H
+#  include <lastlog.h>
+#endif
+#ifdef HAVE_PATHS_H
+#  include <paths.h>
+#endif
+
+int
+main ()
+{
+ char *lastlog = _PATH_LASTLOG;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                        system_lastlog_path=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test -z "$conf_lastlog_location"; then
+        if test x"$system_lastlog_path" = x"no" ; then
+                for f in /var/log/lastlog /usr/adm/lastlog /var/adm/lastlog /etc/security/lastlog ; do
+                                if (test -d "$f" || test -f "$f") ; then
+                                        conf_lastlog_location=$f
+                                fi
+                done
+                if test -z "$conf_lastlog_location"; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ** Cannot find lastlog **" >&5
+$as_echo "$as_me: WARNING: ** Cannot find lastlog **" >&2;}
+                                        fi
+        fi
+fi
+
+if test -n "$conf_lastlog_location"; then
+
+cat >>confdefs.h <<_ACEOF
+#define CONF_LASTLOG_FILE "$conf_lastlog_location"
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if your system defines UTMP_FILE" >&5
+$as_echo_n "checking if your system defines UTMP_FILE... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <utmp.h>
+#ifdef HAVE_PATHS_H
+#  include <paths.h>
+#endif
+
+int
+main ()
+{
+ char *utmp = UTMP_FILE;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+          system_utmp_path=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+if test -z "$conf_utmp_location"; then
+        if test x"$system_utmp_path" = x"no" ; then
+                for f in /etc/utmp /usr/adm/utmp /var/run/utmp; do
+                        if test -f $f ; then
+                                conf_utmp_location=$f
+                        fi
+                done
+                if test -z "$conf_utmp_location"; then
+                        $as_echo "#define DISABLE_UTMP 1" >>confdefs.h
+
+                fi
+        fi
+fi
+if test -n "$conf_utmp_location"; then
+
+cat >>confdefs.h <<_ACEOF
+#define CONF_UTMP_FILE "$conf_utmp_location"
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if your system defines WTMP_FILE" >&5
+$as_echo_n "checking if your system defines WTMP_FILE... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <utmp.h>
+#ifdef HAVE_PATHS_H
+#  include <paths.h>
+#endif
+
+int
+main ()
+{
+ char *wtmp = WTMP_FILE;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+          system_wtmp_path=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+if test -z "$conf_wtmp_location"; then
+        if test x"$system_wtmp_path" = x"no" ; then
+                for f in /usr/adm/wtmp /var/log/wtmp; do
+                        if test -f $f ; then
+                                conf_wtmp_location=$f
+                        fi
+                done
+                if test -z "$conf_wtmp_location"; then
+                        $as_echo "#define DISABLE_WTMP 1" >>confdefs.h
+
+                fi
+        fi
+fi
+if test -n "$conf_wtmp_location"; then
+
+cat >>confdefs.h <<_ACEOF
+#define CONF_WTMP_FILE "$conf_wtmp_location"
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if your system defines WTMPX_FILE" >&5
+$as_echo_n "checking if your system defines WTMPX_FILE... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <utmp.h>
+#ifdef HAVE_UTMPX_H
+#include <utmpx.h>
+#endif
+#ifdef HAVE_PATHS_H
+#  include <paths.h>
+#endif
+
+int
+main ()
+{
+ char *wtmpx = WTMPX_FILE;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+          system_wtmpx_path=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+if test -z "$conf_wtmpx_location"; then
+        if test x"$system_wtmpx_path" = x"no" ; then
+                $as_echo "#define DISABLE_WTMPX 1" >>confdefs.h
+
+        fi
+else
+
+cat >>confdefs.h <<_ACEOF
+#define CONF_WTMPX_FILE "$conf_wtmpx_location"
+_ACEOF
+
+fi
+
+
+if test ! -z "$blibpath" ; then
+        LDFLAGS="$LDFLAGS $blibflags$blibpath"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Please check and edit blibpath in LDFLAGS in Makefile" >&5
+$as_echo "$as_me: WARNING: Please check and edit blibpath in LDFLAGS in Makefile" >&2;}
+fi
+
+ac_fn_c_check_member "$LINENO" "struct lastlog" "ll_line" "ac_cv_member_struct_lastlog_ll_line" "
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_UTMP_H
+#include <utmp.h>
+#endif
+#ifdef HAVE_UTMPX_H
+#include <utmpx.h>
+#endif
+#ifdef HAVE_LASTLOG_H
+#include <lastlog.h>
+#endif
+
+"
+if test "x$ac_cv_member_struct_lastlog_ll_line" = xyes; then :
+
+else
+
+    if test x$SKIP_DISABLE_LASTLOG_DEFINE != "xyes" ; then
+        $as_echo "#define DISABLE_LASTLOG 1" >>confdefs.h
+
+    fi
+
+fi
+
+
+ac_fn_c_check_member "$LINENO" "struct utmp" "ut_line" "ac_cv_member_struct_utmp_ut_line" "
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_UTMP_H
+#include <utmp.h>
+#endif
+#ifdef HAVE_UTMPX_H
+#include <utmpx.h>
+#endif
+#ifdef HAVE_LASTLOG_H
+#include <lastlog.h>
+#endif
+
+"
+if test "x$ac_cv_member_struct_utmp_ut_line" = xyes; then :
+
+else
+
+        $as_echo "#define DISABLE_UTMP 1" >>confdefs.h
+
+        $as_echo "#define DISABLE_WTMP 1" >>confdefs.h
+
+
+fi
+
+
+CFLAGS="$CFLAGS $werror_flags"
+
+if test "x$ac_cv_func_getaddrinfo" != "xyes" ; then
+        TEST_SSH_IPV6=no
+else
+        TEST_SSH_IPV6=yes
+fi
+ac_fn_c_check_decl "$LINENO" "BROKEN_GETADDRINFO" "ac_cv_have_decl_BROKEN_GETADDRINFO" "$ac_includes_default"
+if test "x$ac_cv_have_decl_BROKEN_GETADDRINFO" = xyes; then :
+  TEST_SSH_IPV6=no
+fi
+
+TEST_SSH_IPV6=$TEST_SSH_IPV6
+
+TEST_SSH_UTF8=$TEST_SSH_UTF8
+
+TEST_MALLOC_OPTIONS=$TEST_MALLOC_OPTIONS
+
+UNSUPPORTED_ALGORITHMS=$unsupported_algorithms
+
+DEPEND=$(cat $srcdir/.depend)
+
+
+CFLAGS="${CFLAGS} ${CFLAGS_AFTER}"
+LDFLAGS="${LDFLAGS} ${LDFLAGS_AFTER}"
+
+# Make a copy of CFLAGS/LDFLAGS without PIE options.
+LDFLAGS_NOPIE=`echo "$LDFLAGS" | sed 's/ -pie//'`
+CFLAGS_NOPIE=`echo "$CFLAGS" | sed 's/ -fPIE//'`
+
+
+
+
+ac_config_files="$ac_config_files Makefile buildpkg.sh opensshd.init openssh.xml openbsd-compat/Makefile openbsd-compat/regress/Makefile survey.sh"
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      sed -n \
+        "s/'/'\\\\''/g;
+          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+        cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+          mv -f confcache "$cache_file"$$ &&
+          mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+          mv -f confcache "$cache_file" ;;
+        esac
+      fi
+    fi
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+U=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+
+
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+        expr "X$arg" : "X\\(.*\\)$as_nl";
+        arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""        $as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+         X"$0" : 'X\(//\)$' \| \
+         X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+            s//\1/
+            q
+          }
+          /^X\/\(\/\/\)$/{
+            s//\1/
+            q
+          }
+          /^X\/\(\/\).*/{
+            s//\1/
+            q
+          }
+          s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T=' ';;     # ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T=' ';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$as_dir" : 'X\(//\)[^/]' \| \
+         X"$as_dir" : 'X\(//\)$' \| \
+         X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+            s//\1/
+            q
+          }
+          /^X\(\/\/\)[^/].*/{
+            s//\1/
+            q
+          }
+          /^X\(\/\/\)$/{
+            s//\1/
+            q
+          }
+          /^X\(\/\).*/{
+            s//\1/
+            q
+          }
+          s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by OpenSSH $as_me Portable, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Report bugs to <openssh-unix-dev@mindrot.org>."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_version="\\
+OpenSSH config.status Portable
+configured by $0, generated by GNU Autoconf 2.69,
+  with options \\"\$ac_cs_config\\"
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=?*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
+  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "buildpkg.sh") CONFIG_FILES="$CONFIG_FILES buildpkg.sh" ;;
+    "opensshd.init") CONFIG_FILES="$CONFIG_FILES opensshd.init" ;;
+    "openssh.xml") CONFIG_FILES="$CONFIG_FILES openssh.xml" ;;
+    "openbsd-compat/Makefile") CONFIG_FILES="$CONFIG_FILES openbsd-compat/Makefile" ;;
+    "openbsd-compat/regress/Makefile") CONFIG_FILES="$CONFIG_FILES openbsd-compat/regress/Makefile" ;;
+    "survey.sh") CONFIG_FILES="$CONFIG_FILES survey.sh" ;;
+
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[  ]*VPATH[        ]*=[    ]*/{
+h
+s///
+s/^/:/
+s/[      ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[   ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[       ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[     ]*#[    ]*define[       ][      ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[     ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[         ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[     ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[         ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    "
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+         # (if the path is not absolute).  The absolute path cannot be DOS-style,
+         # because $ac_f cannot contain `:'.
+         test -f "$ac_f" ||
+           case $ac_f in
+           [\\/$]*) false;;
+           *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+           esac ||
+           as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+          $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+        `' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$ac_file" : 'X\(//\)[^/]' \| \
+         X"$ac_file" : 'X\(//\)$' \| \
+         X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+            s//\1/
+            q
+          }
+          /^X\(\/\/\)[^/].*/{
+            s//\1/
+            q
+          }
+          /^X\(\/\/\)$/{
+            s//\1/
+            q
+          }
+          /^X\(\/\).*/{
+            s//\1/
+            q
+          }
+          s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
+  case $ac_file in
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+  if test x"$ac_file" != x-; then
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f "$ac_file"
+      mv "$ac_tmp/config.h" "$ac_file" \
+        || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    fi
+  else
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
+  fi
+ ;;
+
+
+  esac
+
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
+
+# Print summary of options
+
+# Someone please show me a better way :)
+A=`eval echo ${prefix}` ; A=`eval echo ${A}`
+B=`eval echo ${bindir}` ; B=`eval echo ${B}`
+C=`eval echo ${sbindir}` ; C=`eval echo ${C}`
+D=`eval echo ${sysconfdir}` ; D=`eval echo ${D}`
+E=`eval echo ${libexecdir}/ssh-askpass` ; E=`eval echo ${E}`
+F=`eval echo ${mandir}/${mansubdir}X` ; F=`eval echo ${F}`
+G=`eval echo ${piddir}` ; G=`eval echo ${G}`
+H=`eval echo ${PRIVSEP_PATH}` ; H=`eval echo ${H}`
+I=`eval echo ${user_path}` ; I=`eval echo ${I}`
+J=`eval echo ${superuser_path}` ; J=`eval echo ${J}`
+
+echo ""
+echo "OpenSSH has been configured with the following options:"
+echo "                     User binaries: $B"
+echo "                   System binaries: $C"
+echo "               Configuration files: $D"
+echo "                   Askpass program: $E"
+echo "                      Manual pages: $F"
+echo "                          PID file: $G"
+echo "  Privilege separation chroot path: $H"
+if test "x$external_path_file" = "x/etc/login.conf" ; then
+echo "   At runtime, sshd will use the path defined in $external_path_file"
+echo "   Make sure the path to scp is present, otherwise scp will not work"
+else
+echo "            sshd default user PATH: $I"
+        if test ! -z "$external_path_file"; then
+echo "   (If PATH is set in $external_path_file it will be used instead. If"
+echo "   used, ensure the path to scp is present, otherwise scp will not work.)"
+        fi
+fi
+if test ! -z "$superuser_path" ; then
+echo "          sshd superuser user PATH: $J"
+fi
+echo "                    Manpage format: $MANTYPE"
+echo "                       PAM support: $PAM_MSG"
+echo "                   OSF SIA support: $SIA_MSG"
+echo "                 KerberosV support: $KRB5_MSG"
+echo "                   SELinux support: $SELINUX_MSG"
+echo "              MD5 password support: $MD5_MSG"
+echo "                   libedit support: $LIBEDIT_MSG"
+echo "                   libldns support: $LDNS_MSG"
+echo "  Solaris process contract support: $SPC_MSG"
+echo "           Solaris project support: $SP_MSG"
+echo "         Solaris privilege support: $SPP_MSG"
+echo "       IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG"
+echo "           Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
+echo "                  BSD Auth support: $BSD_AUTH_MSG"
+echo "              Random number source: $RAND_MSG"
+echo "             Privsep sandbox style: $SANDBOX_STYLE"
+echo "                   PKCS#11 support: $enable_pkcs11"
+echo "                  U2F/FIDO support: $enable_sk"
+
+echo ""
+
+echo "              Host: ${host}"
+echo "          Compiler: ${CC}"
+echo "    Compiler flags: ${CFLAGS}"
+echo "Preprocessor flags: ${CPPFLAGS}"
+echo "      Linker flags: ${LDFLAGS}"
+echo "         Libraries: ${LIBS}"
+if test ! -z "${SSHDLIBS}"; then
+echo "         +for sshd: ${SSHDLIBS}"
+fi
+if test ! -z "${SSHLIBS}"; then
+echo "          +for ssh: ${SSHLIBS}"
+fi
+
+echo ""
+
+if test "x$MAKE_PACKAGE_SUPPORTED" = "xyes" ; then
+        echo "SVR4 style packages are supported with \"make package\""
+        echo ""
+fi
+
+if test "x$PAM_MSG" = "xyes" ; then
+        echo "PAM is enabled. You may need to install a PAM control file "
+        echo "for sshd, otherwise password authentication may fail. "
+        echo "Example PAM control files can be found in the contrib/ "
+        echo "subdirectory"
+        echo ""
+fi
+
+if test ! -z "$NO_PEERCHECK" ; then
+        echo "WARNING: the operating system that you are using does not"
+        echo "appear to support getpeereid(), getpeerucred() or the"
+        echo "SO_PEERCRED getsockopt() option. These facilities are used to"
+        echo "enforce security checks to prevent unauthorised connections to"
+        echo "ssh-agent. Their absence increases the risk that a malicious"
+        echo "user can connect to your agent."
+        echo ""
+fi
+
+if test "$AUDIT_MODULE" = "bsm" ; then
+        echo "WARNING: BSM audit support is currently considered EXPERIMENTAL."
+        echo "See the Solaris section in README.platform for details."
+fi
diff --git a/moduli.0 b/moduli.0
new file mode 100644
index 000000000..6f1a50e44
--- /dev/null
+++ b/moduli.0
@@ -0,0 +1,74 @@
+MODULI(5)                     File Formats Manual                    MODULI(5)
+
+NAME
+     moduli M-bM-^@M-^S Diffie-Hellman moduli
+
+DESCRIPTION
+     The /etc/moduli file contains prime numbers and generators for use by
+     sshd(8) in the Diffie-Hellman Group Exchange key exchange method.
+
+     New moduli may be generated with ssh-keygen(1) using a two-step process.
+     An initial candidate generation pass, using ssh-keygen -G, calculates
+     numbers that are likely to be useful.  A second primality testing pass,
+     using ssh-keygen -T, provides a high degree of assurance that the numbers
+     are prime and are safe for use in Diffie-Hellman operations by sshd(8).
+     This moduli format is used as the output from each pass.
+
+     The file consists of newline-separated records, one per modulus,
+     containing seven space-separated fields.  These fields are as follows:
+
+           timestamp    The time that the modulus was last processed as
+                        YYYYMMDDHHMMSS.
+
+           type         Decimal number specifying the internal structure of
+                        the prime modulus.  Supported types are:
+
+                        0     Unknown, not tested.
+                        2     "Safe" prime; (p-1)/2 is also prime.
+                        4     Sophie Germain; 2p+1 is also prime.
+
+                        Moduli candidates initially produced by ssh-keygen(1)
+                        are Sophie Germain primes (type 4).  Further primality
+                        testing with ssh-keygen(1) produces safe prime moduli
+                        (type 2) that are ready for use in sshd(8).  Other
+                        types are not used by OpenSSH.
+
+           tests        Decimal number indicating the type of primality tests
+                        that the number has been subjected to represented as a
+                        bitmask of the following values:
+
+                        0x00  Not tested.
+                        0x01  Composite number M-bM-^@M-^S not prime.
+                        0x02  Sieve of Eratosthenes.
+                        0x04  Probabilistic Miller-Rabin primality tests.
+
+                        The ssh-keygen(1) moduli candidate generation uses the
+                        Sieve of Eratosthenes (flag 0x02).  Subsequent
+                        ssh-keygen(1) primality tests are Miller-Rabin tests
+                        (flag 0x04).
+
+           trials       Decimal number indicating the number of primality
+                        trials that have been performed on the modulus.
+
+           size         Decimal number indicating the size of the prime in
+                        bits.
+
+           generator    The recommended generator for use with this modulus
+                        (hexadecimal).
+
+           modulus      The modulus itself in hexadecimal.
+
+     When performing Diffie-Hellman Group Exchange, sshd(8) first estimates
+     the size of the modulus required to produce enough Diffie-Hellman output
+     to sufficiently key the selected symmetric cipher.  sshd(8) then randomly
+     selects a modulus from /etc/moduli that best meets the size requirement.
+
+SEE ALSO
+     ssh-keygen(1), sshd(8)
+
+STANDARDS
+     M. Friedl, N. Provos, and W. Simpson, Diffie-Hellman Group Exchange for
+     the Secure Shell (SSH) Transport Layer Protocol, RFC 4419, March 2006,
+     2006.
+
+OpenBSD 6.6                   September 26, 2012                   OpenBSD 6.6
diff --git a/scp.0 b/scp.0
new file mode 100644
index 000000000..7775eb1e5
--- /dev/null
+++ b/scp.0
@@ -0,0 +1,182 @@
+SCP(1)                      General Commands Manual                     SCP(1)
+
+NAME
+     scp M-bM-^@M-^S OpenSSH secure file copy
+
+SYNOPSIS
+     scp [-346BCpqrTv] [-c cipher] [-F ssh_config] [-i identity_file]
+         [-J destination] [-l limit] [-o ssh_option] [-P port] [-S program]
+         source ... target
+
+DESCRIPTION
+     scp copies files between hosts on a network.  It uses ssh(1) for data
+     transfer, and uses the same authentication and provides the same security
+     as ssh(1).  scp will ask for passwords or passphrases if they are needed
+     for authentication.
+
+     The source and target may be specified as a local pathname, a remote host
+     with optional path in the form [user@]host:[path], or a URI in the form
+     scp://[user@]host[:port][/path].  Local file names can be made explicit
+     using absolute or relative pathnames to avoid scp treating file names
+     containing M-bM-^@M-^X:M-bM-^@M-^Y as host specifiers.
+
+     When copying between two remote hosts, if the URI format is used, a port
+     may only be specified on the target if the -3 option is used.
+
+     The options are as follows:
+
+     -3      Copies between two remote hosts are transferred through the local
+             host.  Without this option the data is copied directly between
+             the two remote hosts.  Note that this option disables the
+             progress meter.
+
+     -4      Forces scp to use IPv4 addresses only.
+
+     -6      Forces scp to use IPv6 addresses only.
+
+     -B      Selects batch mode (prevents asking for passwords or
+             passphrases).
+
+     -C      Compression enable.  Passes the -C flag to ssh(1) to enable
+             compression.
+
+     -c cipher
+             Selects the cipher to use for encrypting the data transfer.  This
+             option is directly passed to ssh(1).
+
+     -F ssh_config
+             Specifies an alternative per-user configuration file for ssh.
+             This option is directly passed to ssh(1).
+
+     -i identity_file
+             Selects the file from which the identity (private key) for public
+             key authentication is read.  This option is directly passed to
+             ssh(1).
+
+     -J destination
+             Connect to the target host by first making an scp connection to
+             the jump host described by destination and then establishing a
+             TCP forwarding to the ultimate destination from there.  Multiple
+             jump hops may be specified separated by comma characters.  This
+             is a shortcut to specify a ProxyJump configuration directive.
+             This option is directly passed to ssh(1).
+
+     -l limit
+             Limits the used bandwidth, specified in Kbit/s.
+
+     -o ssh_option
+             Can be used to pass options to ssh in the format used in
+             ssh_config(5).  This is useful for specifying options for which
+             there is no separate scp command-line flag.  For full details of
+             the options listed below, and their possible values, see
+             ssh_config(5).
+
+                   AddressFamily
+                   BatchMode
+                   BindAddress
+                   BindInterface
+                   CanonicalDomains
+                   CanonicalizeFallbackLocal
+                   CanonicalizeHostname
+                   CanonicalizeMaxDots
+                   CanonicalizePermittedCNAMEs
+                   CASignatureAlgorithms
+                   CertificateFile
+                   ChallengeResponseAuthentication
+                   CheckHostIP
+                   Ciphers
+                   Compression
+                   ConnectionAttempts
+                   ConnectTimeout
+                   ControlMaster
+                   ControlPath
+                   ControlPersist
+                   GlobalKnownHostsFile
+                   GSSAPIAuthentication
+                   GSSAPIDelegateCredentials
+                   HashKnownHosts
+                   Host
+                   HostbasedAuthentication
+                   HostbasedKeyTypes
+                   HostKeyAlgorithms
+                   HostKeyAlias
+                   Hostname
+                   IdentitiesOnly
+                   IdentityAgent
+                   IdentityFile
+                   IPQoS
+                   KbdInteractiveAuthentication
+                   KbdInteractiveDevices
+                   KexAlgorithms
+                   LogLevel
+                   MACs
+                   NoHostAuthenticationForLocalhost
+                   NumberOfPasswordPrompts
+                   PasswordAuthentication
+                   PKCS11Provider
+                   Port
+                   PreferredAuthentications
+                   ProxyCommand
+                   ProxyJump
+                   PubkeyAcceptedKeyTypes
+                   PubkeyAuthentication
+                   RekeyLimit
+                   SendEnv
+                   ServerAliveInterval
+                   ServerAliveCountMax
+                   SetEnv
+                   StrictHostKeyChecking
+                   TCPKeepAlive
+                   UpdateHostKeys
+                   User
+                   UserKnownHostsFile
+                   VerifyHostKeyDNS
+
+     -P port
+             Specifies the port to connect to on the remote host.  Note that
+             this option is written with a capital M-bM-^@M-^XPM-bM-^@M-^Y, because -p is already
+             reserved for preserving the times and modes of the file.
+
+     -p      Preserves modification times, access times, and modes from the
+             original file.
+
+     -q      Quiet mode: disables the progress meter as well as warning and
+             diagnostic messages from ssh(1).
+
+     -r      Recursively copy entire directories.  Note that scp follows
+             symbolic links encountered in the tree traversal.
+
+     -S program
+             Name of program to use for the encrypted connection.  The program
+             must understand ssh(1) options.
+
+     -T      Disable strict filename checking.  By default when copying files
+             from a remote host to a local directory scp checks that the
+             received filenames match those requested on the command-line to
+             prevent the remote end from sending unexpected or unwanted files.
+             Because of differences in how various operating systems and
+             shells interpret filename wildcards, these checks may cause
+             wanted files to be rejected.  This option disables these checks
+             at the expense of fully trusting that the server will not send
+             unexpected filenames.
+
+     -v      Verbose mode.  Causes scp and ssh(1) to print debugging messages
+             about their progress.  This is helpful in debugging connection,
+             authentication, and configuration problems.
+
+EXIT STATUS
+     The scp utility exitsM-BM- 0 on success, andM-BM- >0 if an error occurs.
+
+SEE ALSO
+     sftp(1), ssh(1), ssh-add(1), ssh-agent(1), ssh-keygen(1), ssh_config(5),
+     sshd(8)
+
+HISTORY
+     scp is based on the rcp program in BSD source code from the Regents of
+     the University of California.
+
+AUTHORS
+     Timo Rinne <tri@iki.fi>
+     Tatu Ylonen <ylo@cs.hut.fi>
+
+OpenBSD 6.6                    November 30, 2019                   OpenBSD 6.6
diff --git a/sftp-server.0 b/sftp-server.0
new file mode 100644
index 000000000..ef485773d
--- /dev/null
+++ b/sftp-server.0
@@ -0,0 +1,96 @@
+SFTP-SERVER(8)              System Manager's Manual             SFTP-SERVER(8)
+
+NAME
+     sftp-server M-bM-^@M-^S OpenSSH SFTP server subsystem
+
+SYNOPSIS
+     sftp-server [-ehR] [-d start_directory] [-f log_facility] [-l log_level]
+                 [-P blacklisted_requests] [-p whitelisted_requests]
+                 [-u umask]
+     sftp-server -Q protocol_feature
+
+DESCRIPTION
+     sftp-server is a program that speaks the server side of SFTP protocol to
+     stdout and expects client requests from stdin.  sftp-server is not
+     intended to be called directly, but from sshd(8) using the Subsystem
+     option.
+
+     Command-line flags to sftp-server should be specified in the Subsystem
+     declaration.  See sshd_config(5) for more information.
+
+     Valid options are:
+
+     -d start_directory
+             specifies an alternate starting directory for users.  The
+             pathname may contain the following tokens that are expanded at
+             runtime: %% is replaced by a literal '%', %d is replaced by the
+             home directory of the user being authenticated, and %u is
+             replaced by the username of that user.  The default is to use the
+             user's home directory.  This option is useful in conjunction with
+             the sshd_config(5) ChrootDirectory option.
+
+     -e      Causes sftp-server to print logging information to stderr instead
+             of syslog for debugging.
+
+     -f log_facility
+             Specifies the facility code that is used when logging messages
+             from sftp-server.  The possible values are: DAEMON, USER, AUTH,
+             LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.
+             The default is AUTH.
+
+     -h      Displays sftp-server usage information.
+
+     -l log_level
+             Specifies which messages will be logged by sftp-server.  The
+             possible values are: QUIET, FATAL, ERROR, INFO, VERBOSE, DEBUG,
+             DEBUG1, DEBUG2, and DEBUG3.  INFO and VERBOSE log transactions
+             that sftp-server performs on behalf of the client.  DEBUG and
+             DEBUG1 are equivalent.  DEBUG2 and DEBUG3 each specify higher
+             levels of debugging output.  The default is ERROR.
+
+     -P blacklisted_requests
+             Specify a comma-separated list of SFTP protocol requests that are
+             banned by the server.  sftp-server will reply to any blacklisted
+             request with a failure.  The -Q flag can be used to determine the
+             supported request types.  If both a blacklist and a whitelist are
+             specified, then the blacklist is applied before the whitelist.
+
+     -p whitelisted_requests
+             Specify a comma-separated list of SFTP protocol requests that are
+             permitted by the server.  All request types that are not on the
+             whitelist will be logged and replied to with a failure message.
+
+             Care must be taken when using this feature to ensure that
+             requests made implicitly by SFTP clients are permitted.
+
+     -Q protocol_feature
+             Query protocol features supported by sftp-server.  At present the
+             only feature that may be queried is M-bM-^@M-^\requestsM-bM-^@M-^], which may be used
+             for black or whitelisting (flags -P and -p respectively).
+
+     -R      Places this instance of sftp-server into a read-only mode.
+             Attempts to open files for writing, as well as other operations
+             that change the state of the filesystem, will be denied.
+
+     -u umask
+             Sets an explicit umask(2) to be applied to newly-created files
+             and directories, instead of the user's default mask.
+
+     On some systems, sftp-server must be able to access /dev/log for logging
+     to work, and use of sftp-server in a chroot configuration therefore
+     requires that syslogd(8) establish a logging socket inside the chroot
+     directory.
+
+SEE ALSO
+     sftp(1), ssh(1), sshd_config(5), sshd(8)
+
+     T. Ylonen and S. Lehtinen, SSH File Transfer Protocol, draft-ietf-secsh-
+     filexfer-02.txt, October 2001, work in progress material.
+
+HISTORY
+     sftp-server first appeared in OpenBSD 2.8.
+
+AUTHORS
+     Markus Friedl <markus@openbsd.org>
+
+OpenBSD 6.6                    November 30, 2019                   OpenBSD 6.6
diff --git a/sftp.0 b/sftp.0
new file mode 100644
index 000000000..6d0405758
--- /dev/null
+++ b/sftp.0
@@ -0,0 +1,396 @@
+SFTP(1)                     General Commands Manual                    SFTP(1)
+
+NAME
+     sftp M-bM-^@M-^S OpenSSH secure file transfer
+
+SYNOPSIS
+     sftp [-46aCfpqrv] [-B buffer_size] [-b batchfile] [-c cipher]
+          [-D sftp_server_path] [-F ssh_config] [-i identity_file]
+          [-J destination] [-l limit] [-o ssh_option] [-P port]
+          [-R num_requests] [-S program] [-s subsystem | sftp_server]
+          destination
+
+DESCRIPTION
+     sftp is a file transfer program, similar to ftp(1), which performs all
+     operations over an encrypted ssh(1) transport.  It may also use many
+     features of ssh, such as public key authentication and compression.
+
+     The destination may be specified either as [user@]host[:path] or as a URI
+     in the form sftp://[user@]host[:port][/path].
+
+     If the destination includes a path and it is not a directory, sftp will
+     retrieve files automatically if a non-interactive authentication method
+     is used; otherwise it will do so after successful interactive
+     authentication.
+
+     If no path is specified, or if the path is a directory, sftp will log in
+     to the specified host and enter interactive command mode, changing to the
+     remote directory if one was specified.  An optional trailing slash can be
+     used to force the path to be interpreted as a directory.
+
+     Since the destination formats use colon characters to delimit host names
+     from path names or port numbers, IPv6 addresses must be enclosed in
+     square brackets to avoid ambiguity.
+
+     The options are as follows:
+
+     -4      Forces sftp to use IPv4 addresses only.
+
+     -6      Forces sftp to use IPv6 addresses only.
+
+     -a      Attempt to continue interrupted transfers rather than overwriting
+             existing partial or complete copies of files.  If the partial
+             contents differ from those being transferred, then the resultant
+             file is likely to be corrupt.
+
+     -B buffer_size
+             Specify the size of the buffer that sftp uses when transferring
+             files.  Larger buffers require fewer round trips at the cost of
+             higher memory consumption.  The default is 32768 bytes.
+
+     -b batchfile
+             Batch mode reads a series of commands from an input batchfile
+             instead of stdin.  Since it lacks user interaction it should be
+             used in conjunction with non-interactive authentication to
+             obviate the need to enter a password at connection time (see
+             sshd(8) and ssh-keygen(1) for details).
+
+             A batchfile of M-bM-^@M-^X-M-bM-^@M-^Y may be used to indicate standard input.  sftp
+             will abort if any of the following commands fail: get, put,
+             reget, reput, rename, ln, rm, mkdir, chdir, ls, lchdir, chmod,
+             chown, chgrp, lpwd, df, symlink, and lmkdir.
+
+             Termination on error can be suppressed on a command by command
+             basis by prefixing the command with a M-bM-^@M-^X-M-bM-^@M-^Y character (for example,
+             -rm /tmp/blah*).  Echo of the command may be suppressed by
+             prefixing the command with a M-bM-^@M-^X@M-bM-^@M-^Y character.  These two prefixes
+             may be combined in any order, for example -@ls /bsd.
+
+     -C      Enables compression (via ssh's -C flag).
+
+     -c cipher
+             Selects the cipher to use for encrypting the data transfers.
+             This option is directly passed to ssh(1).
+
+     -D sftp_server_path
+             Connect directly to a local sftp server (rather than via ssh(1)).
+             This option may be useful in debugging the client and server.
+
+     -F ssh_config
+             Specifies an alternative per-user configuration file for ssh(1).
+             This option is directly passed to ssh(1).
+
+     -f      Requests that files be flushed to disk immediately after
+             transfer.  When uploading files, this feature is only enabled if
+             the server implements the "fsync@openssh.com" extension.
+
+     -i identity_file
+             Selects the file from which the identity (private key) for public
+             key authentication is read.  This option is directly passed to
+             ssh(1).
+
+     -J destination
+             Connect to the target host by first making an sftp connection to
+             the jump host described by destination and then establishing a
+             TCP forwarding to the ultimate destination from there.  Multiple
+             jump hops may be specified separated by comma characters.  This
+             is a shortcut to specify a ProxyJump configuration directive.
+             This option is directly passed to ssh(1).
+
+     -l limit
+             Limits the used bandwidth, specified in Kbit/s.
+
+     -o ssh_option
+             Can be used to pass options to ssh in the format used in
+             ssh_config(5).  This is useful for specifying options for which
+             there is no separate sftp command-line flag.  For example, to
+             specify an alternate port use: sftp -oPort=24.  For full details
+             of the options listed below, and their possible values, see
+             ssh_config(5).
+
+                   AddressFamily
+                   BatchMode
+                   BindAddress
+                   BindInterface
+                   CanonicalDomains
+                   CanonicalizeFallbackLocal
+                   CanonicalizeHostname
+                   CanonicalizeMaxDots
+                   CanonicalizePermittedCNAMEs
+                   CASignatureAlgorithms
+                   CertificateFile
+                   ChallengeResponseAuthentication
+                   CheckHostIP
+                   Ciphers
+                   Compression
+                   ConnectionAttempts
+                   ConnectTimeout
+                   ControlMaster
+                   ControlPath
+                   ControlPersist
+                   GlobalKnownHostsFile
+                   GSSAPIAuthentication
+                   GSSAPIDelegateCredentials
+                   HashKnownHosts
+                   Host
+                   HostbasedAuthentication
+                   HostbasedKeyTypes
+                   HostKeyAlgorithms
+                   HostKeyAlias
+                   Hostname
+                   IdentitiesOnly
+                   IdentityAgent
+                   IdentityFile
+                   IPQoS
+                   KbdInteractiveAuthentication
+                   KbdInteractiveDevices
+                   KexAlgorithms
+                   LogLevel
+                   MACs
+                   NoHostAuthenticationForLocalhost
+                   NumberOfPasswordPrompts
+                   PasswordAuthentication
+                   PKCS11Provider
+                   Port
+                   PreferredAuthentications
+                   ProxyCommand
+                   ProxyJump
+                   PubkeyAcceptedKeyTypes
+                   PubkeyAuthentication
+                   RekeyLimit
+                   SendEnv
+                   ServerAliveInterval
+                   ServerAliveCountMax
+                   SetEnv
+                   StrictHostKeyChecking
+                   TCPKeepAlive
+                   UpdateHostKeys
+                   User
+                   UserKnownHostsFile
+                   VerifyHostKeyDNS
+
+     -P port
+             Specifies the port to connect to on the remote host.
+
+     -p      Preserves modification times, access times, and modes from the
+             original files transferred.
+
+     -q      Quiet mode: disables the progress meter as well as warning and
+             diagnostic messages from ssh(1).
+
+     -R num_requests
+             Specify how many requests may be outstanding at any one time.
+             Increasing this may slightly improve file transfer speed but will
+             increase memory usage.  The default is 64 outstanding requests.
+
+     -r      Recursively copy entire directories when uploading and
+             downloading.  Note that sftp does not follow symbolic links
+             encountered in the tree traversal.
+
+     -S program
+             Name of the program to use for the encrypted connection.  The
+             program must understand ssh(1) options.
+
+     -s subsystem | sftp_server
+             Specifies the SSH2 subsystem or the path for an sftp server on
+             the remote host.  A path is useful when the remote sshd(8) does
+             not have an sftp subsystem configured.
+
+     -v      Raise logging level.  This option is also passed to ssh.
+
+INTERACTIVE COMMANDS
+     Once in interactive mode, sftp understands a set of commands similar to
+     those of ftp(1).  Commands are case insensitive.  Pathnames that contain
+     spaces must be enclosed in quotes.  Any special characters contained
+     within pathnames that are recognized by glob(3) must be escaped with
+     backslashes (M-bM-^@M-^X\M-bM-^@M-^Y).
+
+     bye     Quit sftp.
+
+     cd [path]
+             Change remote directory to path.  If path is not specified, then
+             change directory to the one the session started in.
+
+     chgrp [-h] grp path
+             Change group of file path to grp.  If the -h flag is specified,
+             then symlinks will not be followed.  path may contain glob(7)
+             characters and may match multiple files.  grp must be a numeric
+             GID.
+
+     chmod [-h] mode path
+             Change permissions of file path to mode.  If the -h flag is
+             specified, then symlinks will not be followed.  path may contain
+             glob(7) characters and may match multiple files.
+
+     chown [-h] own path
+             Change owner of file path to own.  If the -h flag is specified,
+             then symlinks will not be followed.  path may contain glob(7)
+             characters and may match multiple files.  own must be a numeric
+             UID.
+
+     df [-hi] [path]
+             Display usage information for the filesystem holding the current
+             directory (or path if specified).  If the -h flag is specified,
+             the capacity information will be displayed using "human-readable"
+             suffixes.  The -i flag requests display of inode information in
+             addition to capacity information.  This command is only supported
+             on servers that implement the M-bM-^@M-^\statvfs@openssh.comM-bM-^@M-^] extension.
+
+     exit    Quit sftp.
+
+     get [-afpR] remote-path [local-path]
+             Retrieve the remote-path and store it on the local machine.  If
+             the local path name is not specified, it is given the same name
+             it has on the remote machine.  remote-path may contain glob(7)
+             characters and may match multiple files.  If it does and
+             local-path is specified, then local-path must specify a
+             directory.
+
+             If the -a flag is specified, then attempt to resume partial
+             transfers of existing files.  Note that resumption assumes that
+             any partial copy of the local file matches the remote copy.  If
+             the remote file contents differ from the partial local copy then
+             the resultant file is likely to be corrupt.
+
+             If the -f flag is specified, then fsync(2) will be called after
+             the file transfer has completed to flush the file to disk.
+
+             If the -p flag is specified, then full file permissions and
+             access times are copied too.
+
+             If the -R flag is specified then directories will be copied
+             recursively.  Note that sftp does not follow symbolic links when
+             performing recursive transfers.
+
+     help    Display help text.
+
+     lcd [path]
+             Change local directory to path.  If path is not specified, then
+             change directory to the local user's home directory.
+
+     lls [ls-options [path]]
+             Display local directory listing of either path or current
+             directory if path is not specified.  ls-options may contain any
+             flags supported by the local system's ls(1) command.  path may
+             contain glob(7) characters and may match multiple files.
+
+     lmkdir path
+             Create local directory specified by path.
+
+     ln [-s] oldpath newpath
+             Create a link from oldpath to newpath.  If the -s flag is
+             specified the created link is a symbolic link, otherwise it is a
+             hard link.
+
+     lpwd    Print local working directory.
+
+     ls [-1afhlnrSt] [path]
+             Display a remote directory listing of either path or the current
+             directory if path is not specified.  path may contain glob(7)
+             characters and may match multiple files.
+
+             The following flags are recognized and alter the behaviour of ls
+             accordingly:
+
+             -1      Produce single columnar output.
+
+             -a      List files beginning with a dot (M-bM-^@M-^X.M-bM-^@M-^Y).
+
+             -f      Do not sort the listing.  The default sort order is
+                     lexicographical.
+
+             -h      When used with a long format option, use unit suffixes:
+                     Byte, Kilobyte, Megabyte, Gigabyte, Terabyte, Petabyte,
+                     and Exabyte in order to reduce the number of digits to
+                     four or fewer using powers of 2 for sizes (K=1024,
+                     M=1048576, etc.).
+
+             -l      Display additional details including permissions and
+                     ownership information.
+
+             -n      Produce a long listing with user and group information
+                     presented numerically.
+
+             -r      Reverse the sort order of the listing.
+
+             -S      Sort the listing by file size.
+
+             -t      Sort the listing by last modification time.
+
+     lumask umask
+             Set local umask to umask.
+
+     mkdir path
+             Create remote directory specified by path.
+
+     progress
+             Toggle display of progress meter.
+
+     put [-afpR] local-path [remote-path]
+             Upload local-path and store it on the remote machine.  If the
+             remote path name is not specified, it is given the same name it
+             has on the local machine.  local-path may contain glob(7)
+             characters and may match multiple files.  If it does and
+             remote-path is specified, then remote-path must specify a
+             directory.
+
+             If the -a flag is specified, then attempt to resume partial
+             transfers of existing files.  Note that resumption assumes that
+             any partial copy of the remote file matches the local copy.  If
+             the local file contents differ from the remote local copy then
+             the resultant file is likely to be corrupt.
+
+             If the -f flag is specified, then a request will be sent to the
+             server to call fsync(2) after the file has been transferred.
+             Note that this is only supported by servers that implement the
+             "fsync@openssh.com" extension.
+
+             If the -p flag is specified, then full file permissions and
+             access times are copied too.
+
+             If the -R flag is specified then directories will be copied
+             recursively.  Note that sftp does not follow symbolic links when
+             performing recursive transfers.
+
+     pwd     Display remote working directory.
+
+     quit    Quit sftp.
+
+     reget [-fpR] remote-path [local-path]
+             Resume download of remote-path.  Equivalent to get with the -a
+             flag set.
+
+     reput [-fpR] local-path [remote-path]
+             Resume upload of local-path.  Equivalent to put with the -a flag
+             set.
+
+     rename oldpath newpath
+             Rename remote file from oldpath to newpath.
+
+     rm path
+             Delete remote file specified by path.
+
+     rmdir path
+             Remove remote directory specified by path.
+
+     symlink oldpath newpath
+             Create a symbolic link from oldpath to newpath.
+
+     version
+             Display the sftp protocol version.
+
+     !command
+             Execute command in local shell.
+
+     !       Escape to local shell.
+
+     ?       Synonym for help.
+
+SEE ALSO
+     ftp(1), ls(1), scp(1), ssh(1), ssh-add(1), ssh-keygen(1), ssh_config(5),
+     glob(7), sftp-server(8), sshd(8)
+
+     T. Ylonen and S. Lehtinen, SSH File Transfer Protocol, draft-ietf-secsh-
+     filexfer-00.txt, January 2001, work in progress material.
+
+OpenBSD 6.6                    November 30, 2019                   OpenBSD 6.6
diff --git a/ssh-add.0 b/ssh-add.0
new file mode 100644
index 000000000..36a7ac6ab
--- /dev/null
+++ b/ssh-add.0
@@ -0,0 +1,144 @@
+SSH-ADD(1)                  General Commands Manual                 SSH-ADD(1)
+
+NAME
+     ssh-add M-bM-^@M-^S adds private key identities to the OpenSSH authentication agent
+
+SYNOPSIS
+     ssh-add [-cDdKkLlqvXx] [-E fingerprint_hash] [-S provider] [-t life]
+             [file ...]
+     ssh-add -s pkcs11
+     ssh-add -e pkcs11
+     ssh-add -T pubkey ...
+
+DESCRIPTION
+     ssh-add adds private key identities to the authentication agent,
+     ssh-agent(1).  When run without arguments, it adds the files
+     ~/.ssh/id_rsa, ~/.ssh/id_dsa, ~/.ssh/id_ecdsa, ~/.ssh/id_ecdsa_sk,
+     ~/.ssh/id_ed25519, and ~/.ssh/id_ed25519_sk.  After loading a private
+     key, ssh-add will try to load corresponding certificate information from
+     the filename obtained by appending -cert.pub to the name of the private
+     key file.  Alternative file names can be given on the command line.
+
+     If any file requires a passphrase, ssh-add asks for the passphrase from
+     the user.  The passphrase is read from the user's tty.  ssh-add retries
+     the last passphrase if multiple identity files are given.
+
+     The authentication agent must be running and the SSH_AUTH_SOCK
+     environment variable must contain the name of its socket for ssh-add to
+     work.
+
+     The options are as follows:
+
+     -c      Indicates that added identities should be subject to confirmation
+             before being used for authentication.  Confirmation is performed
+             by ssh-askpass(1).  Successful confirmation is signaled by a zero
+             exit status from ssh-askpass(1), rather than text entered into
+             the requester.
+
+     -D      Deletes all identities from the agent.
+
+     -d      Instead of adding identities, removes identities from the agent.
+             If ssh-add has been run without arguments, the keys for the
+             default identities and their corresponding certificates will be
+             removed.  Otherwise, the argument list will be interpreted as a
+             list of paths to public key files to specify keys and
+             certificates to be removed from the agent.  If no public key is
+             found at a given path, ssh-add will append .pub and retry.
+
+     -E fingerprint_hash
+             Specifies the hash algorithm used when displaying key
+             fingerprints.  Valid options are: M-bM-^@M-^\md5M-bM-^@M-^] and M-bM-^@M-^\sha256M-bM-^@M-^].  The
+             default is M-bM-^@M-^\sha256M-bM-^@M-^].
+
+     -e pkcs11
+             Remove keys provided by the PKCS#11 shared library pkcs11.
+
+     -K      Load resident keys from a FIDO authenticator.
+
+     -k      When loading keys into or deleting keys from the agent, process
+             plain private keys only and skip certificates.
+
+     -L      Lists public key parameters of all identities currently
+             represented by the agent.
+
+     -l      Lists fingerprints of all identities currently represented by the
+             agent.
+
+     -q      Be quiet after a successful operation.
+
+     -S provider
+             Specifies a path to a library that will be used when adding FIDO
+             authenticator-hosted keys, overriding the default of using the
+             internal USB HID support.
+
+     -s pkcs11
+             Add keys provided by the PKCS#11 shared library pkcs11.
+
+     -T pubkey ...
+             Tests whether the private keys that correspond to the specified
+             pubkey files are usable by performing sign and verify operations
+             on each.
+
+     -t life
+             Set a maximum lifetime when adding identities to an agent.  The
+             lifetime may be specified in seconds or in a time format
+             specified in sshd_config(5).
+
+     -v      Verbose mode.  Causes ssh-add to print debugging messages about
+             its progress.  This is helpful in debugging problems.  Multiple
+             -v options increase the verbosity.  The maximum is 3.
+
+     -X      Unlock the agent.
+
+     -x      Lock the agent with a password.
+
+ENVIRONMENT
+     DISPLAY and SSH_ASKPASS
+             If ssh-add needs a passphrase, it will read the passphrase from
+             the current terminal if it was run from a terminal.  If ssh-add
+             does not have a terminal associated with it but DISPLAY and
+             SSH_ASKPASS are set, it will execute the program specified by
+             SSH_ASKPASS (by default M-bM-^@M-^\ssh-askpassM-bM-^@M-^]) and open an X11 window to
+             read the passphrase.  This is particularly useful when calling
+             ssh-add from a .xsession or related script.  (Note that on some
+             machines it may be necessary to redirect the input from /dev/null
+             to make this work.)
+
+     SSH_AUTH_SOCK
+             Identifies the path of a UNIX-domain socket used to communicate
+             with the agent.
+
+     SSH_SK_PROVIDER
+             Specifies a path to a library that will be used when loading any
+             FIDO authenticator-hosted keys, overriding the default of using
+             the built-in USB HID support.
+
+FILES
+     ~/.ssh/id_dsa
+     ~/.ssh/id_ecdsa
+     ~/.ssh/id_ecdsa_sk
+     ~/.ssh/id_ed25519
+     ~/.ssh/id_ed25519_sk
+     ~/.ssh/id_rsa
+             Contains the DSA, ECDSA, authenticator-hosted ECDSA, Ed25519,
+             authenticator-hosted Ed25519 or RSA authentication identity of
+             the user.
+
+     Identity files should not be readable by anyone but the user.  Note that
+     ssh-add ignores identity files if they are accessible by others.
+
+EXIT STATUS
+     Exit status is 0 on success, 1 if the specified command fails, and 2 if
+     ssh-add is unable to contact the authentication agent.
+
+SEE ALSO
+     ssh(1), ssh-agent(1), ssh-askpass(1), ssh-keygen(1), sshd(8)
+
+AUTHORS
+     OpenSSH is a derivative of the original and free ssh 1.2.12 release by
+     Tatu Ylonen.  Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo
+     de Raadt and Dug Song removed many bugs, re-added newer features and
+     created OpenSSH.  Markus Friedl contributed the support for SSH protocol
+     versions 1.5 and 2.0.
+
+OpenBSD 6.6                    February 7, 2020                    OpenBSD 6.6
diff --git a/ssh-agent.0 b/ssh-agent.0
new file mode 100644
index 000000000..c5fe8b153
--- /dev/null
+++ b/ssh-agent.0
@@ -0,0 +1,117 @@
+SSH-AGENT(1)                General Commands Manual               SSH-AGENT(1)
+
+NAME
+     ssh-agent M-bM-^@M-^S OpenSSH authentication agent
+
+SYNOPSIS
+     ssh-agent [-c | -s] [-Dd] [-a bind_address] [-E fingerprint_hash]
+               [-P provider_whitelist] [-t life] [command [arg ...]]
+     ssh-agent [-c | -s] -k
+
+DESCRIPTION
+     ssh-agent is a program to hold private keys used for public key
+     authentication.  Through use of environment variables the agent can be
+     located and automatically used for authentication when logging in to
+     other machines using ssh(1).
+
+     The options are as follows:
+
+     -a bind_address
+             Bind the agent to the UNIX-domain socket bind_address.  The
+             default is $TMPDIR/ssh-XXXXXXXXXX/agent.<ppid>.
+
+     -c      Generate C-shell commands on stdout.  This is the default if
+             SHELL looks like it's a csh style of shell.
+
+     -D      Foreground mode.  When this option is specified ssh-agent will
+             not fork.
+
+     -d      Debug mode.  When this option is specified ssh-agent will not
+             fork and will write debug information to standard error.
+
+     -E fingerprint_hash
+             Specifies the hash algorithm used when displaying key
+             fingerprints.  Valid options are: M-bM-^@M-^\md5M-bM-^@M-^] and M-bM-^@M-^\sha256M-bM-^@M-^].  The
+             default is M-bM-^@M-^\sha256M-bM-^@M-^].
+
+     -k      Kill the current agent (given by the SSH_AGENT_PID environment
+             variable).
+
+     -P provider_whitelist
+             Specify a pattern-list of acceptable paths for PKCS#11 and FIDO
+             authenticator shared libraries that may be used with the -S or -s
+             options to ssh-add(1).  Libraries that do not match the whitelist
+             will be refused.  See PATTERNS in ssh_config(5) for a description
+             of pattern-list syntax.  The default whitelist is
+             M-bM-^@M-^\/usr/lib/*,/usr/local/lib/*M-bM-^@M-^].
+
+     -s      Generate Bourne shell commands on stdout.  This is the default if
+             SHELL does not look like it's a csh style of shell.
+
+     -t life
+             Set a default value for the maximum lifetime of identities added
+             to the agent.  The lifetime may be specified in seconds or in a
+             time format specified in sshd_config(5).  A lifetime specified
+             for an identity with ssh-add(1) overrides this value.  Without
+             this option the default maximum lifetime is forever.
+
+     command [arg ...]
+             If a command (and optional arguments) is given, this is executed
+             as a subprocess of the agent.  The agent exits automatically when
+             the command given on the command line terminates.
+
+     There are two main ways to get an agent set up.  The first is at the
+     start of an X session, where all other windows or programs are started as
+     children of the ssh-agent program.  The agent starts a command under
+     which its environment variables are exported, for example ssh-agent xterm
+     &.  When the command terminates, so does the agent.
+
+     The second method is used for a login session.  When ssh-agent is
+     started, it prints the shell commands required to set its environment
+     variables, which in turn can be evaluated in the calling shell, for
+     example eval `ssh-agent -s`.
+
+     In both cases, ssh(1) looks at these environment variables and uses them
+     to establish a connection to the agent.
+
+     The agent initially does not have any private keys.  Keys are added using
+     ssh-add(1) or by ssh(1) when AddKeysToAgent is set in ssh_config(5).
+     Multiple identities may be stored in ssh-agent concurrently and ssh(1)
+     will automatically use them if present.  ssh-add(1) is also used to
+     remove keys from ssh-agent and to query the keys that are held in one.
+
+     Connections to ssh-agent may be forwarded from further remote hosts using
+     the -A option to ssh(1) (but see the caveats documented therein),
+     avoiding the need for authentication data to be stored on other machines.
+     Authentication passphrases and private keys never go over the network:
+     the connection to the agent is forwarded over SSH remote connections and
+     the result is returned to the requester, allowing the user access to
+     their identities anywhere in the network in a secure fashion.
+
+ENVIRONMENT
+     SSH_AGENT_PID  When ssh-agent starts, it stores the name of the agent's
+                    process ID (PID) in this variable.
+
+     SSH_AUTH_SOCK  When ssh-agent starts, it creates a UNIX-domain socket and
+                    stores its pathname in this variable.  It is accessible
+                    only to the current user, but is easily abused by root or
+                    another instance of the same user.
+
+FILES
+     $TMPDIR/ssh-XXXXXXXXXX/agent.<ppid>
+             UNIX-domain sockets used to contain the connection to the
+             authentication agent.  These sockets should only be readable by
+             the owner.  The sockets should get automatically removed when the
+             agent exits.
+
+SEE ALSO
+     ssh(1), ssh-add(1), ssh-keygen(1), ssh_config(5), sshd(8)
+
+AUTHORS
+     OpenSSH is a derivative of the original and free ssh 1.2.12 release by
+     Tatu Ylonen.  Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo
+     de Raadt and Dug Song removed many bugs, re-added newer features and
+     created OpenSSH.  Markus Friedl contributed the support for SSH protocol
+     versions 1.5 and 2.0.
+
+OpenBSD 6.6                    December 21, 2019                   OpenBSD 6.6
diff --git a/ssh-keygen.0 b/ssh-keygen.0
new file mode 100644
index 000000000..703739004
--- /dev/null
+++ b/ssh-keygen.0
@@ -0,0 +1,789 @@
+SSH-KEYGEN(1)               General Commands Manual              SSH-KEYGEN(1)
+
+NAME
+     ssh-keygen M-bM-^@M-^S OpenSSH authentication key utility
+
+SYNOPSIS
+     ssh-keygen [-q] [-b bits] [-C comment] [-f output_keyfile] [-m format]
+                [-t dsa | ecdsa | ecdsa-sk | ed25519 | ed25519-sk | rsa]
+                [-N new_passphrase] [-O option] [-w provider]
+     ssh-keygen -p [-f keyfile] [-m format] [-N new_passphrase]
+                [-P old_passphrase]
+     ssh-keygen -i [-f input_keyfile] [-m key_format]
+     ssh-keygen -e [-f input_keyfile] [-m key_format]
+     ssh-keygen -y [-f input_keyfile]
+     ssh-keygen -c [-C comment] [-f keyfile] [-P passphrase]
+     ssh-keygen -l [-v] [-E fingerprint_hash] [-f input_keyfile]
+     ssh-keygen -B [-f input_keyfile]
+     ssh-keygen -D pkcs11
+     ssh-keygen -F hostname [-lv] [-f known_hosts_file]
+     ssh-keygen -H [-f known_hosts_file]
+     ssh-keygen -K [-w provider]
+     ssh-keygen -R hostname [-f known_hosts_file]
+     ssh-keygen -r hostname [-g] [-f input_keyfile]
+     ssh-keygen -M generate [-O option] output_file
+     ssh-keygen -M screen [-f input_file] [-O option] output_file
+     ssh-keygen -I certificate_identity -s ca_key [-hU] [-D pkcs11_provider]
+                [-n principals] [-O option] [-V validity_interval]
+                [-z serial_number] file ...
+     ssh-keygen -L [-f input_keyfile]
+     ssh-keygen -A [-f prefix_path]
+     ssh-keygen -k -f krl_file [-u] [-s ca_public] [-z version_number]
+                file ...
+     ssh-keygen -Q -f krl_file file ...
+     ssh-keygen -Y find-principals -s signature_file -f allowed_signers_file
+     ssh-keygen -Y check-novalidate -n namespace -s signature_file
+     ssh-keygen -Y sign -f key_file -n namespace file ...
+     ssh-keygen -Y verify -f allowed_signers_file -I signer_identity
+                -n namespace -s signature_file [-r revocation_file]
+
+DESCRIPTION
+     ssh-keygen generates, manages and converts authentication keys for
+     ssh(1).  ssh-keygen can create keys for use by SSH protocol version 2.
+
+     The type of key to be generated is specified with the -t option.  If
+     invoked without any arguments, ssh-keygen will generate an RSA key.
+
+     ssh-keygen is also used to generate groups for use in Diffie-Hellman
+     group exchange (DH-GEX).  See the MODULI GENERATION section for details.
+
+     Finally, ssh-keygen can be used to generate and update Key Revocation
+     Lists, and to test whether given keys have been revoked by one.  See the
+     KEY REVOCATION LISTS section for details.
+
+     Normally each user wishing to use SSH with public key authentication runs
+     this once to create the authentication key in ~/.ssh/id_dsa,
+     ~/.ssh/id_ecdsa, ~/.ssh/id_ecdsa_sk, ~/.ssh/id_ed25519,
+     ~/.ssh/id_ed25519_sk or ~/.ssh/id_rsa.  Additionally, the system
+     administrator may use this to generate host keys, as seen in /etc/rc.
+
+     Normally this program generates the key and asks for a file in which to
+     store the private key.  The public key is stored in a file with the same
+     name but M-bM-^@M-^\.pubM-bM-^@M-^] appended.  The program also asks for a passphrase.  The
+     passphrase may be empty to indicate no passphrase (host keys must have an
+     empty passphrase), or it may be a string of arbitrary length.  A
+     passphrase is similar to a password, except it can be a phrase with a
+     series of words, punctuation, numbers, whitespace, or any string of
+     characters you want.  Good passphrases are 10-30 characters long, are not
+     simple sentences or otherwise easily guessable (English prose has only
+     1-2 bits of entropy per character, and provides very bad passphrases),
+     and contain a mix of upper and lowercase letters, numbers, and non-
+     alphanumeric characters.  The passphrase can be changed later by using
+     the -p option.
+
+     There is no way to recover a lost passphrase.  If the passphrase is lost
+     or forgotten, a new key must be generated and the corresponding public
+     key copied to other machines.
+
+     ssh-keygen will by default write keys in an OpenSSH-specific format.
+     This format is preferred as it offers better protection for keys at rest
+     as well as allowing storage of key comments within the private key file
+     itself.  The key comment may be useful to help identify the key.  The
+     comment is initialized to M-bM-^@M-^\user@hostM-bM-^@M-^] when the key is created, but can be
+     changed using the -c option.
+
+     It is still possible for ssh-keygen to write the previously-used PEM
+     format private keys using the -m flag.  This may be used when generating
+     new keys, and existing new-format keys may be converted using this option
+     in conjunction with the -p (change passphrase) flag.
+
+     After a key is generated, instructions below detail where the keys should
+     be placed to be activated.
+
+     The options are as follows:
+
+     -A      For each of the key types (rsa, dsa, ecdsa and ed25519) for which
+             host keys do not exist, generate the host keys with the default
+             key file path, an empty passphrase, default bits for the key
+             type, and default comment.  If -f has also been specified, its
+             argument is used as a prefix to the default path for the
+             resulting host key files.  This is used by /etc/rc to generate
+             new host keys.
+
+     -a rounds
+             When saving a private key, this option specifies the number of
+             KDF (key derivation function) rounds used.  Higher numbers result
+             in slower passphrase verification and increased resistance to
+             brute-force password cracking (should the keys be stolen).
+
+     -B      Show the bubblebabble digest of specified private or public key
+             file.
+
+     -b bits
+             Specifies the number of bits in the key to create.  For RSA keys,
+             the minimum size is 1024 bits and the default is 3072 bits.
+             Generally, 3072 bits is considered sufficient.  DSA keys must be
+             exactly 1024 bits as specified by FIPS 186-2.  For ECDSA keys,
+             the -b flag determines the key length by selecting from one of
+             three elliptic curve sizes: 256, 384 or 521 bits.  Attempting to
+             use bit lengths other than these three values for ECDSA keys will
+             fail.  ECDSA-SK, Ed25519 and Ed25519-SK keys have a fixed length
+             and the -b flag will be ignored.
+
+     -C comment
+             Provides a new comment.
+
+     -c      Requests changing the comment in the private and public key
+             files.  The program will prompt for the file containing the
+             private keys, for the passphrase if the key has one, and for the
+             new comment.
+
+     -D pkcs11
+             Download the public keys provided by the PKCS#11 shared library
+             pkcs11.  When used in combination with -s, this option indicates
+             that a CA key resides in a PKCS#11 token (see the CERTIFICATES
+             section for details).
+
+     -E fingerprint_hash
+             Specifies the hash algorithm used when displaying key
+             fingerprints.  Valid options are: M-bM-^@M-^\md5M-bM-^@M-^] and M-bM-^@M-^\sha256M-bM-^@M-^].  The
+             default is M-bM-^@M-^\sha256M-bM-^@M-^].
+
+     -e      This option will read a private or public OpenSSH key file and
+             print to stdout a public key in one of the formats specified by
+             the -m option.  The default export format is M-bM-^@M-^\RFC4716M-bM-^@M-^].  This
+             option allows exporting OpenSSH keys for use by other programs,
+             including several commercial SSH implementations.
+
+     -F hostname | [hostname]:port
+             Search for the specified hostname (with optional port number) in
+             a known_hosts file, listing any occurrences found.  This option
+             is useful to find hashed host names or addresses and may also be
+             used in conjunction with the -H option to print found keys in a
+             hashed format.
+
+     -f filename
+             Specifies the filename of the key file.
+
+     -g      Use generic DNS format when printing fingerprint resource records
+             using the -r command.
+
+     -H      Hash a known_hosts file.  This replaces all hostnames and
+             addresses with hashed representations within the specified file;
+             the original content is moved to a file with a .old suffix.
+             These hashes may be used normally by ssh and sshd, but they do
+             not reveal identifying information should the file's contents be
+             disclosed.  This option will not modify existing hashed hostnames
+             and is therefore safe to use on files that mix hashed and non-
+             hashed names.
+
+     -h      When signing a key, create a host certificate instead of a user
+             certificate.  Please see the CERTIFICATES section for details.
+
+     -I certificate_identity
+             Specify the key identity when signing a public key.  Please see
+             the CERTIFICATES section for details.
+
+     -i      This option will read an unencrypted private (or public) key file
+             in the format specified by the -m option and print an OpenSSH
+             compatible private (or public) key to stdout.  This option allows
+             importing keys from other software, including several commercial
+             SSH implementations.  The default import format is M-bM-^@M-^\RFC4716M-bM-^@M-^].
+
+     -K      Download resident keys from a FIDO authenticator.  Public and
+             private key files will be written to the current directory for
+             each downloaded key.
+
+     -k      Generate a KRL file.  In this mode, ssh-keygen will generate a
+             KRL file at the location specified via the -f flag that revokes
+             every key or certificate presented on the command line.
+             Keys/certificates to be revoked may be specified by public key
+             file or using the format described in the KEY REVOCATION LISTS
+             section.
+
+     -L      Prints the contents of one or more certificates.
+
+     -l      Show fingerprint of specified public key file.  For RSA and DSA
+             keys ssh-keygen tries to find the matching public key file and
+             prints its fingerprint.  If combined with -v, a visual ASCII art
+             representation of the key is supplied with the fingerprint.
+
+     -M generate
+             Generate candidate Diffie-Hellman Group Exchange (DH-GEX)
+             parameters for eventual use by the
+             M-bM-^@M-^Xdiffie-hellman-group-exchange-*M-bM-^@M-^Y key exchange methods.  The
+             numbers generated by this operation must be further screened
+             before use.  See the MODULI GENERATION section for more
+             information.
+
+     -M screen
+             Screen candidate parameters for Diffie-Hellman Group Exchange.
+             This will accept a list of candidate numbers and test that they
+             are safe (Sophie Germain) primes with acceptable group
+             generators.  The results of this operation may be added to the
+             /etc/moduli file.  See the MODULI GENERATION section for more
+             information.
+
+     -m key_format
+             Specify a key format for key generation, the -i (import), -e
+             (export) conversion options, and the -p change passphrase
+             operation.  The latter may be used to convert between OpenSSH
+             private key and PEM private key formats.  The supported key
+             formats are: M-bM-^@M-^\RFC4716M-bM-^@M-^] (RFC 4716/SSH2 public or private key),
+             M-bM-^@M-^\PKCS8M-bM-^@M-^] (PKCS8 public or private key) or M-bM-^@M-^\PEMM-bM-^@M-^] (PEM public key).
+             By default OpenSSH will write newly-generated private keys in its
+             own format, but when converting public keys for export the
+             default format is M-bM-^@M-^\RFC4716M-bM-^@M-^].  Setting a format of M-bM-^@M-^\PEMM-bM-^@M-^] when
+             generating or updating a supported private key type will cause
+             the key to be stored in the legacy PEM private key format.
+
+     -N new_passphrase
+             Provides the new passphrase.
+
+     -n principals
+             Specify one or more principals (user or host names) to be
+             included in a certificate when signing a key.  Multiple
+             principals may be specified, separated by commas.  Please see the
+             CERTIFICATES section for details.
+
+     -O option
+             Specify a key/value option.  These are specific to the operation
+             that ssh-keygen has been requested to perform.
+
+             When signing certificates, one of the options listed in the
+             CERTIFICATES section may be specified here.
+
+             When performing moduli generation or screening, one of the
+             options listed in the MODULI GENERATION section may be specified.
+
+             When generating a key that will be hosted on a FIDO
+             authenticator, this flag may be used to specify key-specific
+             options.  Those supported at present are:
+
+             application
+                     Override the default FIDO application/origin string of
+                     M-bM-^@M-^\ssh:M-bM-^@M-^].  This may be useful when generating host or
+                     domain-specific resident keys.  The specified application
+                     string must begin with M-bM-^@M-^\ssh:M-bM-^@M-^].
+
+             challenge=path
+                     Specifies a path to a challenge string that will be
+                     passed to the FIDO token during key generation.  The
+                     challenge string may be used as part of an out-of-band
+                     protocol for key enrollment (a random challenge is used
+                     by default).
+
+             device  Explicitly specify a fido(4) device to use, rather than
+                     letting the token middleware select one.
+
+             no-touch-required
+                     Indicate that the generated private key should not
+                     require touch events (user presence) when making
+                     signatures.  Note that sshd(8) will refuse such
+                     signatures by default, unless overridden via an
+                     authorized_keys option.
+
+             resident
+                     Indicate that the key should be stored on the FIDO
+                     authenticator itself.  Resident keys may be supported on
+                     FIDO2 tokens and typically require that a PIN be set on
+                     the token prior to generation.  Resident keys may be
+                     loaded off the token using ssh-add(1).
+
+             user    A username to be associated with a resident key,
+                     overriding the empty default username.  Specifying a
+                     username may be useful when generating multiple resident
+                     keys for the same application name.
+
+             write-attestation=path
+                     May be used at key generation time to record the
+                     attestation certificate returned from FIDO tokens during
+                     key generation.  By default this information is
+                     discarded.
+
+             The -O option may be specified multiple times.
+
+     -P passphrase
+             Provides the (old) passphrase.
+
+     -p      Requests changing the passphrase of a private key file instead of
+             creating a new private key.  The program will prompt for the file
+             containing the private key, for the old passphrase, and twice for
+             the new passphrase.
+
+     -Q      Test whether keys have been revoked in a KRL.
+
+     -q      Silence ssh-keygen.
+
+     -R hostname | [hostname]:port
+             Removes all keys belonging to the specified hostname (with
+             optional port number) from a known_hosts file.  This option is
+             useful to delete hashed hosts (see the -H option above).
+
+     -r hostname
+             Print the SSHFP fingerprint resource record named hostname for
+             the specified public key file.
+
+     -s ca_key
+             Certify (sign) a public key using the specified CA key.  Please
+             see the CERTIFICATES section for details.
+
+             When generating a KRL, -s specifies a path to a CA public key
+             file used to revoke certificates directly by key ID or serial
+             number.  See the KEY REVOCATION LISTS section for details.
+
+     -t dsa | ecdsa | ecdsa-sk | ed25519 | ed25519-sk | rsa
+             Specifies the type of key to create.  The possible values are
+             M-bM-^@M-^\dsaM-bM-^@M-^], M-bM-^@M-^\ecdsaM-bM-^@M-^], M-bM-^@M-^\ecdsa-skM-bM-^@M-^], M-bM-^@M-^\ed25519M-bM-^@M-^], M-bM-^@M-^\ed25519-skM-bM-^@M-^], or M-bM-^@M-^\rsaM-bM-^@M-^].
+
+             This flag may also be used to specify the desired signature type
+             when signing certificates using an RSA CA key.  The available RSA
+             signature variants are M-bM-^@M-^\ssh-rsaM-bM-^@M-^] (SHA1 signatures, not
+             recommended), M-bM-^@M-^\rsa-sha2-256M-bM-^@M-^], and M-bM-^@M-^\rsa-sha2-512M-bM-^@M-^] (the default).
+
+     -U      When used in combination with -s, this option indicates that a CA
+             key resides in a ssh-agent(1).  See the CERTIFICATES section for
+             more information.
+
+     -u      Update a KRL.  When specified with -k, keys listed via the
+             command line are added to the existing KRL rather than a new KRL
+             being created.
+
+     -V validity_interval
+             Specify a validity interval when signing a certificate.  A
+             validity interval may consist of a single time, indicating that
+             the certificate is valid beginning now and expiring at that time,
+             or may consist of two times separated by a colon to indicate an
+             explicit time interval.
+
+             The start time may be specified as the string M-bM-^@M-^\alwaysM-bM-^@M-^] to
+             indicate the certificate has no specified start time, a date in
+             YYYYMMDD format, a time in YYYYMMDDHHMM[SS] format, a relative
+             time (to the current time) consisting of a minus sign followed by
+             an interval in the format described in the TIME FORMATS section
+             of sshd_config(5).
+
+             The end time may be specified as a YYYYMMDD date, a
+             YYYYMMDDHHMM[SS] time, a relative time starting with a plus
+             character or the string M-bM-^@M-^\foreverM-bM-^@M-^] to indicate that the
+             certificate has no expirty date.
+
+             For example: M-bM-^@M-^\+52w1dM-bM-^@M-^] (valid from now to 52 weeks and one day
+             from now), M-bM-^@M-^\-4w:+4wM-bM-^@M-^] (valid from four weeks ago to four weeks
+             from now), M-bM-^@M-^\20100101123000:20110101123000M-bM-^@M-^] (valid from 12:30 PM,
+             January 1st, 2010 to 12:30 PM, January 1st, 2011), M-bM-^@M-^\-1d:20110101M-bM-^@M-^]
+             (valid from yesterday to midnight, January 1st, 2011).
+             M-bM-^@M-^\-1m:foreverM-bM-^@M-^] (valid from one minute ago and never expiring).
+
+     -v      Verbose mode.  Causes ssh-keygen to print debugging messages
+             about its progress.  This is helpful for debugging moduli
+             generation.  Multiple -v options increase the verbosity.  The
+             maximum is 3.
+
+     -w provider
+             Specifies a path to a library that will be used when creating
+             FIDO authenticator-hosted keys, overriding the default of using
+             the internal USB HID support.
+
+     -Y find-principals
+             Find the principal(s) associated with the public key of a
+             signature, provided using the -s flag in an authorized signers
+             file provided using the -f flag.  The format of the allowed
+             signers file is documented in the ALLOWED SIGNERS section below.
+             If one or more matching principals are found, they are returned
+             on standard output.
+
+     -Y check-novalidate
+             Checks that a signature generated using ssh-keygen -Y sign has a
+             valid structure.  This does not validate if a signature comes
+             from an authorized signer.  When testing a signature, ssh-keygen
+             accepts a message on standard input and a signature namespace
+             using -n.  A file containing the corresponding signature must
+             also be supplied using the -s flag.  Successful testing of the
+             signature is signalled by ssh-keygen returning a zero exit
+             status.
+
+     -Y sign
+             Cryptographically sign a file or some data using a SSH key.  When
+             signing, ssh-keygen accepts zero or more files to sign on the
+             command-line - if no files are specified then ssh-keygen will
+             sign data presented on standard input.  Signatures are written to
+             the path of the input file with M-bM-^@M-^\.sigM-bM-^@M-^] appended, or to standard
+             output if the message to be signed was read from standard input.
+
+             The key used for signing is specified using the -f option and may
+             refer to either a private key, or a public key with the private
+             half available via ssh-agent(1).  An additional signature
+             namespace, used to prevent signature confusion across different
+             domains of use (e.g. file signing vs email signing) must be
+             provided via the -n flag.  Namespaces are arbitrary strings, and
+             may include: M-bM-^@M-^\fileM-bM-^@M-^] for file signing, M-bM-^@M-^\emailM-bM-^@M-^] for email signing.
+             For custom uses, it is recommended to use names following a
+             NAMESPACE@YOUR.DOMAIN pattern to generate unambiguous namespaces.
+
+     -Y verify
+             Request to verify a signature generated using ssh-keygen -Y sign
+             as described above.  When verifying a signature, ssh-keygen
+             accepts a message on standard input and a signature namespace
+             using -n.  A file containing the corresponding signature must
+             also be supplied using the -s flag, along with the identity of
+             the signer using -I and a list of allowed signers via the -f
+             flag.  The format of the allowed signers file is documented in
+             the ALLOWED SIGNERS section below.  A file containing revoked
+             keys can be passed using the -r flag.  The revocation file may be
+             a KRL or a one-per-line list of public keys.  Successful
+             verification by an authorized signer is signalled by ssh-keygen
+             returning a zero exit status.
+
+     -y      This option will read a private OpenSSH format file and print an
+             OpenSSH public key to stdout.
+
+     -z serial_number
+             Specifies a serial number to be embedded in the certificate to
+             distinguish this certificate from others from the same CA.  If
+             the serial_number is prefixed with a M-bM-^@M-^X+M-bM-^@M-^Y character, then the
+             serial number will be incremented for each certificate signed on
+             a single command-line.  The default serial number is zero.
+
+             When generating a KRL, the -z flag is used to specify a KRL
+             version number.
+
+MODULI GENERATION
+     ssh-keygen may be used to generate groups for the Diffie-Hellman Group
+     Exchange (DH-GEX) protocol.  Generating these groups is a two-step
+     process: first, candidate primes are generated using a fast, but memory
+     intensive process.  These candidate primes are then tested for
+     suitability (a CPU-intensive process).
+
+     Generation of primes is performed using the -M generate option.  The
+     desired length of the primes may be specified by the -O bits option.  For
+     example:
+
+           # ssh-keygen -M generate -O bits=2048 moduli-2048.candidates
+
+     By default, the search for primes begins at a random point in the desired
+     length range.  This may be overridden using the -O start option, which
+     specifies a different start point (in hex).
+
+     Once a set of candidates have been generated, they must be screened for
+     suitability.  This may be performed using the -M screen option.  In this
+     mode ssh-keygen will read candidates from standard input (or a file
+     specified using the -f option).  For example:
+
+           # ssh-keygen -M screen -f moduli-2048.candidates moduli-2048
+
+     By default, each candidate will be subjected to 100 primality tests.
+     This may be overridden using the -O prime-tests option.  The DH generator
+     value will be chosen automatically for the prime under consideration.  If
+     a specific generator is desired, it may be requested using the -O
+     generator option.  Valid generator values are 2, 3, and 5.
+
+     Screened DH groups may be installed in /etc/moduli.  It is important that
+     this file contains moduli of a range of bit lengths and that both ends of
+     a connection share common moduli.
+
+     A number of options are available for moduli generation and screening via
+     the -O flag:
+
+     lines=number
+             Exit after screening the specified number of lines while
+             performing DH candidate screening.
+
+     start-line=line-number
+             Start screening at the specified line number while performing DH
+             candidate screening.
+
+     checkpoint=filename
+             Write the last line processed to the specified file while
+             performing DH candidate screening.  This will be used to skip
+             lines in the input file that have already been processed if the
+             job is restarted.
+
+     memory=mbytes
+             Specify the amount of memory to use (in megabytes) when
+             generating candidate moduli for DH-GEX.
+
+     start=hex-value
+             Specify start point (in hex) when generating candidate moduli for
+             DH-GEX.
+
+     generator=value
+             Specify desired generator (in decimal) when testing candidate
+             moduli for DH-GEX.
+
+CERTIFICATES
+     ssh-keygen supports signing of keys to produce certificates that may be
+     used for user or host authentication.  Certificates consist of a public
+     key, some identity information, zero or more principal (user or host)
+     names and a set of options that are signed by a Certification Authority
+     (CA) key.  Clients or servers may then trust only the CA key and verify
+     its signature on a certificate rather than trusting many user/host keys.
+     Note that OpenSSH certificates are a different, and much simpler, format
+     to the X.509 certificates used in ssl(8).
+
+     ssh-keygen supports two types of certificates: user and host.  User
+     certificates authenticate users to servers, whereas host certificates
+     authenticate server hosts to users.  To generate a user certificate:
+
+           $ ssh-keygen -s /path/to/ca_key -I key_id /path/to/user_key.pub
+
+     The resultant certificate will be placed in /path/to/user_key-cert.pub.
+     A host certificate requires the -h option:
+
+           $ ssh-keygen -s /path/to/ca_key -I key_id -h /path/to/host_key.pub
+
+     The host certificate will be output to /path/to/host_key-cert.pub.
+
+     It is possible to sign using a CA key stored in a PKCS#11 token by
+     providing the token library using -D and identifying the CA key by
+     providing its public half as an argument to -s:
+
+           $ ssh-keygen -s ca_key.pub -D libpkcs11.so -I key_id user_key.pub
+
+     Similarly, it is possible for the CA key to be hosted in a ssh-agent(1).
+     This is indicated by the -U flag and, again, the CA key must be
+     identified by its public half.
+
+           $ ssh-keygen -Us ca_key.pub -I key_id user_key.pub
+
+     In all cases, key_id is a "key identifier" that is logged by the server
+     when the certificate is used for authentication.
+
+     Certificates may be limited to be valid for a set of principal
+     (user/host) names.  By default, generated certificates are valid for all
+     users or hosts.  To generate a certificate for a specified set of
+     principals:
+
+           $ ssh-keygen -s ca_key -I key_id -n user1,user2 user_key.pub
+           $ ssh-keygen -s ca_key -I key_id -h -n host.domain host_key.pub
+
+     Additional limitations on the validity and use of user certificates may
+     be specified through certificate options.  A certificate option may
+     disable features of the SSH session, may be valid only when presented
+     from particular source addresses or may force the use of a specific
+     command.
+
+     The options that are valid for user certificates are:
+
+     clear   Clear all enabled permissions.  This is useful for clearing the
+             default set of permissions so permissions may be added
+             individually.
+
+     critical:name[=contents]
+     extension:name[=contents]
+             Includes an arbitrary certificate critical option or extension.
+             The specified name should include a domain suffix, e.g.
+             M-bM-^@M-^\name@example.comM-bM-^@M-^].  If contents is specified then it is included
+             as the contents of the extension/option encoded as a string,
+             otherwise the extension/option is created with no contents
+             (usually indicating a flag).  Extensions may be ignored by a
+             client or server that does not recognise them, whereas unknown
+             critical options will cause the certificate to be refused.
+
+     force-command=command
+             Forces the execution of command instead of any shell or command
+             specified by the user when the certificate is used for
+             authentication.
+
+     no-agent-forwarding
+             Disable ssh-agent(1) forwarding (permitted by default).
+
+     no-port-forwarding
+             Disable port forwarding (permitted by default).
+
+     no-pty  Disable PTY allocation (permitted by default).
+
+     no-user-rc
+             Disable execution of ~/.ssh/rc by sshd(8) (permitted by default).
+
+     no-x11-forwarding
+             Disable X11 forwarding (permitted by default).
+
+     permit-agent-forwarding
+             Allows ssh-agent(1) forwarding.
+
+     permit-port-forwarding
+             Allows port forwarding.
+
+     permit-pty
+             Allows PTY allocation.
+
+     permit-user-rc
+             Allows execution of ~/.ssh/rc by sshd(8).
+
+     permit-X11-forwarding
+             Allows X11 forwarding.
+
+     no-touch-required
+             Do not require signatures made using this key require
+             demonstration of user presence (e.g. by having the user touch the
+             authenticator).  This option only makes sense for the FIDO
+             authenticator algorithms ecdsa-sk and ed25519-sk.
+
+     source-address=address_list
+             Restrict the source addresses from which the certificate is
+             considered valid.  The address_list is a comma-separated list of
+             one or more address/netmask pairs in CIDR format.
+
+     At present, no standard options are valid for host keys.
+
+     Finally, certificates may be defined with a validity lifetime.  The -V
+     option allows specification of certificate start and end times.  A
+     certificate that is presented at a time outside this range will not be
+     considered valid.  By default, certificates are valid from UNIX Epoch to
+     the distant future.
+
+     For certificates to be used for user or host authentication, the CA
+     public key must be trusted by sshd(8) or ssh(1).  Please refer to those
+     manual pages for details.
+
+KEY REVOCATION LISTS
+     ssh-keygen is able to manage OpenSSH format Key Revocation Lists (KRLs).
+     These binary files specify keys or certificates to be revoked using a
+     compact format, taking as little as one bit per certificate if they are
+     being revoked by serial number.
+
+     KRLs may be generated using the -k flag.  This option reads one or more
+     files from the command line and generates a new KRL.  The files may
+     either contain a KRL specification (see below) or public keys, listed one
+     per line.  Plain public keys are revoked by listing their hash or
+     contents in the KRL and certificates revoked by serial number or key ID
+     (if the serial is zero or not available).
+
+     Revoking keys using a KRL specification offers explicit control over the
+     types of record used to revoke keys and may be used to directly revoke
+     certificates by serial number or key ID without having the complete
+     original certificate on hand.  A KRL specification consists of lines
+     containing one of the following directives followed by a colon and some
+     directive-specific information.
+
+     serial: serial_number[-serial_number]
+             Revokes a certificate with the specified serial number.  Serial
+             numbers are 64-bit values, not including zero and may be
+             expressed in decimal, hex or octal.  If two serial numbers are
+             specified separated by a hyphen, then the range of serial numbers
+             including and between each is revoked.  The CA key must have been
+             specified on the ssh-keygen command line using the -s option.
+
+     id: key_id
+             Revokes a certificate with the specified key ID string.  The CA
+             key must have been specified on the ssh-keygen command line using
+             the -s option.
+
+     key: public_key
+             Revokes the specified key.  If a certificate is listed, then it
+             is revoked as a plain public key.
+
+     sha1: public_key
+             Revokes the specified key by including its SHA1 hash in the KRL.
+
+     sha256: public_key
+             Revokes the specified key by including its SHA256 hash in the
+             KRL.  KRLs that revoke keys by SHA256 hash are not supported by
+             OpenSSH versions prior to 7.9.
+
+     hash: fingerprint
+             Revokes a key using a fingerprint hash, as obtained from a
+             sshd(8) authentication log message or the ssh-keygen -l flag.
+             Only SHA256 fingerprints are supported here and resultant KRLs
+             are not supported by OpenSSH versions prior to 7.9.
+
+     KRLs may be updated using the -u flag in addition to -k.  When this
+     option is specified, keys listed via the command line are merged into the
+     KRL, adding to those already there.
+
+     It is also possible, given a KRL, to test whether it revokes a particular
+     key (or keys).  The -Q flag will query an existing KRL, testing each key
+     specified on the command line.  If any key listed on the command line has
+     been revoked (or an error encountered) then ssh-keygen will exit with a
+     non-zero exit status.  A zero exit status will only be returned if no key
+     was revoked.
+
+ALLOWED SIGNERS
+     When verifying signatures, ssh-keygen uses a simple list of identities
+     and keys to determine whether a signature comes from an authorized
+     source.  This "allowed signers" file uses a format patterned after the
+     AUTHORIZED_KEYS FILE FORMAT described in sshd(8).  Each line of the file
+     contains the following space-separated fields: principals, options,
+     keytype, base64-encoded key.  Empty lines and lines starting with a M-bM-^@M-^X#M-bM-^@M-^Y
+     are ignored as comments.
+
+     The principals field is a pattern-list (See PATTERNS in ssh_config(5))
+     consisting of one or more comma-separated USER@DOMAIN identity patterns
+     that are accepted for signing.  When verifying, the identity presented
+     via the -I option must match a principals pattern in order for the
+     corresponding key to be considered acceptable for verification.
+
+     The options (if present) consist of comma-separated option
+     specifications.  No spaces are permitted, except within double quotes.
+     The following option specifications are supported (note that option
+     keywords are case-insensitive):
+
+     cert-authority
+             Indicates that this key is accepted as a certificate authority
+             (CA) and that certificates signed by this CA may be accepted for
+             verification.
+
+     namespaces="namespace-list"
+             Specifies a pattern-list of namespaces that are accepted for this
+             key.  If this option is present, the signature namespace embedded
+             in the signature object and presented on the verification
+             command-line must match the specified list before the key will be
+             considered acceptable.
+
+     When verifying signatures made by certificates, the expected principal
+     name must match both the principals pattern in the allowed signers file
+     and the principals embedded in the certificate itself.
+
+     An example allowed signers file:
+
+        # Comments allowed at start of line
+        user1@example.com,user2@example.com ssh-rsa AAAAX1...
+        # A certificate authority, trusted for all principals in a domain.
+        *@example.com cert-authority ssh-ed25519 AAAB4...
+        # A key that is accepted only for file signing.
+        user2@example.com namespaces="file" ssh-ed25519 AAA41...
+
+ENVIRONMENT
+     SSH_SK_PROVIDER
+             Specifies a path to a library that will be used when loading any
+             FIDO authenticator-hosted keys, overriding the default of using
+             the built-in USB HID support.
+
+FILES
+     ~/.ssh/id_dsa
+     ~/.ssh/id_ecdsa
+     ~/.ssh/id_ecdsa_sk
+     ~/.ssh/id_ed25519
+     ~/.ssh/id_ed25519_sk
+     ~/.ssh/id_rsa
+             Contains the DSA, ECDSA, authenticator-hosted ECDSA, Ed25519,
+             authenticator-hosted Ed25519 or RSA authentication identity of
+             the user.  This file should not be readable by anyone but the
+             user.  It is possible to specify a passphrase when generating the
+             key; that passphrase will be used to encrypt the private part of
+             this file using 128-bit AES.  This file is not automatically
+             accessed by ssh-keygen but it is offered as the default file for
+             the private key.  ssh(1) will read this file when a login attempt
+             is made.
+
+     ~/.ssh/id_dsa.pub
+     ~/.ssh/id_ecdsa.pub
+     ~/.ssh/id_ecdsa_sk.pub
+     ~/.ssh/id_ed25519.pub
+     ~/.ssh/id_ed25519_sk.pub
+     ~/.ssh/id_rsa.pub
+             Contains the DSA, ECDSA, authenticator-hosted ECDSA, Ed25519,
+             authenticator-hosted Ed25519 or RSA public key for
+             authentication.  The contents of this file should be added to
+             ~/.ssh/authorized_keys on all machines where the user wishes to
+             log in using public key authentication.  There is no need to keep
+             the contents of this file secret.
+
+     /etc/moduli
+             Contains Diffie-Hellman groups used for DH-GEX.  The file format
+             is described in moduli(5).
+
+SEE ALSO
+     ssh(1), ssh-add(1), ssh-agent(1), moduli(5), sshd(8)
+
+     The Secure Shell (SSH) Public Key File Format, RFC 4716, 2006.
+
+AUTHORS
+     OpenSSH is a derivative of the original and free ssh 1.2.12 release by
+     Tatu Ylonen.  Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo
+     de Raadt and Dug Song removed many bugs, re-added newer features and
+     created OpenSSH.  Markus Friedl contributed the support for SSH protocol
+     versions 1.5 and 2.0.
+
+OpenBSD 6.6                    February 7, 2020                    OpenBSD 6.6
diff --git a/ssh-keyscan.0 b/ssh-keyscan.0
new file mode 100644
index 000000000..9fc324620
--- /dev/null
+++ b/ssh-keyscan.0
@@ -0,0 +1,96 @@
+SSH-KEYSCAN(1)              General Commands Manual             SSH-KEYSCAN(1)
+
+NAME
+     ssh-keyscan M-bM-^@M-^S gather SSH public keys from servers
+
+SYNOPSIS
+     ssh-keyscan [-46cDHv] [-f file] [-p port] [-T timeout] [-t type]
+                 [host | addrlist namelist]
+
+DESCRIPTION
+     ssh-keyscan is a utility for gathering the public SSH host keys of a
+     number of hosts.  It was designed to aid in building and verifying
+     ssh_known_hosts files, the format of which is documented in sshd(8).
+     ssh-keyscan provides a minimal interface suitable for use by shell and
+     perl scripts.
+
+     ssh-keyscan uses non-blocking socket I/O to contact as many hosts as
+     possible in parallel, so it is very efficient.  The keys from a domain of
+     1,000 hosts can be collected in tens of seconds, even when some of those
+     hosts are down or do not run sshd(8).  For scanning, one does not need
+     login access to the machines that are being scanned, nor does the
+     scanning process involve any encryption.
+
+     The options are as follows:
+
+     -4      Force ssh-keyscan to use IPv4 addresses only.
+
+     -6      Force ssh-keyscan to use IPv6 addresses only.
+
+     -c      Request certificates from target hosts instead of plain keys.
+
+     -D      Print keys found as SSHFP DNS records.  The default is to print
+             keys in a format usable as a ssh(1) known_hosts file.
+
+     -f file
+             Read hosts or M-bM-^@M-^\addrlist namelistM-bM-^@M-^] pairs from file, one per line.
+             If M-bM-^@M-^X-M-bM-^@M-^Y is supplied instead of a filename, ssh-keyscan will read
+             from the standard input.  Input is expected in the format:
+
+             1.2.3.4,1.2.4.4 name.my.domain,name,n.my.domain,n,1.2.3.4,1.2.4.4
+
+     -H      Hash all hostnames and addresses in the output.  Hashed names may
+             be used normally by ssh(1) and sshd(8), but they do not reveal
+             identifying information should the file's contents be disclosed.
+
+     -p port
+             Connect to port on the remote host.
+
+     -T timeout
+             Set the timeout for connection attempts.  If timeout seconds have
+             elapsed since a connection was initiated to a host or since the
+             last time anything was read from that host, the connection is
+             closed and the host in question considered unavailable.  The
+             default is 5 seconds.
+
+     -t type
+             Specify the type of the key to fetch from the scanned hosts.  The
+             possible values are M-bM-^@M-^\dsaM-bM-^@M-^], M-bM-^@M-^\ecdsaM-bM-^@M-^], M-bM-^@M-^\ed25519M-bM-^@M-^], or M-bM-^@M-^\rsaM-bM-^@M-^].
+             Multiple values may be specified by separating them with commas.
+             The default is to fetch M-bM-^@M-^\rsaM-bM-^@M-^], M-bM-^@M-^\ecdsaM-bM-^@M-^], and M-bM-^@M-^\ed25519M-bM-^@M-^] keys.
+
+     -v      Verbose mode: print debugging messages about progress.
+
+     If an ssh_known_hosts file is constructed using ssh-keyscan without
+     verifying the keys, users will be vulnerable to man in the middle
+     attacks.  On the other hand, if the security model allows such a risk,
+     ssh-keyscan can help in the detection of tampered keyfiles or man in the
+     middle attacks which have begun after the ssh_known_hosts file was
+     created.
+
+FILES
+     /etc/ssh/ssh_known_hosts
+
+EXAMPLES
+     Print the RSA host key for machine hostname:
+
+           $ ssh-keyscan -t rsa hostname
+
+     Find all hosts from the file ssh_hosts which have new or different keys
+     from those in the sorted file ssh_known_hosts:
+
+           $ ssh-keyscan -t rsa,dsa,ecdsa,ed25519 -f ssh_hosts | \
+                   sort -u - ssh_known_hosts | diff ssh_known_hosts -
+
+SEE ALSO
+     ssh(1), sshd(8)
+
+     Using DNS to Securely Publish Secure Shell (SSH) Key Fingerprints, RFC
+     4255, 2006.
+
+AUTHORS
+     David Mazieres <dm@lcs.mit.edu> wrote the initial version, and Wayne
+     Davison <wayned@users.sourceforge.net> added support for protocol version
+     2.
+
+OpenBSD 6.6                    November 30, 2019                   OpenBSD 6.6
diff --git a/ssh-keysign.0 b/ssh-keysign.0
new file mode 100644
index 000000000..87e7f1a72
--- /dev/null
+++ b/ssh-keysign.0
@@ -0,0 +1,52 @@
+SSH-KEYSIGN(8)              System Manager's Manual             SSH-KEYSIGN(8)
+
+NAME
+     ssh-keysign M-bM-^@M-^S OpenSSH helper for host-based authentication
+
+SYNOPSIS
+     ssh-keysign
+
+DESCRIPTION
+     ssh-keysign is used by ssh(1) to access the local host keys and generate
+     the digital signature required during host-based authentication.
+
+     ssh-keysign is disabled by default and can only be enabled in the global
+     client configuration file /etc/ssh/ssh_config by setting EnableSSHKeysign
+     to M-bM-^@M-^\yesM-bM-^@M-^].
+
+     ssh-keysign is not intended to be invoked by the user, but from ssh(1).
+     See ssh(1) and sshd(8) for more information about host-based
+     authentication.
+
+FILES
+     /etc/ssh/ssh_config
+             Controls whether ssh-keysign is enabled.
+
+     /etc/ssh/ssh_host_dsa_key
+     /etc/ssh/ssh_host_ecdsa_key
+     /etc/ssh/ssh_host_ed25519_key
+     /etc/ssh/ssh_host_rsa_key
+             These files contain the private parts of the host keys used to
+             generate the digital signature.  They should be owned by root,
+             readable only by root, and not accessible to others.  Since they
+             are readable only by root, ssh-keysign must be set-uid root if
+             host-based authentication is used.
+
+     /etc/ssh/ssh_host_dsa_key-cert.pub
+     /etc/ssh/ssh_host_ecdsa_key-cert.pub
+     /etc/ssh/ssh_host_ed25519_key-cert.pub
+     /etc/ssh/ssh_host_rsa_key-cert.pub
+             If these files exist they are assumed to contain public
+             certificate information corresponding with the private keys
+             above.
+
+SEE ALSO
+     ssh(1), ssh-keygen(1), ssh_config(5), sshd(8)
+
+HISTORY
+     ssh-keysign first appeared in OpenBSD 3.2.
+
+AUTHORS
+     Markus Friedl <markus@openbsd.org>
+
+OpenBSD 6.6                    November 30, 2019                   OpenBSD 6.6
diff --git a/ssh-pkcs11-helper.0 b/ssh-pkcs11-helper.0
new file mode 100644
index 000000000..4516bc120
--- /dev/null
+++ b/ssh-pkcs11-helper.0
@@ -0,0 +1,35 @@
+SSH-PKCS11-HELPER(8)        System Manager's Manual       SSH-PKCS11-HELPER(8)
+
+NAME
+     ssh-pkcs11-helper M-bM-^@M-^S OpenSSH helper for PKCS#11 support
+
+SYNOPSIS
+     ssh-pkcs11-helper [-v]
+
+DESCRIPTION
+     ssh-pkcs11-helper is used by ssh-agent(1) to access keys provided by a
+     PKCS#11 token.
+
+     ssh-pkcs11-helper is not intended to be invoked by the user, but from
+     ssh-agent(1).
+
+     A single option is supported:
+
+     -v      Verbose mode.  Causes ssh-pkcs11-helper to print debugging
+             messages about its progress.  This is helpful in debugging
+             problems.  Multiple -v options increase the verbosity.  The
+             maximum is 3.
+
+             Note that ssh-agent(1) will automatically pass the -v flag to
+             ssh-pkcs11-helper when it has itself been placed in debug mode.
+
+SEE ALSO
+     ssh(1), ssh-add(1), ssh-agent(1)
+
+HISTORY
+     ssh-pkcs11-helper first appeared in OpenBSD 4.7.
+
+AUTHORS
+     Markus Friedl <markus@openbsd.org>
+
+OpenBSD 6.6                    November 30, 2019                   OpenBSD 6.6
diff --git a/ssh-sk-helper.0 b/ssh-sk-helper.0
new file mode 100644
index 000000000..6257fac7c
--- /dev/null
+++ b/ssh-sk-helper.0
@@ -0,0 +1,34 @@
+SSH-SK-HELPER(8)            System Manager's Manual           SSH-SK-HELPER(8)
+
+NAME
+     ssh-sk-helper M-bM-^@M-^S OpenSSH helper for FIDO authenticator support
+
+SYNOPSIS
+     ssh-sk-helper [-v]
+
+DESCRIPTION
+     ssh-sk-helper is used by ssh-agent(1) to access keys provided by a FIDO
+     authenticator.
+
+     ssh-sk-helper is not intended to be invoked by the user, but from
+     ssh-agent(1).
+
+     A single option is supported:
+
+     -v      Verbose mode.  Causes ssh-sk-helper to print debugging messages
+             about its progress.  This is helpful in debugging problems.
+             Multiple -v options increase the verbosity.  The maximum is 3.
+
+             Note that ssh-agent(1) will automatically pass the -v flag to
+             ssh-sk-helper when it has itself been placed in debug mode.
+
+SEE ALSO
+     ssh(1), ssh-add(1), ssh-agent(1)
+
+HISTORY
+     ssh-sk-helper first appeared in OpenBSD 6.7.
+
+AUTHORS
+     Damien Miller <djm@openbsd.org>
+
+OpenBSD 6.6                    December 21, 2019                   OpenBSD 6.6
diff --git a/ssh.0 b/ssh.0
new file mode 100644
index 000000000..ffacbef65
--- /dev/null
+++ b/ssh.0
@@ -0,0 +1,991 @@
+SSH(1)                      General Commands Manual                     SSH(1)
+
+NAME
+     ssh M-bM-^@M-^S OpenSSH remote login client
+
+SYNOPSIS
+     ssh [-46AaCfGgKkMNnqsTtVvXxYy] [-B bind_interface] [-b bind_address]
+         [-c cipher_spec] [-D [bind_address:]port] [-E log_file]
+         [-e escape_char] [-F configfile] [-I pkcs11] [-i identity_file]
+         [-J destination] [-L address] [-l login_name] [-m mac_spec]
+         [-O ctl_cmd] [-o option] [-p port] [-Q query_option] [-R address]
+         [-S ctl_path] [-W host:port] [-w local_tun[:remote_tun]] destination
+         [command]
+
+DESCRIPTION
+     ssh (SSH client) is a program for logging into a remote machine and for
+     executing commands on a remote machine.  It is intended to provide secure
+     encrypted communications between two untrusted hosts over an insecure
+     network.  X11 connections, arbitrary TCP ports and UNIX-domain sockets
+     can also be forwarded over the secure channel.
+
+     ssh connects and logs into the specified destination, which may be
+     specified as either [user@]hostname or a URI of the form
+     ssh://[user@]hostname[:port].  The user must prove his/her identity to
+     the remote machine using one of several methods (see below).
+
+     If a command is specified, it is executed on the remote host instead of a
+     login shell.
+
+     The options are as follows:
+
+     -4      Forces ssh to use IPv4 addresses only.
+
+     -6      Forces ssh to use IPv6 addresses only.
+
+     -A      Enables forwarding of connections from an authentication agent
+             such as ssh-agent(1).  This can also be specified on a per-host
+             basis in a configuration file.
+
+             Agent forwarding should be enabled with caution.  Users with the
+             ability to bypass file permissions on the remote host (for the
+             agent's UNIX-domain socket) can access the local agent through
+             the forwarded connection.  An attacker cannot obtain key material
+             from the agent, however they can perform operations on the keys
+             that enable them to authenticate using the identities loaded into
+             the agent.  A safer alternative may be to use a jump host (see
+             -J).
+
+     -a      Disables forwarding of the authentication agent connection.
+
+     -B bind_interface
+             Bind to the address of bind_interface before attempting to
+             connect to the destination host.  This is only useful on systems
+             with more than one address.
+
+     -b bind_address
+             Use bind_address on the local machine as the source address of
+             the connection.  Only useful on systems with more than one
+             address.
+
+     -C      Requests compression of all data (including stdin, stdout,
+             stderr, and data for forwarded X11, TCP and UNIX-domain
+             connections).  The compression algorithm is the same used by
+             gzip(1).  Compression is desirable on modem lines and other slow
+             connections, but will only slow down things on fast networks.
+             The default value can be set on a host-by-host basis in the
+             configuration files; see the Compression option.
+
+     -c cipher_spec
+             Selects the cipher specification for encrypting the session.
+             cipher_spec is a comma-separated list of ciphers listed in order
+             of preference.  See the Ciphers keyword in ssh_config(5) for more
+             information.
+
+     -D [bind_address:]port
+             Specifies a local M-bM-^@M-^\dynamicM-bM-^@M-^] application-level port forwarding.
+             This works by allocating a socket to listen to port on the local
+             side, optionally bound to the specified bind_address.  Whenever a
+             connection is made to this port, the connection is forwarded over
+             the secure channel, and the application protocol is then used to
+             determine where to connect to from the remote machine.  Currently
+             the SOCKS4 and SOCKS5 protocols are supported, and ssh will act
+             as a SOCKS server.  Only root can forward privileged ports.
+             Dynamic port forwardings can also be specified in the
+             configuration file.
+
+             IPv6 addresses can be specified by enclosing the address in
+             square brackets.  Only the superuser can forward privileged
+             ports.  By default, the local port is bound in accordance with
+             the GatewayPorts setting.  However, an explicit bind_address may
+             be used to bind the connection to a specific address.  The
+             bind_address of M-bM-^@M-^\localhostM-bM-^@M-^] indicates that the listening port be
+             bound for local use only, while an empty address or M-bM-^@M-^X*M-bM-^@M-^Y indicates
+             that the port should be available from all interfaces.
+
+     -E log_file
+             Append debug logs to log_file instead of standard error.
+
+     -e escape_char
+             Sets the escape character for sessions with a pty (default: M-bM-^@M-^X~M-bM-^@M-^Y).
+             The escape character is only recognized at the beginning of a
+             line.  The escape character followed by a dot (M-bM-^@M-^X.M-bM-^@M-^Y) closes the
+             connection; followed by control-Z suspends the connection; and
+             followed by itself sends the escape character once.  Setting the
+             character to M-bM-^@M-^\noneM-bM-^@M-^] disables any escapes and makes the session
+             fully transparent.
+
+     -F configfile
+             Specifies an alternative per-user configuration file.  If a
+             configuration file is given on the command line, the system-wide
+             configuration file (/etc/ssh/ssh_config) will be ignored.  The
+             default for the per-user configuration file is ~/.ssh/config.
+
+     -f      Requests ssh to go to background just before command execution.
+             This is useful if ssh is going to ask for passwords or
+             passphrases, but the user wants it in the background.  This
+             implies -n.  The recommended way to start X11 programs at a
+             remote site is with something like ssh -f host xterm.
+
+             If the ExitOnForwardFailure configuration option is set to M-bM-^@M-^\yesM-bM-^@M-^],
+             then a client started with -f will wait for all remote port
+             forwards to be successfully established before placing itself in
+             the background.
+
+     -G      Causes ssh to print its configuration after evaluating Host and
+             Match blocks and exit.
+
+     -g      Allows remote hosts to connect to local forwarded ports.  If used
+             on a multiplexed connection, then this option must be specified
+             on the master process.
+
+     -I pkcs11
+             Specify the PKCS#11 shared library ssh should use to communicate
+             with a PKCS#11 token providing keys for user authentication.
+
+     -i identity_file
+             Selects a file from which the identity (private key) for public
+             key authentication is read.  The default is ~/.ssh/id_dsa,
+             ~/.ssh/id_ecdsa, ~/.ssh/id_ecdsa_sk, ~/.ssh/id_ed25519,
+             ~/.ssh/id_ed25519_sk and ~/.ssh/id_rsa.  Identity files may also
+             be specified on a per-host basis in the configuration file.  It
+             is possible to have multiple -i options (and multiple identities
+             specified in configuration files).  If no certificates have been
+             explicitly specified by the CertificateFile directive, ssh will
+             also try to load certificate information from the filename
+             obtained by appending -cert.pub to identity filenames.
+
+     -J destination
+             Connect to the target host by first making a ssh connection to
+             the jump host described by destination and then establishing a
+             TCP forwarding to the ultimate destination from there.  Multiple
+             jump hops may be specified separated by comma characters.  This
+             is a shortcut to specify a ProxyJump configuration directive.
+             Note that configuration directives supplied on the command-line
+             generally apply to the destination host and not any specified
+             jump hosts.  Use ~/.ssh/config to specify configuration for jump
+             hosts.
+
+     -K      Enables GSSAPI-based authentication and forwarding (delegation)
+             of GSSAPI credentials to the server.
+
+     -k      Disables forwarding (delegation) of GSSAPI credentials to the
+             server.
+
+     -L [bind_address:]port:host:hostport
+     -L [bind_address:]port:remote_socket
+     -L local_socket:host:hostport
+     -L local_socket:remote_socket
+             Specifies that connections to the given TCP port or Unix socket
+             on the local (client) host are to be forwarded to the given host
+             and port, or Unix socket, on the remote side.  This works by
+             allocating a socket to listen to either a TCP port on the local
+             side, optionally bound to the specified bind_address, or to a
+             Unix socket.  Whenever a connection is made to the local port or
+             socket, the connection is forwarded over the secure channel, and
+             a connection is made to either host port hostport, or the Unix
+             socket remote_socket, from the remote machine.
+
+             Port forwardings can also be specified in the configuration file.
+             Only the superuser can forward privileged ports.  IPv6 addresses
+             can be specified by enclosing the address in square brackets.
+
+             By default, the local port is bound in accordance with the
+             GatewayPorts setting.  However, an explicit bind_address may be
+             used to bind the connection to a specific address.  The
+             bind_address of M-bM-^@M-^\localhostM-bM-^@M-^] indicates that the listening port be
+             bound for local use only, while an empty address or M-bM-^@M-^X*M-bM-^@M-^Y indicates
+             that the port should be available from all interfaces.
+
+     -l login_name
+             Specifies the user to log in as on the remote machine.  This also
+             may be specified on a per-host basis in the configuration file.
+
+     -M      Places the ssh client into M-bM-^@M-^\masterM-bM-^@M-^] mode for connection sharing.
+             Multiple -M options places ssh into M-bM-^@M-^\masterM-bM-^@M-^] mode but with
+             confirmation required using ssh-askpass(1) before each operation
+             that changes the multiplexing state (e.g. opening a new session).
+             Refer to the description of ControlMaster in ssh_config(5) for
+             details.
+
+     -m mac_spec
+             A comma-separated list of MAC (message authentication code)
+             algorithms, specified in order of preference.  See the MACs
+             keyword for more information.
+
+     -N      Do not execute a remote command.  This is useful for just
+             forwarding ports.
+
+     -n      Redirects stdin from /dev/null (actually, prevents reading from
+             stdin).  This must be used when ssh is run in the background.  A
+             common trick is to use this to run X11 programs on a remote
+             machine.  For example, ssh -n shadows.cs.hut.fi emacs & will
+             start an emacs on shadows.cs.hut.fi, and the X11 connection will
+             be automatically forwarded over an encrypted channel.  The ssh
+             program will be put in the background.  (This does not work if
+             ssh needs to ask for a password or passphrase; see also the -f
+             option.)
+
+     -O ctl_cmd
+             Control an active connection multiplexing master process.  When
+             the -O option is specified, the ctl_cmd argument is interpreted
+             and passed to the master process.  Valid commands are: M-bM-^@M-^\checkM-bM-^@M-^]
+             (check that the master process is running), M-bM-^@M-^\forwardM-bM-^@M-^] (request
+             forwardings without command execution), M-bM-^@M-^\cancelM-bM-^@M-^] (cancel
+             forwardings), M-bM-^@M-^\exitM-bM-^@M-^] (request the master to exit), and M-bM-^@M-^\stopM-bM-^@M-^]
+             (request the master to stop accepting further multiplexing
+             requests).
+
+     -o option
+             Can be used to give options in the format used in the
+             configuration file.  This is useful for specifying options for
+             which there is no separate command-line flag.  For full details
+             of the options listed below, and their possible values, see
+             ssh_config(5).
+
+                   AddKeysToAgent
+                   AddressFamily
+                   BatchMode
+                   BindAddress
+                   CanonicalDomains
+                   CanonicalizeFallbackLocal
+                   CanonicalizeHostname
+                   CanonicalizeMaxDots
+                   CanonicalizePermittedCNAMEs
+                   CASignatureAlgorithms
+                   CertificateFile
+                   ChallengeResponseAuthentication
+                   CheckHostIP
+                   Ciphers
+                   ClearAllForwardings
+                   Compression
+                   ConnectionAttempts
+                   ConnectTimeout
+                   ControlMaster
+                   ControlPath
+                   ControlPersist
+                   DynamicForward
+                   EscapeChar
+                   ExitOnForwardFailure
+                   FingerprintHash
+                   ForwardAgent
+                   ForwardX11
+                   ForwardX11Timeout
+                   ForwardX11Trusted
+                   GatewayPorts
+                   GlobalKnownHostsFile
+                   GSSAPIAuthentication
+                   GSSAPIDelegateCredentials
+                   HashKnownHosts
+                   Host
+                   HostbasedAuthentication
+                   HostbasedKeyTypes
+                   HostKeyAlgorithms
+                   HostKeyAlias
+                   Hostname
+                   IdentitiesOnly
+                   IdentityAgent
+                   IdentityFile
+                   IPQoS
+                   KbdInteractiveAuthentication
+                   KbdInteractiveDevices
+                   KexAlgorithms
+                   LocalCommand
+                   LocalForward
+                   LogLevel
+                   MACs
+                   Match
+                   NoHostAuthenticationForLocalhost
+                   NumberOfPasswordPrompts
+                   PasswordAuthentication
+                   PermitLocalCommand
+                   PKCS11Provider
+                   Port
+                   PreferredAuthentications
+                   ProxyCommand
+                   ProxyJump
+                   ProxyUseFdpass
+                   PubkeyAcceptedKeyTypes
+                   PubkeyAuthentication
+                   RekeyLimit
+                   RemoteCommand
+                   RemoteForward
+                   RequestTTY
+                   SendEnv
+                   ServerAliveInterval
+                   ServerAliveCountMax
+                   SetEnv
+                   StreamLocalBindMask
+                   StreamLocalBindUnlink
+                   StrictHostKeyChecking
+                   TCPKeepAlive
+                   Tunnel
+                   TunnelDevice
+                   UpdateHostKeys
+                   User
+                   UserKnownHostsFile
+                   VerifyHostKeyDNS
+                   VisualHostKey
+                   XAuthLocation
+
+     -p port
+             Port to connect to on the remote host.  This can be specified on
+             a per-host basis in the configuration file.
+
+     -Q query_option
+             Queries ssh for the algorithms supported for the specified
+             version 2.  The available features are: cipher (supported
+             symmetric ciphers), cipher-auth (supported symmetric ciphers that
+             support authenticated encryption), help (supported query terms
+             for use with the -Q flag), mac (supported message integrity
+             codes), kex (key exchange algorithms), key (key types), key-cert
+             (certificate key types), key-plain (non-certificate key types),
+             key-sig (all key types and signature algorithms),
+             protocol-version (supported SSH protocol versions), and sig
+             (supported signature algorithms).  Alternatively, any keyword
+             from ssh_config(5) or sshd_config(5) that takes an algorithm list
+             may be used as an alias for the corresponding query_option.
+
+     -q      Quiet mode.  Causes most warning and diagnostic messages to be
+             suppressed.
+
+     -R [bind_address:]port:host:hostport
+     -R [bind_address:]port:local_socket
+     -R remote_socket:host:hostport
+     -R remote_socket:local_socket
+     -R [bind_address:]port
+             Specifies that connections to the given TCP port or Unix socket
+             on the remote (server) host are to be forwarded to the local
+             side.
+
+             This works by allocating a socket to listen to either a TCP port
+             or to a Unix socket on the remote side.  Whenever a connection is
+             made to this port or Unix socket, the connection is forwarded
+             over the secure channel, and a connection is made from the local
+             machine to either an explicit destination specified by host port
+             hostport, or local_socket, or, if no explicit destination was
+             specified, ssh will act as a SOCKS 4/5 proxy and forward
+             connections to the destinations requested by the remote SOCKS
+             client.
+
+             Port forwardings can also be specified in the configuration file.
+             Privileged ports can be forwarded only when logging in as root on
+             the remote machine.  IPv6 addresses can be specified by enclosing
+             the address in square brackets.
+
+             By default, TCP listening sockets on the server will be bound to
+             the loopback interface only.  This may be overridden by
+             specifying a bind_address.  An empty bind_address, or the address
+             M-bM-^@M-^X*M-bM-^@M-^Y, indicates that the remote socket should listen on all
+             interfaces.  Specifying a remote bind_address will only succeed
+             if the server's GatewayPorts option is enabled (see
+             sshd_config(5)).
+
+             If the port argument is M-bM-^@M-^X0M-bM-^@M-^Y, the listen port will be dynamically
+             allocated on the server and reported to the client at run time.
+             When used together with -O forward the allocated port will be
+             printed to the standard output.
+
+     -S ctl_path
+             Specifies the location of a control socket for connection
+             sharing, or the string M-bM-^@M-^\noneM-bM-^@M-^] to disable connection sharing.
+             Refer to the description of ControlPath and ControlMaster in
+             ssh_config(5) for details.
+
+     -s      May be used to request invocation of a subsystem on the remote
+             system.  Subsystems facilitate the use of SSH as a secure
+             transport for other applications (e.g. sftp(1)).  The subsystem
+             is specified as the remote command.
+
+     -T      Disable pseudo-terminal allocation.
+
+     -t      Force pseudo-terminal allocation.  This can be used to execute
+             arbitrary screen-based programs on a remote machine, which can be
+             very useful, e.g. when implementing menu services.  Multiple -t
+             options force tty allocation, even if ssh has no local tty.
+
+     -V      Display the version number and exit.
+
+     -v      Verbose mode.  Causes ssh to print debugging messages about its
+             progress.  This is helpful in debugging connection,
+             authentication, and configuration problems.  Multiple -v options
+             increase the verbosity.  The maximum is 3.
+
+     -W host:port
+             Requests that standard input and output on the client be
+             forwarded to host on port over the secure channel.  Implies -N,
+             -T, ExitOnForwardFailure and ClearAllForwardings, though these
+             can be overridden in the configuration file or using -o command
+             line options.
+
+     -w local_tun[:remote_tun]
+             Requests tunnel device forwarding with the specified tun(4)
+             devices between the client (local_tun) and the server
+             (remote_tun).
+
+             The devices may be specified by numerical ID or the keyword
+             M-bM-^@M-^\anyM-bM-^@M-^], which uses the next available tunnel device.  If
+             remote_tun is not specified, it defaults to M-bM-^@M-^\anyM-bM-^@M-^].  See also the
+             Tunnel and TunnelDevice directives in ssh_config(5).
+
+             If the Tunnel directive is unset, it will be set to the default
+             tunnel mode, which is M-bM-^@M-^\point-to-pointM-bM-^@M-^].  If a different Tunnel
+             forwarding mode it desired, then it should be specified before
+             -w.
+
+     -X      Enables X11 forwarding.  This can also be specified on a per-host
+             basis in a configuration file.
+
+             X11 forwarding should be enabled with caution.  Users with the
+             ability to bypass file permissions on the remote host (for the
+             user's X authorization database) can access the local X11 display
+             through the forwarded connection.  An attacker may then be able
+             to perform activities such as keystroke monitoring.
+
+             For this reason, X11 forwarding is subjected to X11 SECURITY
+             extension restrictions by default.  Please refer to the ssh -Y
+             option and the ForwardX11Trusted directive in ssh_config(5) for
+             more information.
+
+     -x      Disables X11 forwarding.
+
+     -Y      Enables trusted X11 forwarding.  Trusted X11 forwardings are not
+             subjected to the X11 SECURITY extension controls.
+
+     -y      Send log information using the syslog(3) system module.  By
+             default this information is sent to stderr.
+
+     ssh may additionally obtain configuration data from a per-user
+     configuration file and a system-wide configuration file.  The file format
+     and configuration options are described in ssh_config(5).
+
+AUTHENTICATION
+     The OpenSSH SSH client supports SSH protocol 2.
+
+     The methods available for authentication are: GSSAPI-based
+     authentication, host-based authentication, public key authentication,
+     challenge-response authentication, and password authentication.
+     Authentication methods are tried in the order specified above, though
+     PreferredAuthentications can be used to change the default order.
+
+     Host-based authentication works as follows: If the machine the user logs
+     in from is listed in /etc/hosts.equiv or /etc/shosts.equiv on the remote
+     machine, and the user names are the same on both sides, or if the files
+     ~/.rhosts or ~/.shosts exist in the user's home directory on the remote
+     machine and contain a line containing the name of the client machine and
+     the name of the user on that machine, the user is considered for login.
+     Additionally, the server must be able to verify the client's host key
+     (see the description of /etc/ssh/ssh_known_hosts and ~/.ssh/known_hosts,
+     below) for login to be permitted.  This authentication method closes
+     security holes due to IP spoofing, DNS spoofing, and routing spoofing.
+     [Note to the administrator: /etc/hosts.equiv, ~/.rhosts, and the
+     rlogin/rsh protocol in general, are inherently insecure and should be
+     disabled if security is desired.]
+
+     Public key authentication works as follows: The scheme is based on
+     public-key cryptography, using cryptosystems where encryption and
+     decryption are done using separate keys, and it is unfeasible to derive
+     the decryption key from the encryption key.  The idea is that each user
+     creates a public/private key pair for authentication purposes.  The
+     server knows the public key, and only the user knows the private key.
+     ssh implements public key authentication protocol automatically, using
+     one of the DSA, ECDSA, Ed25519 or RSA algorithms.  The HISTORY section of
+     ssl(8) contains a brief discussion of the DSA and RSA algorithms.
+
+     The file ~/.ssh/authorized_keys lists the public keys that are permitted
+     for logging in.  When the user logs in, the ssh program tells the server
+     which key pair it would like to use for authentication.  The client
+     proves that it has access to the private key and the server checks that
+     the corresponding public key is authorized to accept the account.
+
+     The server may inform the client of errors that prevented public key
+     authentication from succeeding after authentication completes using a
+     different method.  These may be viewed by increasing the LogLevel to
+     DEBUG or higher (e.g. by using the -v flag).
+
+     The user creates his/her key pair by running ssh-keygen(1).  This stores
+     the private key in ~/.ssh/id_dsa (DSA), ~/.ssh/id_ecdsa (ECDSA),
+     ~/.ssh/id_ecdsa_sk (authenticator-hosted ECDSA), ~/.ssh/id_ed25519
+     (Ed25519), ~/.ssh/id_ed25519_sk (authenticator-hosted Ed25519), or
+     ~/.ssh/id_rsa (RSA) and stores the public key in ~/.ssh/id_dsa.pub (DSA),
+     ~/.ssh/id_ecdsa.pub (ECDSA), ~/.ssh/id_ecdsa_sk.pub (authenticator-hosted
+     ECDSA), ~/.ssh/id_ed25519.pub (Ed25519), ~/.ssh/id_ed25519_sk.pub
+     (authenticator-hosted Ed25519), or ~/.ssh/id_rsa.pub (RSA) in the user's
+     home directory.  The user should then copy the public key to
+     ~/.ssh/authorized_keys in his/her home directory on the remote machine.
+     The authorized_keys file corresponds to the conventional ~/.rhosts file,
+     and has one key per line, though the lines can be very long.  After this,
+     the user can log in without giving the password.
+
+     A variation on public key authentication is available in the form of
+     certificate authentication: instead of a set of public/private keys,
+     signed certificates are used.  This has the advantage that a single
+     trusted certification authority can be used in place of many
+     public/private keys.  See the CERTIFICATES section of ssh-keygen(1) for
+     more information.
+
+     The most convenient way to use public key or certificate authentication
+     may be with an authentication agent.  See ssh-agent(1) and (optionally)
+     the AddKeysToAgent directive in ssh_config(5) for more information.
+
+     Challenge-response authentication works as follows: The server sends an
+     arbitrary "challenge" text, and prompts for a response.  Examples of
+     challenge-response authentication include BSD Authentication (see
+     login.conf(5)) and PAM (some non-OpenBSD systems).
+
+     Finally, if other authentication methods fail, ssh prompts the user for a
+     password.  The password is sent to the remote host for checking; however,
+     since all communications are encrypted, the password cannot be seen by
+     someone listening on the network.
+
+     ssh automatically maintains and checks a database containing
+     identification for all hosts it has ever been used with.  Host keys are
+     stored in ~/.ssh/known_hosts in the user's home directory.  Additionally,
+     the file /etc/ssh/ssh_known_hosts is automatically checked for known
+     hosts.  Any new hosts are automatically added to the user's file.  If a
+     host's identification ever changes, ssh warns about this and disables
+     password authentication to prevent server spoofing or man-in-the-middle
+     attacks, which could otherwise be used to circumvent the encryption.  The
+     StrictHostKeyChecking option can be used to control logins to machines
+     whose host key is not known or has changed.
+
+     When the user's identity has been accepted by the server, the server
+     either executes the given command in a non-interactive session or, if no
+     command has been specified, logs into the machine and gives the user a
+     normal shell as an interactive session.  All communication with the
+     remote command or shell will be automatically encrypted.
+
+     If an interactive session is requested ssh by default will only request a
+     pseudo-terminal (pty) for interactive sessions when the client has one.
+     The flags -T and -t can be used to override this behaviour.
+
+     If a pseudo-terminal has been allocated the user may use the escape
+     characters noted below.
+
+     If no pseudo-terminal has been allocated, the session is transparent and
+     can be used to reliably transfer binary data.  On most systems, setting
+     the escape character to M-bM-^@M-^\noneM-bM-^@M-^] will also make the session transparent
+     even if a tty is used.
+
+     The session terminates when the command or shell on the remote machine
+     exits and all X11 and TCP connections have been closed.
+
+ESCAPE CHARACTERS
+     When a pseudo-terminal has been requested, ssh supports a number of
+     functions through the use of an escape character.
+
+     A single tilde character can be sent as ~~ or by following the tilde by a
+     character other than those described below.  The escape character must
+     always follow a newline to be interpreted as special.  The escape
+     character can be changed in configuration files using the EscapeChar
+     configuration directive or on the command line by the -e option.
+
+     The supported escapes (assuming the default M-bM-^@M-^X~M-bM-^@M-^Y) are:
+
+     ~.      Disconnect.
+
+     ~^Z     Background ssh.
+
+     ~#      List forwarded connections.
+
+     ~&      Background ssh at logout when waiting for forwarded connection /
+             X11 sessions to terminate.
+
+     ~?      Display a list of escape characters.
+
+     ~B      Send a BREAK to the remote system (only useful if the peer
+             supports it).
+
+     ~C      Open command line.  Currently this allows the addition of port
+             forwardings using the -L, -R and -D options (see above).  It also
+             allows the cancellation of existing port-forwardings with
+             -KL[bind_address:]port for local, -KR[bind_address:]port for
+             remote and -KD[bind_address:]port for dynamic port-forwardings.
+             !command allows the user to execute a local command if the
+             PermitLocalCommand option is enabled in ssh_config(5).  Basic
+             help is available, using the -h option.
+
+     ~R      Request rekeying of the connection (only useful if the peer
+             supports it).
+
+     ~V      Decrease the verbosity (LogLevel) when errors are being written
+             to stderr.
+
+     ~v      Increase the verbosity (LogLevel) when errors are being written
+             to stderr.
+
+TCP FORWARDING
+     Forwarding of arbitrary TCP connections over a secure channel can be
+     specified either on the command line or in a configuration file.  One
+     possible application of TCP forwarding is a secure connection to a mail
+     server; another is going through firewalls.
+
+     In the example below, we look at encrypting communication for an IRC
+     client, even though the IRC server it connects to does not directly
+     support encrypted communication.  This works as follows: the user
+     connects to the remote host using ssh, specifying the ports to be used to
+     forward the connection.  After that it is possible to start the program
+     locally, and ssh will encrypt and forward the connection to the remote
+     server.
+
+     The following example tunnels an IRC session from the client to an IRC
+     server at M-bM-^@M-^\server.example.comM-bM-^@M-^], joining channel M-bM-^@M-^\#usersM-bM-^@M-^], nickname
+     M-bM-^@M-^\pinkyM-bM-^@M-^], using the standard IRC port, 6667:
+
+         $ ssh -f -L 6667:localhost:6667 server.example.com sleep 10
+         $ irc -c '#users' pinky IRC/127.0.0.1
+
+     The -f option backgrounds ssh and the remote command M-bM-^@M-^\sleep 10M-bM-^@M-^] is
+     specified to allow an amount of time (10 seconds, in the example) to
+     start the program which is going to use the tunnel.  If no connections
+     are made within the time specified, ssh will exit.
+
+X11 FORWARDING
+     If the ForwardX11 variable is set to M-bM-^@M-^\yesM-bM-^@M-^] (or see the description of the
+     -X, -x, and -Y options above) and the user is using X11 (the DISPLAY
+     environment variable is set), the connection to the X11 display is
+     automatically forwarded to the remote side in such a way that any X11
+     programs started from the shell (or command) will go through the
+     encrypted channel, and the connection to the real X server will be made
+     from the local machine.  The user should not manually set DISPLAY.
+     Forwarding of X11 connections can be configured on the command line or in
+     configuration files.
+
+     The DISPLAY value set by ssh will point to the server machine, but with a
+     display number greater than zero.  This is normal, and happens because
+     ssh creates a M-bM-^@M-^\proxyM-bM-^@M-^] X server on the server machine for forwarding the
+     connections over the encrypted channel.
+
+     ssh will also automatically set up Xauthority data on the server machine.
+     For this purpose, it will generate a random authorization cookie, store
+     it in Xauthority on the server, and verify that any forwarded connections
+     carry this cookie and replace it by the real cookie when the connection
+     is opened.  The real authentication cookie is never sent to the server
+     machine (and no cookies are sent in the plain).
+
+     If the ForwardAgent variable is set to M-bM-^@M-^\yesM-bM-^@M-^] (or see the description of
+     the -A and -a options above) and the user is using an authentication
+     agent, the connection to the agent is automatically forwarded to the
+     remote side.
+
+VERIFYING HOST KEYS
+     When connecting to a server for the first time, a fingerprint of the
+     server's public key is presented to the user (unless the option
+     StrictHostKeyChecking has been disabled).  Fingerprints can be determined
+     using ssh-keygen(1):
+
+           $ ssh-keygen -l -f /etc/ssh/ssh_host_rsa_key
+
+     If the fingerprint is already known, it can be matched and the key can be
+     accepted or rejected.  If only legacy (MD5) fingerprints for the server
+     are available, the ssh-keygen(1) -E option may be used to downgrade the
+     fingerprint algorithm to match.
+
+     Because of the difficulty of comparing host keys just by looking at
+     fingerprint strings, there is also support to compare host keys visually,
+     using random art.  By setting the VisualHostKey option to M-bM-^@M-^\yesM-bM-^@M-^], a small
+     ASCII graphic gets displayed on every login to a server, no matter if the
+     session itself is interactive or not.  By learning the pattern a known
+     server produces, a user can easily find out that the host key has changed
+     when a completely different pattern is displayed.  Because these patterns
+     are not unambiguous however, a pattern that looks similar to the pattern
+     remembered only gives a good probability that the host key is the same,
+     not guaranteed proof.
+
+     To get a listing of the fingerprints along with their random art for all
+     known hosts, the following command line can be used:
+
+           $ ssh-keygen -lv -f ~/.ssh/known_hosts
+
+     If the fingerprint is unknown, an alternative method of verification is
+     available: SSH fingerprints verified by DNS.  An additional resource
+     record (RR), SSHFP, is added to a zonefile and the connecting client is
+     able to match the fingerprint with that of the key presented.
+
+     In this example, we are connecting a client to a server,
+     M-bM-^@M-^\host.example.comM-bM-^@M-^].  The SSHFP resource records should first be added to
+     the zonefile for host.example.com:
+
+           $ ssh-keygen -r host.example.com.
+
+     The output lines will have to be added to the zonefile.  To check that
+     the zone is answering fingerprint queries:
+
+           $ dig -t SSHFP host.example.com
+
+     Finally the client connects:
+
+           $ ssh -o "VerifyHostKeyDNS ask" host.example.com
+           [...]
+           Matching host key fingerprint found in DNS.
+           Are you sure you want to continue connecting (yes/no)?
+
+     See the VerifyHostKeyDNS option in ssh_config(5) for more information.
+
+SSH-BASED VIRTUAL PRIVATE NETWORKS
+     ssh contains support for Virtual Private Network (VPN) tunnelling using
+     the tun(4) network pseudo-device, allowing two networks to be joined
+     securely.  The sshd_config(5) configuration option PermitTunnel controls
+     whether the server supports this, and at what level (layer 2 or 3
+     traffic).
+
+     The following example would connect client network 10.0.50.0/24 with
+     remote network 10.0.99.0/24 using a point-to-point connection from
+     10.1.1.1 to 10.1.1.2, provided that the SSH server running on the gateway
+     to the remote network, at 192.168.1.15, allows it.
+
+     On the client:
+
+           # ssh -f -w 0:1 192.168.1.15 true
+           # ifconfig tun0 10.1.1.1 10.1.1.2 netmask 255.255.255.252
+           # route add 10.0.99.0/24 10.1.1.2
+
+     On the server:
+
+           # ifconfig tun1 10.1.1.2 10.1.1.1 netmask 255.255.255.252
+           # route add 10.0.50.0/24 10.1.1.1
+
+     Client access may be more finely tuned via the /root/.ssh/authorized_keys
+     file (see below) and the PermitRootLogin server option.  The following
+     entry would permit connections on tun(4) device 1 from user M-bM-^@M-^\janeM-bM-^@M-^] and on
+     tun device 2 from user M-bM-^@M-^\johnM-bM-^@M-^], if PermitRootLogin is set to
+     M-bM-^@M-^\forced-commands-onlyM-bM-^@M-^]:
+
+       tunnel="1",command="sh /etc/netstart tun1" ssh-rsa ... jane
+       tunnel="2",command="sh /etc/netstart tun2" ssh-rsa ... john
+
+     Since an SSH-based setup entails a fair amount of overhead, it may be
+     more suited to temporary setups, such as for wireless VPNs.  More
+     permanent VPNs are better provided by tools such as ipsecctl(8) and
+     isakmpd(8).
+
+ENVIRONMENT
+     ssh will normally set the following environment variables:
+
+     DISPLAY               The DISPLAY variable indicates the location of the
+                           X11 server.  It is automatically set by ssh to
+                           point to a value of the form M-bM-^@M-^\hostname:nM-bM-^@M-^], where
+                           M-bM-^@M-^\hostnameM-bM-^@M-^] indicates the host where the shell runs,
+                           and M-bM-^@M-^XnM-bM-^@M-^Y is an integer M-bM-^IM-% 1.  ssh uses this special
+                           value to forward X11 connections over the secure
+                           channel.  The user should normally not set DISPLAY
+                           explicitly, as that will render the X11 connection
+                           insecure (and will require the user to manually
+                           copy any required authorization cookies).
+
+     HOME                  Set to the path of the user's home directory.
+
+     LOGNAME               Synonym for USER; set for compatibility with
+                           systems that use this variable.
+
+     MAIL                  Set to the path of the user's mailbox.
+
+     PATH                  Set to the default PATH, as specified when
+                           compiling ssh.
+
+     SSH_ASKPASS           If ssh needs a passphrase, it will read the
+                           passphrase from the current terminal if it was run
+                           from a terminal.  If ssh does not have a terminal
+                           associated with it but DISPLAY and SSH_ASKPASS are
+                           set, it will execute the program specified by
+                           SSH_ASKPASS and open an X11 window to read the
+                           passphrase.  This is particularly useful when
+                           calling ssh from a .xsession or related script.
+                           (Note that on some machines it may be necessary to
+                           redirect the input from /dev/null to make this
+                           work.)
+
+     SSH_AUTH_SOCK         Identifies the path of a UNIX-domain socket used to
+                           communicate with the agent.
+
+     SSH_CONNECTION        Identifies the client and server ends of the
+                           connection.  The variable contains four space-
+                           separated values: client IP address, client port
+                           number, server IP address, and server port number.
+
+     SSH_ORIGINAL_COMMAND  This variable contains the original command line if
+                           a forced command is executed.  It can be used to
+                           extract the original arguments.
+
+     SSH_TTY               This is set to the name of the tty (path to the
+                           device) associated with the current shell or
+                           command.  If the current session has no tty, this
+                           variable is not set.
+
+     SSH_TUNNEL            Optionally set by sshd(8) to contain the interface
+                           names assigned if tunnel forwarding was requested
+                           by the client.
+
+     SSH_USER_AUTH         Optionally set by sshd(8), this variable may
+                           contain a pathname to a file that lists the
+                           authentication methods successfully used when the
+                           session was established, including any public keys
+                           that were used.
+
+     TZ                    This variable is set to indicate the present time
+                           zone if it was set when the daemon was started
+                           (i.e. the daemon passes the value on to new
+                           connections).
+
+     USER                  Set to the name of the user logging in.
+
+     Additionally, ssh reads ~/.ssh/environment, and adds lines of the format
+     M-bM-^@M-^\VARNAME=valueM-bM-^@M-^] to the environment if the file exists and users are
+     allowed to change their environment.  For more information, see the
+     PermitUserEnvironment option in sshd_config(5).
+
+FILES
+     ~/.rhosts
+             This file is used for host-based authentication (see above).  On
+             some machines this file may need to be world-readable if the
+             user's home directory is on an NFS partition, because sshd(8)
+             reads it as root.  Additionally, this file must be owned by the
+             user, and must not have write permissions for anyone else.  The
+             recommended permission for most machines is read/write for the
+             user, and not accessible by others.
+
+     ~/.shosts
+             This file is used in exactly the same way as .rhosts, but allows
+             host-based authentication without permitting login with
+             rlogin/rsh.
+
+     ~/.ssh/
+             This directory is the default location for all user-specific
+             configuration and authentication information.  There is no
+             general requirement to keep the entire contents of this directory
+             secret, but the recommended permissions are read/write/execute
+             for the user, and not accessible by others.
+
+     ~/.ssh/authorized_keys
+             Lists the public keys (DSA, ECDSA, Ed25519, RSA) that can be used
+             for logging in as this user.  The format of this file is
+             described in the sshd(8) manual page.  This file is not highly
+             sensitive, but the recommended permissions are read/write for the
+             user, and not accessible by others.
+
+     ~/.ssh/config
+             This is the per-user configuration file.  The file format and
+             configuration options are described in ssh_config(5).  Because of
+             the potential for abuse, this file must have strict permissions:
+             read/write for the user, and not writable by others.
+
+     ~/.ssh/environment
+             Contains additional definitions for environment variables; see
+             ENVIRONMENT, above.
+
+     ~/.ssh/id_dsa
+     ~/.ssh/id_ecdsa
+     ~/.ssh/id_ecdsa_sk
+     ~/.ssh/id_ed25519
+     ~/.ssh/id_ed25519_sk
+     ~/.ssh/id_rsa
+             Contains the private key for authentication.  These files contain
+             sensitive data and should be readable by the user but not
+             accessible by others (read/write/execute).  ssh will simply
+             ignore a private key file if it is accessible by others.  It is
+             possible to specify a passphrase when generating the key which
+             will be used to encrypt the sensitive part of this file using
+             AES-128.
+
+     ~/.ssh/id_dsa.pub
+     ~/.ssh/id_ecdsa.pub
+     ~/.ssh/id_ecdsa_sk.pub
+     ~/.ssh/id_ed25519.pub
+     ~/.ssh/id_ed25519_sk.pub
+     ~/.ssh/id_rsa.pub
+             Contains the public key for authentication.  These files are not
+             sensitive and can (but need not) be readable by anyone.
+
+     ~/.ssh/known_hosts
+             Contains a list of host keys for all hosts the user has logged
+             into that are not already in the systemwide list of known host
+             keys.  See sshd(8) for further details of the format of this
+             file.
+
+     ~/.ssh/rc
+             Commands in this file are executed by ssh when the user logs in,
+             just before the user's shell (or command) is started.  See the
+             sshd(8) manual page for more information.
+
+     /etc/hosts.equiv
+             This file is for host-based authentication (see above).  It
+             should only be writable by root.
+
+     /etc/shosts.equiv
+             This file is used in exactly the same way as hosts.equiv, but
+             allows host-based authentication without permitting login with
+             rlogin/rsh.
+
+     /etc/ssh/ssh_config
+             Systemwide configuration file.  The file format and configuration
+             options are described in ssh_config(5).
+
+     /etc/ssh/ssh_host_key
+     /etc/ssh/ssh_host_dsa_key
+     /etc/ssh/ssh_host_ecdsa_key
+     /etc/ssh/ssh_host_ed25519_key
+     /etc/ssh/ssh_host_rsa_key
+             These files contain the private parts of the host keys and are
+             used for host-based authentication.
+
+     /etc/ssh/ssh_known_hosts
+             Systemwide list of known host keys.  This file should be prepared
+             by the system administrator to contain the public host keys of
+             all machines in the organization.  It should be world-readable.
+             See sshd(8) for further details of the format of this file.
+
+     /etc/ssh/sshrc
+             Commands in this file are executed by ssh when the user logs in,
+             just before the user's shell (or command) is started.  See the
+             sshd(8) manual page for more information.
+
+EXIT STATUS
+     ssh exits with the exit status of the remote command or with 255 if an
+     error occurred.
+
+SEE ALSO
+     scp(1), sftp(1), ssh-add(1), ssh-agent(1), ssh-keygen(1), ssh-keyscan(1),
+     tun(4), ssh_config(5), ssh-keysign(8), sshd(8)
+
+STANDARDS
+     S. Lehtinen and C. Lonvick, The Secure Shell (SSH) Protocol Assigned
+     Numbers, RFC 4250, January 2006.
+
+     T. Ylonen and C. Lonvick, The Secure Shell (SSH) Protocol Architecture,
+     RFC 4251, January 2006.
+
+     T. Ylonen and C. Lonvick, The Secure Shell (SSH) Authentication Protocol,
+     RFC 4252, January 2006.
+
+     T. Ylonen and C. Lonvick, The Secure Shell (SSH) Transport Layer
+     Protocol, RFC 4253, January 2006.
+
+     T. Ylonen and C. Lonvick, The Secure Shell (SSH) Connection Protocol, RFC
+     4254, January 2006.
+
+     J. Schlyter and W. Griffin, Using DNS to Securely Publish Secure Shell
+     (SSH) Key Fingerprints, RFC 4255, January 2006.
+
+     F. Cusack and M. Forssen, Generic Message Exchange Authentication for the
+     Secure Shell Protocol (SSH), RFC 4256, January 2006.
+
+     J. Galbraith and P. Remaker, The Secure Shell (SSH) Session Channel Break
+     Extension, RFC 4335, January 2006.
+
+     M. Bellare, T. Kohno, and C. Namprempre, The Secure Shell (SSH) Transport
+     Layer Encryption Modes, RFC 4344, January 2006.
+
+     B. Harris, Improved Arcfour Modes for the Secure Shell (SSH) Transport
+     Layer Protocol, RFC 4345, January 2006.
+
+     M. Friedl, N. Provos, and W. Simpson, Diffie-Hellman Group Exchange for
+     the Secure Shell (SSH) Transport Layer Protocol, RFC 4419, March 2006.
+
+     J. Galbraith and R. Thayer, The Secure Shell (SSH) Public Key File
+     Format, RFC 4716, November 2006.
+
+     D. Stebila and J. Green, Elliptic Curve Algorithm Integration in the
+     Secure Shell Transport Layer, RFC 5656, December 2009.
+
+     A. Perrig and D. Song, Hash Visualization: a New Technique to improve
+     Real-World Security, 1999, International Workshop on Cryptographic
+     Techniques and E-Commerce (CrypTEC '99).
+
+AUTHORS
+     OpenSSH is a derivative of the original and free ssh 1.2.12 release by
+     Tatu Ylonen.  Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo
+     de Raadt and Dug Song removed many bugs, re-added newer features and
+     created OpenSSH.  Markus Friedl contributed the support for SSH protocol
+     versions 1.5 and 2.0.
+
+OpenBSD 6.6                    February 7, 2020                    OpenBSD 6.6
diff --git a/ssh_config.0 b/ssh_config.0
new file mode 100644
index 000000000..692e5f6d5
--- /dev/null
+++ b/ssh_config.0
@@ -0,0 +1,1170 @@
+SSH_CONFIG(5)                 File Formats Manual                SSH_CONFIG(5)
+
+NAME
+     ssh_config M-bM-^@M-^S OpenSSH client configuration file
+
+DESCRIPTION
+     ssh(1) obtains configuration data from the following sources in the
+     following order:
+
+           1.   command-line options
+           2.   user's configuration file (~/.ssh/config)
+           3.   system-wide configuration file (/etc/ssh/ssh_config)
+
+     For each parameter, the first obtained value will be used.  The
+     configuration files contain sections separated by Host specifications,
+     and that section is only applied for hosts that match one of the patterns
+     given in the specification.  The matched host name is usually the one
+     given on the command line (see the CanonicalizeHostname option for
+     exceptions).
+
+     Since the first obtained value for each parameter is used, more host-
+     specific declarations should be given near the beginning of the file, and
+     general defaults at the end.
+
+     The file contains keyword-argument pairs, one per line.  Lines starting
+     with M-bM-^@M-^X#M-bM-^@M-^Y and empty lines are interpreted as comments.  Arguments may
+     optionally be enclosed in double quotes (") in order to represent
+     arguments containing spaces.  Configuration options may be separated by
+     whitespace or optional whitespace and exactly one M-bM-^@M-^X=M-bM-^@M-^Y; the latter format
+     is useful to avoid the need to quote whitespace when specifying
+     configuration options using the ssh, scp, and sftp -o option.
+
+     The possible keywords and their meanings are as follows (note that
+     keywords are case-insensitive and arguments are case-sensitive):
+
+     Host    Restricts the following declarations (up to the next Host or
+             Match keyword) to be only for those hosts that match one of the
+             patterns given after the keyword.  If more than one pattern is
+             provided, they should be separated by whitespace.  A single M-bM-^@M-^X*M-bM-^@M-^Y
+             as a pattern can be used to provide global defaults for all
+             hosts.  The host is usually the hostname argument given on the
+             command line (see the CanonicalizeHostname keyword for
+             exceptions).
+
+             A pattern entry may be negated by prefixing it with an
+             exclamation mark (M-bM-^@M-^X!M-bM-^@M-^Y).  If a negated entry is matched, then the
+             Host entry is ignored, regardless of whether any other patterns
+             on the line match.  Negated matches are therefore useful to
+             provide exceptions for wildcard matches.
+
+             See PATTERNS for more information on patterns.
+
+     Match   Restricts the following declarations (up to the next Host or
+             Match keyword) to be used only when the conditions following the
+             Match keyword are satisfied.  Match conditions are specified
+             using one or more criteria or the single token all which always
+             matches.  The available criteria keywords are: canonical, final,
+             exec, host, originalhost, user, and localuser.  The all criteria
+             must appear alone or immediately after canonical or final.  Other
+             criteria may be combined arbitrarily.  All criteria but all,
+             canonical, and final require an argument.  Criteria may be
+             negated by prepending an exclamation mark (M-bM-^@M-^X!M-bM-^@M-^Y).
+
+             The canonical keyword matches only when the configuration file is
+             being re-parsed after hostname canonicalization (see the
+             CanonicalizeHostname option).  This may be useful to specify
+             conditions that work with canonical host names only.
+
+             The final keyword requests that the configuration be re-parsed
+             (regardless of whether CanonicalizeHostname is enabled), and
+             matches only during this final pass.  If CanonicalizeHostname is
+             enabled, then canonical and final match during the same pass.
+
+             The exec keyword executes the specified command under the user's
+             shell.  If the command returns a zero exit status then the
+             condition is considered true.  Commands containing whitespace
+             characters must be quoted.  Arguments to exec accept the tokens
+             described in the TOKENS section.
+
+             The other keywords' criteria must be single entries or comma-
+             separated lists and may use the wildcard and negation operators
+             described in the PATTERNS section.  The criteria for the host
+             keyword are matched against the target hostname, after any
+             substitution by the Hostname or CanonicalizeHostname options.
+             The originalhost keyword matches against the hostname as it was
+             specified on the command-line.  The user keyword matches against
+             the target username on the remote host.  The localuser keyword
+             matches against the name of the local user running ssh(1) (this
+             keyword may be useful in system-wide ssh_config files).
+
+     AddKeysToAgent
+             Specifies whether keys should be automatically added to a running
+             ssh-agent(1).  If this option is set to yes and a key is loaded
+             from a file, the key and its passphrase are added to the agent
+             with the default lifetime, as if by ssh-add(1).  If this option
+             is set to ask, ssh(1) will require confirmation using the
+             SSH_ASKPASS program before adding a key (see ssh-add(1) for
+             details).  If this option is set to confirm, each use of the key
+             must be confirmed, as if the -c option was specified to
+             ssh-add(1).  If this option is set to no, no keys are added to
+             the agent.  The argument must be yes, confirm, ask, or no (the
+             default).
+
+     AddressFamily
+             Specifies which address family to use when connecting.  Valid
+             arguments are any (the default), inet (use IPv4 only), or inet6
+             (use IPv6 only).
+
+     BatchMode
+             If set to yes, user interaction such as password prompts and host
+             key confirmation requests will be disabled.  This option is
+             useful in scripts and other batch jobs where no user is present
+             to interact with ssh(1).  The argument must be yes or no (the
+             default).
+
+     BindAddress
+             Use the specified address on the local machine as the source
+             address of the connection.  Only useful on systems with more than
+             one address.
+
+     BindInterface
+             Use the address of the specified interface on the local machine
+             as the source address of the connection.
+
+     CanonicalDomains
+             When CanonicalizeHostname is enabled, this option specifies the
+             list of domain suffixes in which to search for the specified
+             destination host.
+
+     CanonicalizeFallbackLocal
+             Specifies whether to fail with an error when hostname
+             canonicalization fails.  The default, yes, will attempt to look
+             up the unqualified hostname using the system resolver's search
+             rules.  A value of no will cause ssh(1) to fail instantly if
+             CanonicalizeHostname is enabled and the target hostname cannot be
+             found in any of the domains specified by CanonicalDomains.
+
+     CanonicalizeHostname
+             Controls whether explicit hostname canonicalization is performed.
+             The default, no, is not to perform any name rewriting and let the
+             system resolver handle all hostname lookups.  If set to yes then,
+             for connections that do not use a ProxyCommand or ProxyJump,
+             ssh(1) will attempt to canonicalize the hostname specified on the
+             command line using the CanonicalDomains suffixes and
+             CanonicalizePermittedCNAMEs rules.  If CanonicalizeHostname is
+             set to always, then canonicalization is applied to proxied
+             connections too.
+
+             If this option is enabled, then the configuration files are
+             processed again using the new target name to pick up any new
+             configuration in matching Host and Match stanzas.
+
+     CanonicalizeMaxDots
+             Specifies the maximum number of dot characters in a hostname
+             before canonicalization is disabled.  The default, 1, allows a
+             single dot (i.e. hostname.subdomain).
+
+     CanonicalizePermittedCNAMEs
+             Specifies rules to determine whether CNAMEs should be followed
+             when canonicalizing hostnames.  The rules consist of one or more
+             arguments of source_domain_list:target_domain_list, where
+             source_domain_list is a pattern-list of domains that may follow
+             CNAMEs in canonicalization, and target_domain_list is a pattern-
+             list of domains that they may resolve to.
+
+             For example, "*.a.example.com:*.b.example.com,*.c.example.com"
+             will allow hostnames matching "*.a.example.com" to be
+             canonicalized to names in the "*.b.example.com" or
+             "*.c.example.com" domains.
+
+     CASignatureAlgorithms
+             Specifies which algorithms are allowed for signing of
+             certificates by certificate authorities (CAs).  The default is:
+
+                   ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
+                   ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa
+
+             ssh(1) will not accept host certificates signed using algorithms
+             other than those specified.
+
+     CertificateFile
+             Specifies a file from which the user's certificate is read.  A
+             corresponding private key must be provided separately in order to
+             use this certificate either from an IdentityFile directive or -i
+             flag to ssh(1), via ssh-agent(1), or via a PKCS11Provider or
+             SecurityKeyProvider.
+
+             Arguments to CertificateFile may use the tilde syntax to refer to
+             a user's home directory or the tokens described in the TOKENS
+             section.
+
+             It is possible to have multiple certificate files specified in
+             configuration files; these certificates will be tried in
+             sequence.  Multiple CertificateFile directives will add to the
+             list of certificates used for authentication.
+
+     ChallengeResponseAuthentication
+             Specifies whether to use challenge-response authentication.  The
+             argument to this keyword must be yes (the default) or no.
+
+     CheckHostIP
+             If set to yes (the default), ssh(1) will additionally check the
+             host IP address in the known_hosts file.  This allows it to
+             detect if a host key changed due to DNS spoofing and will add
+             addresses of destination hosts to ~/.ssh/known_hosts in the
+             process, regardless of the setting of StrictHostKeyChecking.  If
+             the option is set to no, the check will not be executed.
+
+     Ciphers
+             Specifies the ciphers allowed and their order of preference.
+             Multiple ciphers must be comma-separated.  If the specified list
+             begins with a M-bM-^@M-^X+M-bM-^@M-^Y character, then the specified ciphers will be
+             appended to the default set instead of replacing them.  If the
+             specified list begins with a M-bM-^@M-^X-M-bM-^@M-^Y character, then the specified
+             ciphers (including wildcards) will be removed from the default
+             set instead of replacing them.  If the specified list begins with
+             a M-bM-^@M-^X^M-bM-^@M-^Y character, then the specified ciphers will be placed at the
+             head of the default set.
+
+             The supported ciphers are:
+
+                   3des-cbc
+                   aes128-cbc
+                   aes192-cbc
+                   aes256-cbc
+                   aes128-ctr
+                   aes192-ctr
+                   aes256-ctr
+                   aes128-gcm@openssh.com
+                   aes256-gcm@openssh.com
+                   chacha20-poly1305@openssh.com
+
+             The default is:
+
+                   chacha20-poly1305@openssh.com,
+                   aes128-ctr,aes192-ctr,aes256-ctr,
+                   aes128-gcm@openssh.com,aes256-gcm@openssh.com
+
+             The list of available ciphers may also be obtained using "ssh -Q
+             cipher".
+
+     ClearAllForwardings
+             Specifies that all local, remote, and dynamic port forwardings
+             specified in the configuration files or on the command line be
+             cleared.  This option is primarily useful when used from the
+             ssh(1) command line to clear port forwardings set in
+             configuration files, and is automatically set by scp(1) and
+             sftp(1).  The argument must be yes or no (the default).
+
+     Compression
+             Specifies whether to use compression.  The argument must be yes
+             or no (the default).
+
+     ConnectionAttempts
+             Specifies the number of tries (one per second) to make before
+             exiting.  The argument must be an integer.  This may be useful in
+             scripts if the connection sometimes fails.  The default is 1.
+
+     ConnectTimeout
+             Specifies the timeout (in seconds) used when connecting to the
+             SSH server, instead of using the default system TCP timeout.
+             This timeout is applied both to establishing the connection and
+             to performing the initial SSH protocol handshake and key
+             exchange.
+
+     ControlMaster
+             Enables the sharing of multiple sessions over a single network
+             connection.  When set to yes, ssh(1) will listen for connections
+             on a control socket specified using the ControlPath argument.
+             Additional sessions can connect to this socket using the same
+             ControlPath with ControlMaster set to no (the default).  These
+             sessions will try to reuse the master instance's network
+             connection rather than initiating new ones, but will fall back to
+             connecting normally if the control socket does not exist, or is
+             not listening.
+
+             Setting this to ask will cause ssh(1) to listen for control
+             connections, but require confirmation using ssh-askpass(1).  If
+             the ControlPath cannot be opened, ssh(1) will continue without
+             connecting to a master instance.
+
+             X11 and ssh-agent(1) forwarding is supported over these
+             multiplexed connections, however the display and agent forwarded
+             will be the one belonging to the master connection i.e. it is not
+             possible to forward multiple displays or agents.
+
+             Two additional options allow for opportunistic multiplexing: try
+             to use a master connection but fall back to creating a new one if
+             one does not already exist.  These options are: auto and autoask.
+             The latter requires confirmation like the ask option.
+
+     ControlPath
+             Specify the path to the control socket used for connection
+             sharing as described in the ControlMaster section above or the
+             string none to disable connection sharing.  Arguments to
+             ControlPath may use the tilde syntax to refer to a user's home
+             directory or the tokens described in the TOKENS section.  It is
+             recommended that any ControlPath used for opportunistic
+             connection sharing include at least %h, %p, and %r (or
+             alternatively %C) and be placed in a directory that is not
+             writable by other users.  This ensures that shared connections
+             are uniquely identified.
+
+     ControlPersist
+             When used in conjunction with ControlMaster, specifies that the
+             master connection should remain open in the background (waiting
+             for future client connections) after the initial client
+             connection has been closed.  If set to no (the default), then the
+             master connection will not be placed into the background, and
+             will close as soon as the initial client connection is closed.
+             If set to yes or 0, then the master connection will remain in the
+             background indefinitely (until killed or closed via a mechanism
+             such as the "ssh -O exit").  If set to a time in seconds, or a
+             time in any of the formats documented in sshd_config(5), then the
+             backgrounded master connection will automatically terminate after
+             it has remained idle (with no client connections) for the
+             specified time.
+
+     DynamicForward
+             Specifies that a TCP port on the local machine be forwarded over
+             the secure channel, and the application protocol is then used to
+             determine where to connect to from the remote machine.
+
+             The argument must be [bind_address:]port.  IPv6 addresses can be
+             specified by enclosing addresses in square brackets.  By default,
+             the local port is bound in accordance with the GatewayPorts
+             setting.  However, an explicit bind_address may be used to bind
+             the connection to a specific address.  The bind_address of
+             localhost indicates that the listening port be bound for local
+             use only, while an empty address or M-bM-^@M-^X*M-bM-^@M-^Y indicates that the port
+             should be available from all interfaces.
+
+             Currently the SOCKS4 and SOCKS5 protocols are supported, and
+             ssh(1) will act as a SOCKS server.  Multiple forwardings may be
+             specified, and additional forwardings can be given on the command
+             line.  Only the superuser can forward privileged ports.
+
+     EnableSSHKeysign
+             Setting this option to yes in the global client configuration
+             file /etc/ssh/ssh_config enables the use of the helper program
+             ssh-keysign(8) during HostbasedAuthentication.  The argument must
+             be yes or no (the default).  This option should be placed in the
+             non-hostspecific section.  See ssh-keysign(8) for more
+             information.
+
+     EscapeChar
+             Sets the escape character (default: M-bM-^@M-^X~M-bM-^@M-^Y).  The escape character
+             can also be set on the command line.  The argument should be a
+             single character, M-bM-^@M-^X^M-bM-^@M-^Y followed by a letter, or none to disable
+             the escape character entirely (making the connection transparent
+             for binary data).
+
+     ExitOnForwardFailure
+             Specifies whether ssh(1) should terminate the connection if it
+             cannot set up all requested dynamic, tunnel, local, and remote
+             port forwardings, (e.g. if either end is unable to bind and
+             listen on a specified port).  Note that ExitOnForwardFailure does
+             not apply to connections made over port forwardings and will not,
+             for example, cause ssh(1) to exit if TCP connections to the
+             ultimate forwarding destination fail.  The argument must be yes
+             or no (the default).
+
+     FingerprintHash
+             Specifies the hash algorithm used when displaying key
+             fingerprints.  Valid options are: md5 and sha256 (the default).
+
+     ForwardAgent
+             Specifies whether the connection to the authentication agent (if
+             any) will be forwarded to the remote machine.  The argument may
+             be yes, no (the default), an explicit path to an agent socket or
+             the name of an environment variable (beginning with M-bM-^@M-^X$M-bM-^@M-^Y) in which
+             to find the path.
+
+             Agent forwarding should be enabled with caution.  Users with the
+             ability to bypass file permissions on the remote host (for the
+             agent's Unix-domain socket) can access the local agent through
+             the forwarded connection.  An attacker cannot obtain key material
+             from the agent, however they can perform operations on the keys
+             that enable them to authenticate using the identities loaded into
+             the agent.
+
+     ForwardX11
+             Specifies whether X11 connections will be automatically
+             redirected over the secure channel and DISPLAY set.  The argument
+             must be yes or no (the default).
+
+             X11 forwarding should be enabled with caution.  Users with the
+             ability to bypass file permissions on the remote host (for the
+             user's X11 authorization database) can access the local X11
+             display through the forwarded connection.  An attacker may then
+             be able to perform activities such as keystroke monitoring if the
+             ForwardX11Trusted option is also enabled.
+
+     ForwardX11Timeout
+             Specify a timeout for untrusted X11 forwarding using the format
+             described in the TIME FORMATS section of sshd_config(5).  X11
+             connections received by ssh(1) after this time will be refused.
+             Setting ForwardX11Timeout to zero will disable the timeout and
+             permit X11 forwarding for the life of the connection.  The
+             default is to disable untrusted X11 forwarding after twenty
+             minutes has elapsed.
+
+     ForwardX11Trusted
+             If this option is set to yes, remote X11 clients will have full
+             access to the original X11 display.
+
+             If this option is set to no (the default), remote X11 clients
+             will be considered untrusted and prevented from stealing or
+             tampering with data belonging to trusted X11 clients.
+             Furthermore, the xauth(1) token used for the session will be set
+             to expire after 20 minutes.  Remote clients will be refused
+             access after this time.
+
+             See the X11 SECURITY extension specification for full details on
+             the restrictions imposed on untrusted clients.
+
+     GatewayPorts
+             Specifies whether remote hosts are allowed to connect to local
+             forwarded ports.  By default, ssh(1) binds local port forwardings
+             to the loopback address.  This prevents other remote hosts from
+             connecting to forwarded ports.  GatewayPorts can be used to
+             specify that ssh should bind local port forwardings to the
+             wildcard address, thus allowing remote hosts to connect to
+             forwarded ports.  The argument must be yes or no (the default).
+
+     GlobalKnownHostsFile
+             Specifies one or more files to use for the global host key
+             database, separated by whitespace.  The default is
+             /etc/ssh/ssh_known_hosts, /etc/ssh/ssh_known_hosts2.
+
+     GSSAPIAuthentication
+             Specifies whether user authentication based on GSSAPI is allowed.
+             The default is no.
+
+     GSSAPIDelegateCredentials
+             Forward (delegate) credentials to the server.  The default is no.
+
+     HashKnownHosts
+             Indicates that ssh(1) should hash host names and addresses when
+             they are added to ~/.ssh/known_hosts.  These hashed names may be
+             used normally by ssh(1) and sshd(8), but they do not visually
+             reveal identifying information if the file's contents are
+             disclosed.  The default is no.  Note that existing names and
+             addresses in known hosts files will not be converted
+             automatically, but may be manually hashed using ssh-keygen(1).
+
+     HostbasedAuthentication
+             Specifies whether to try rhosts based authentication with public
+             key authentication.  The argument must be yes or no (the
+             default).
+
+     HostbasedKeyTypes
+             Specifies the key types that will be used for hostbased
+             authentication as a comma-separated list of patterns.
+             Alternately if the specified list begins with a M-bM-^@M-^X+M-bM-^@M-^Y character,
+             then the specified key types will be appended to the default set
+             instead of replacing them.  If the specified list begins with a
+             M-bM-^@M-^X-M-bM-^@M-^Y character, then the specified key types (including wildcards)
+             will be removed from the default set instead of replacing them.
+             If the specified list begins with a M-bM-^@M-^X^M-bM-^@M-^Y character, then the
+             specified key types will be placed at the head of the default
+             set.  The default for this option is:
+
+                ecdsa-sha2-nistp256-cert-v01@openssh.com,
+                ecdsa-sha2-nistp384-cert-v01@openssh.com,
+                ecdsa-sha2-nistp521-cert-v01@openssh.com,
+                sk-ecdsa-sha2-nistp256-cert-v01@openssh.com,
+                ssh-ed25519-cert-v01@openssh.com,
+                sk-ssh-ed25519-cert-v01@openssh.com,
+                rsa-sha2-512-cert-v01@openssh.com,
+                rsa-sha2-256-cert-v01@openssh.com,
+                ssh-rsa-cert-v01@openssh.com,
+                ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
+                sk-ecdsa-sha2-nistp256@openssh.com,
+                ssh-ed25519,sk-ssh-ed25519@openssh.com,
+                rsa-sha2-512,rsa-sha2-256,ssh-rsa
+
+             The -Q option of ssh(1) may be used to list supported key types.
+
+     HostKeyAlgorithms
+             Specifies the host key algorithms that the client wants to use in
+             order of preference.  Alternately if the specified list begins
+             with a M-bM-^@M-^X+M-bM-^@M-^Y character, then the specified key types will be
+             appended to the default set instead of replacing them.  If the
+             specified list begins with a M-bM-^@M-^X-M-bM-^@M-^Y character, then the specified
+             key types (including wildcards) will be removed from the default
+             set instead of replacing them.  If the specified list begins with
+             a M-bM-^@M-^X^M-bM-^@M-^Y character, then the specified key types will be placed at
+             the head of the default set.  The default for this option is:
+
+                ecdsa-sha2-nistp256-cert-v01@openssh.com,
+                ecdsa-sha2-nistp384-cert-v01@openssh.com,
+                ecdsa-sha2-nistp521-cert-v01@openssh.com,
+                sk-ecdsa-sha2-nistp256-cert-v01@openssh.com,
+                ssh-ed25519-cert-v01@openssh.com,
+                sk-ssh-ed25519-cert-v01@openssh.com,
+                rsa-sha2-512-cert-v01@openssh.com,
+                rsa-sha2-256-cert-v01@openssh.com,
+                ssh-rsa-cert-v01@openssh.com,
+                ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
+                sk-ecdsa-sha2-nistp256@openssh.com,
+                ssh-ed25519,sk-ssh-ed25519@openssh.com,
+                rsa-sha2-512,rsa-sha2-256,ssh-rsa
+
+             If hostkeys are known for the destination host then this default
+             is modified to prefer their algorithms.
+
+             The list of available key types may also be obtained using "ssh
+             -Q HostKeyAlgorithms".
+
+     HostKeyAlias
+             Specifies an alias that should be used instead of the real host
+             name when looking up or saving the host key in the host key
+             database files and when validating host certificates.  This
+             option is useful for tunneling SSH connections or for multiple
+             servers running on a single host.
+
+     Hostname
+             Specifies the real host name to log into.  This can be used to
+             specify nicknames or abbreviations for hosts.  Arguments to
+             Hostname accept the tokens described in the TOKENS section.
+             Numeric IP addresses are also permitted (both on the command line
+             and in Hostname specifications).  The default is the name given
+             on the command line.
+
+     IdentitiesOnly
+             Specifies that ssh(1) should only use the configured
+             authentication identity and certificate files (either the default
+             files, or those explicitly configured in the ssh_config files or
+             passed on the ssh(1) command-line), even if ssh-agent(1) or a
+             PKCS11Provider or SecurityKeyProvider offers more identities.
+             The argument to this keyword must be yes or no (the default).
+             This option is intended for situations where ssh-agent offers
+             many different identities.
+
+     IdentityAgent
+             Specifies the UNIX-domain socket used to communicate with the
+             authentication agent.
+
+             This option overrides the SSH_AUTH_SOCK environment variable and
+             can be used to select a specific agent.  Setting the socket name
+             to none disables the use of an authentication agent.  If the
+             string "SSH_AUTH_SOCK" is specified, the location of the socket
+             will be read from the SSH_AUTH_SOCK environment variable.
+             Otherwise if the specified value begins with a M-bM-^@M-^X$M-bM-^@M-^Y character,
+             then it will be treated as an environment variable containing the
+             location of the socket.
+
+             Arguments to IdentityAgent may use the tilde syntax to refer to a
+             user's home directory or the tokens described in the TOKENS
+             section.
+
+     IdentityFile
+             Specifies a file from which the user's DSA, ECDSA, authenticator-
+             hosted ECDSA, Ed25519, authenticator-hosted Ed25519 or RSA
+             authentication identity is read.  The default is ~/.ssh/id_dsa,
+             ~/.ssh/id_ecdsa, ~/.ssh/id_ecdsa_sk, ~/.ssh/id_ed25519,
+             ~/.ssh/id_ed25519_sk and ~/.ssh/id_rsa.  Additionally, any
+             identities represented by the authentication agent will be used
+             for authentication unless IdentitiesOnly is set.  If no
+             certificates have been explicitly specified by CertificateFile,
+             ssh(1) will try to load certificate information from the filename
+             obtained by appending -cert.pub to the path of a specified
+             IdentityFile.
+
+             Arguments to IdentityFile may use the tilde syntax to refer to a
+             user's home directory or the tokens described in the TOKENS
+             section.
+
+             It is possible to have multiple identity files specified in
+             configuration files; all these identities will be tried in
+             sequence.  Multiple IdentityFile directives will add to the list
+             of identities tried (this behaviour differs from that of other
+             configuration directives).
+
+             IdentityFile may be used in conjunction with IdentitiesOnly to
+             select which identities in an agent are offered during
+             authentication.  IdentityFile may also be used in conjunction
+             with CertificateFile in order to provide any certificate also
+             needed for authentication with the identity.
+
+     IgnoreUnknown
+             Specifies a pattern-list of unknown options to be ignored if they
+             are encountered in configuration parsing.  This may be used to
+             suppress errors if ssh_config contains options that are
+             unrecognised by ssh(1).  It is recommended that IgnoreUnknown be
+             listed early in the configuration file as it will not be applied
+             to unknown options that appear before it.
+
+     Include
+             Include the specified configuration file(s).  Multiple pathnames
+             may be specified and each pathname may contain glob(7) wildcards
+             and, for user configurations, shell-like M-bM-^@M-^X~M-bM-^@M-^Y references to user
+             home directories.  Files without absolute paths are assumed to be
+             in ~/.ssh if included in a user configuration file or /etc/ssh if
+             included from the system configuration file.  Include directive
+             may appear inside a Match or Host block to perform conditional
+             inclusion.
+
+     IPQoS   Specifies the IPv4 type-of-service or DSCP class for connections.
+             Accepted values are af11, af12, af13, af21, af22, af23, af31,
+             af32, af33, af41, af42, af43, cs0, cs1, cs2, cs3, cs4, cs5, cs6,
+             cs7, ef, le, lowdelay, throughput, reliability, a numeric value,
+             or none to use the operating system default.  This option may
+             take one or two arguments, separated by whitespace.  If one
+             argument is specified, it is used as the packet class
+             unconditionally.  If two values are specified, the first is
+             automatically selected for interactive sessions and the second
+             for non-interactive sessions.  The default is af21 (Low-Latency
+             Data) for interactive sessions and cs1 (Lower Effort) for non-
+             interactive sessions.
+
+     KbdInteractiveAuthentication
+             Specifies whether to use keyboard-interactive authentication.
+             The argument to this keyword must be yes (the default) or no.
+
+     KbdInteractiveDevices
+             Specifies the list of methods to use in keyboard-interactive
+             authentication.  Multiple method names must be comma-separated.
+             The default is to use the server specified list.  The methods
+             available vary depending on what the server supports.  For an
+             OpenSSH server, it may be zero or more of: bsdauth and pam.
+
+     KexAlgorithms
+             Specifies the available KEX (Key Exchange) algorithms.  Multiple
+             algorithms must be comma-separated.  If the specified list begins
+             with a M-bM-^@M-^X+M-bM-^@M-^Y character, then the specified methods will be appended
+             to the default set instead of replacing them.  If the specified
+             list begins with a M-bM-^@M-^X-M-bM-^@M-^Y character, then the specified methods
+             (including wildcards) will be removed from the default set
+             instead of replacing them.  If the specified list begins with a
+             M-bM-^@M-^X^M-bM-^@M-^Y character, then the specified methods will be placed at the
+             head of the default set.  The default is:
+
+                   curve25519-sha256,curve25519-sha256@libssh.org,
+                   ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
+                   diffie-hellman-group-exchange-sha256,
+                   diffie-hellman-group16-sha512,
+                   diffie-hellman-group18-sha512,
+                   diffie-hellman-group14-sha256
+
+             The list of available key exchange algorithms may also be
+             obtained using "ssh -Q kex".
+
+     LocalCommand
+             Specifies a command to execute on the local machine after
+             successfully connecting to the server.  The command string
+             extends to the end of the line, and is executed with the user's
+             shell.  Arguments to LocalCommand accept the tokens described in
+             the TOKENS section.
+
+             The command is run synchronously and does not have access to the
+             session of the ssh(1) that spawned it.  It should not be used for
+             interactive commands.
+
+             This directive is ignored unless PermitLocalCommand has been
+             enabled.
+
+     LocalForward
+             Specifies that a TCP port on the local machine be forwarded over
+             the secure channel to the specified host and port from the remote
+             machine.  The first argument must be [bind_address:]port and the
+             second argument must be host:hostport.  IPv6 addresses can be
+             specified by enclosing addresses in square brackets.  Multiple
+             forwardings may be specified, and additional forwardings can be
+             given on the command line.  Only the superuser can forward
+             privileged ports.  By default, the local port is bound in
+             accordance with the GatewayPorts setting.  However, an explicit
+             bind_address may be used to bind the connection to a specific
+             address.  The bind_address of localhost indicates that the
+             listening port be bound for local use only, while an empty
+             address or M-bM-^@M-^X*M-bM-^@M-^Y indicates that the port should be available from
+             all interfaces.
+
+     LogLevel
+             Gives the verbosity level that is used when logging messages from
+             ssh(1).  The possible values are: QUIET, FATAL, ERROR, INFO,
+             VERBOSE, DEBUG, DEBUG1, DEBUG2, and DEBUG3.  The default is INFO.
+             DEBUG and DEBUG1 are equivalent.  DEBUG2 and DEBUG3 each specify
+             higher levels of verbose output.
+
+     MACs    Specifies the MAC (message authentication code) algorithms in
+             order of preference.  The MAC algorithm is used for data
+             integrity protection.  Multiple algorithms must be comma-
+             separated.  If the specified list begins with a M-bM-^@M-^X+M-bM-^@M-^Y character,
+             then the specified algorithms will be appended to the default set
+             instead of replacing them.  If the specified list begins with a
+             M-bM-^@M-^X-M-bM-^@M-^Y character, then the specified algorithms (including
+             wildcards) will be removed from the default set instead of
+             replacing them.  If the specified list begins with a M-bM-^@M-^X^M-bM-^@M-^Y
+             character, then the specified algorithms will be placed at the
+             head of the default set.
+
+             The algorithms that contain "-etm" calculate the MAC after
+             encryption (encrypt-then-mac).  These are considered safer and
+             their use recommended.
+
+             The default is:
+
+                   umac-64-etm@openssh.com,umac-128-etm@openssh.com,
+                   hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,
+                   hmac-sha1-etm@openssh.com,
+                   umac-64@openssh.com,umac-128@openssh.com,
+                   hmac-sha2-256,hmac-sha2-512,hmac-sha1
+
+             The list of available MAC algorithms may also be obtained using
+             "ssh -Q mac".
+
+     NoHostAuthenticationForLocalhost
+             Disable host authentication for localhost (loopback addresses).
+             The argument to this keyword must be yes or no (the default).
+
+     NumberOfPasswordPrompts
+             Specifies the number of password prompts before giving up.  The
+             argument to this keyword must be an integer.  The default is 3.
+
+     PasswordAuthentication
+             Specifies whether to use password authentication.  The argument
+             to this keyword must be yes (the default) or no.
+
+     PermitLocalCommand
+             Allow local command execution via the LocalCommand option or
+             using the !command escape sequence in ssh(1).  The argument must
+             be yes or no (the default).
+
+     PKCS11Provider
+             Specifies which PKCS#11 provider to use or none to indicate that
+             no provider should be used (the default).  The argument to this
+             keyword is a path to the PKCS#11 shared library ssh(1) should use
+             to communicate with a PKCS#11 token providing keys for user
+             authentication.
+
+     Port    Specifies the port number to connect on the remote host.  The
+             default is 22.
+
+     PreferredAuthentications
+             Specifies the order in which the client should try authentication
+             methods.  This allows a client to prefer one method (e.g.
+             keyboard-interactive) over another method (e.g. password).  The
+             default is:
+
+                   gssapi-with-mic,hostbased,publickey,
+                   keyboard-interactive,password
+
+     ProxyCommand
+             Specifies the command to use to connect to the server.  The
+             command string extends to the end of the line, and is executed
+             using the user's shell M-bM-^@M-^XexecM-bM-^@M-^Y directive to avoid a lingering
+             shell process.
+
+             Arguments to ProxyCommand accept the tokens described in the
+             TOKENS section.  The command can be basically anything, and
+             should read from its standard input and write to its standard
+             output.  It should eventually connect an sshd(8) server running
+             on some machine, or execute sshd -i somewhere.  Host key
+             management will be done using the Hostname of the host being
+             connected (defaulting to the name typed by the user).  Setting
+             the command to none disables this option entirely.  Note that
+             CheckHostIP is not available for connects with a proxy command.
+
+             This directive is useful in conjunction with nc(1) and its proxy
+             support.  For example, the following directive would connect via
+             an HTTP proxy at 192.0.2.0:
+
+                ProxyCommand /usr/bin/nc -X connect -x 192.0.2.0:8080 %h %p
+
+     ProxyJump
+             Specifies one or more jump proxies as either [user@]host[:port]
+             or an ssh URI.  Multiple proxies may be separated by comma
+             characters and will be visited sequentially.  Setting this option
+             will cause ssh(1) to connect to the target host by first making a
+             ssh(1) connection to the specified ProxyJump host and then
+             establishing a TCP forwarding to the ultimate target from there.
+
+             Note that this option will compete with the ProxyCommand option -
+             whichever is specified first will prevent later instances of the
+             other from taking effect.
+
+             Note also that the configuration for the destination host (either
+             supplied via the command-line or the configuration file) is not
+             generally applied to jump hosts.  ~/.ssh/config should be used if
+             specific configuration is required for jump hosts.
+
+     ProxyUseFdpass
+             Specifies that ProxyCommand will pass a connected file descriptor
+             back to ssh(1) instead of continuing to execute and pass data.
+             The default is no.
+
+     PubkeyAcceptedKeyTypes
+             Specifies the key types that will be used for public key
+             authentication as a comma-separated list of patterns.  If the
+             specified list begins with a M-bM-^@M-^X+M-bM-^@M-^Y character, then the key types
+             after it will be appended to the default instead of replacing it.
+             If the specified list begins with a M-bM-^@M-^X-M-bM-^@M-^Y character, then the
+             specified key types (including wildcards) will be removed from
+             the default set instead of replacing them.  If the specified list
+             begins with a M-bM-^@M-^X^M-bM-^@M-^Y character, then the specified key types will be
+             placed at the head of the default set.  The default for this
+             option is:
+
+                ecdsa-sha2-nistp256-cert-v01@openssh.com,
+                ecdsa-sha2-nistp384-cert-v01@openssh.com,
+                ecdsa-sha2-nistp521-cert-v01@openssh.com,
+                sk-ecdsa-sha2-nistp256-cert-v01@openssh.com,
+                ssh-ed25519-cert-v01@openssh.com,
+                sk-ssh-ed25519-cert-v01@openssh.com,
+                rsa-sha2-512-cert-v01@openssh.com,
+                rsa-sha2-256-cert-v01@openssh.com,
+                ssh-rsa-cert-v01@openssh.com,
+                ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
+                sk-ecdsa-sha2-nistp256@openssh.com,
+                ssh-ed25519,sk-ssh-ed25519@openssh.com,
+                rsa-sha2-512,rsa-sha2-256,ssh-rsa
+
+             The list of available key types may also be obtained using "ssh
+             -Q PubkeyAcceptedKeyTypes".
+
+     PubkeyAuthentication
+             Specifies whether to try public key authentication.  The argument
+             to this keyword must be yes (the default) or no.
+
+     RekeyLimit
+             Specifies the maximum amount of data that may be transmitted
+             before the session key is renegotiated, optionally followed a
+             maximum amount of time that may pass before the session key is
+             renegotiated.  The first argument is specified in bytes and may
+             have a suffix of M-bM-^@M-^XKM-bM-^@M-^Y, M-bM-^@M-^XMM-bM-^@M-^Y, or M-bM-^@M-^XGM-bM-^@M-^Y to indicate Kilobytes,
+             Megabytes, or Gigabytes, respectively.  The default is between
+             M-bM-^@M-^X1GM-bM-^@M-^Y and M-bM-^@M-^X4GM-bM-^@M-^Y, depending on the cipher.  The optional second
+             value is specified in seconds and may use any of the units
+             documented in the TIME FORMATS section of sshd_config(5).  The
+             default value for RekeyLimit is default none, which means that
+             rekeying is performed after the cipher's default amount of data
+             has been sent or received and no time based rekeying is done.
+
+     RemoteCommand
+             Specifies a command to execute on the remote machine after
+             successfully connecting to the server.  The command string
+             extends to the end of the line, and is executed with the user's
+             shell.  Arguments to RemoteCommand accept the tokens described in
+             the TOKENS section.
+
+     RemoteForward
+             Specifies that a TCP port on the remote machine be forwarded over
+             the secure channel.  The remote port may either be forwarded to a
+             specified host and port from the local machine, or may act as a
+             SOCKS 4/5 proxy that allows a remote client to connect to
+             arbitrary destinations from the local machine.  The first
+             argument must be [bind_address:]port If forwarding to a specific
+             destination then the second argument must be host:hostport,
+             otherwise if no destination argument is specified then the remote
+             forwarding will be established as a SOCKS proxy.
+
+             IPv6 addresses can be specified by enclosing addresses in square
+             brackets.  Multiple forwardings may be specified, and additional
+             forwardings can be given on the command line.  Privileged ports
+             can be forwarded only when logging in as root on the remote
+             machine.
+
+             If the port argument is 0, the listen port will be dynamically
+             allocated on the server and reported to the client at run time.
+
+             If the bind_address is not specified, the default is to only bind
+             to loopback addresses.  If the bind_address is M-bM-^@M-^X*M-bM-^@M-^Y or an empty
+             string, then the forwarding is requested to listen on all
+             interfaces.  Specifying a remote bind_address will only succeed
+             if the server's GatewayPorts option is enabled (see
+             sshd_config(5)).
+
+     RequestTTY
+             Specifies whether to request a pseudo-tty for the session.  The
+             argument may be one of: no (never request a TTY), yes (always
+             request a TTY when standard input is a TTY), force (always
+             request a TTY) or auto (request a TTY when opening a login
+             session).  This option mirrors the -t and -T flags for ssh(1).
+
+     RevokedHostKeys
+             Specifies revoked host public keys.  Keys listed in this file
+             will be refused for host authentication.  Note that if this file
+             does not exist or is not readable, then host authentication will
+             be refused for all hosts.  Keys may be specified as a text file,
+             listing one public key per line, or as an OpenSSH Key Revocation
+             List (KRL) as generated by ssh-keygen(1).  For more information
+             on KRLs, see the KEY REVOCATION LISTS section in ssh-keygen(1).
+
+     SecurityKeyProvider
+             Specifies a path to a library that will be used when loading any
+             FIDO authenticator-hosted keys, overriding the default of using
+             the built-in USB HID support.
+
+             If the specified value begins with a M-bM-^@M-^X$M-bM-^@M-^Y character, then it will
+             be treated as an environment variable containing the path to the
+             library.
+
+     SendEnv
+             Specifies what variables from the local environ(7) should be sent
+             to the server.  The server must also support it, and the server
+             must be configured to accept these environment variables.  Note
+             that the TERM environment variable is always sent whenever a
+             pseudo-terminal is requested as it is required by the protocol.
+             Refer to AcceptEnv in sshd_config(5) for how to configure the
+             server.  Variables are specified by name, which may contain
+             wildcard characters.  Multiple environment variables may be
+             separated by whitespace or spread across multiple SendEnv
+             directives.
+
+             See PATTERNS for more information on patterns.
+
+             It is possible to clear previously set SendEnv variable names by
+             prefixing patterns with -.  The default is not to send any
+             environment variables.
+
+     ServerAliveCountMax
+             Sets the number of server alive messages (see below) which may be
+             sent without ssh(1) receiving any messages back from the server.
+             If this threshold is reached while server alive messages are
+             being sent, ssh will disconnect from the server, terminating the
+             session.  It is important to note that the use of server alive
+             messages is very different from TCPKeepAlive (below).  The server
+             alive messages are sent through the encrypted channel and
+             therefore will not be spoofable.  The TCP keepalive option
+             enabled by TCPKeepAlive is spoofable.  The server alive mechanism
+             is valuable when the client or server depend on knowing when a
+             connection has become unresponsive.
+
+             The default value is 3.  If, for example, ServerAliveInterval
+             (see below) is set to 15 and ServerAliveCountMax is left at the
+             default, if the server becomes unresponsive, ssh will disconnect
+             after approximately 45 seconds.
+
+     ServerAliveInterval
+             Sets a timeout interval in seconds after which if no data has
+             been received from the server, ssh(1) will send a message through
+             the encrypted channel to request a response from the server.  The
+             default is 0, indicating that these messages will not be sent to
+             the server.
+
+     SetEnv  Directly specify one or more environment variables and their
+             contents to be sent to the server.  Similarly to SendEnv, the
+             server must be prepared to accept the environment variable.
+
+     StreamLocalBindMask
+             Sets the octal file creation mode mask (umask) used when creating
+             a Unix-domain socket file for local or remote port forwarding.
+             This option is only used for port forwarding to a Unix-domain
+             socket file.
+
+             The default value is 0177, which creates a Unix-domain socket
+             file that is readable and writable only by the owner.  Note that
+             not all operating systems honor the file mode on Unix-domain
+             socket files.
+
+     StreamLocalBindUnlink
+             Specifies whether to remove an existing Unix-domain socket file
+             for local or remote port forwarding before creating a new one.
+             If the socket file already exists and StreamLocalBindUnlink is
+             not enabled, ssh will be unable to forward the port to the Unix-
+             domain socket file.  This option is only used for port forwarding
+             to a Unix-domain socket file.
+
+             The argument must be yes or no (the default).
+
+     StrictHostKeyChecking
+             If this flag is set to yes, ssh(1) will never automatically add
+             host keys to the ~/.ssh/known_hosts file, and refuses to connect
+             to hosts whose host key has changed.  This provides maximum
+             protection against man-in-the-middle (MITM) attacks, though it
+             can be annoying when the /etc/ssh/ssh_known_hosts file is poorly
+             maintained or when connections to new hosts are frequently made.
+             This option forces the user to manually add all new hosts.
+
+             If this flag is set to M-bM-^@M-^\accept-newM-bM-^@M-^] then ssh will automatically
+             add new host keys to the user known hosts files, but will not
+             permit connections to hosts with changed host keys.  If this flag
+             is set to M-bM-^@M-^\noM-bM-^@M-^] or M-bM-^@M-^\offM-bM-^@M-^], ssh will automatically add new host keys
+             to the user known hosts files and allow connections to hosts with
+             changed hostkeys to proceed, subject to some restrictions.  If
+             this flag is set to ask (the default), new host keys will be
+             added to the user known host files only after the user has
+             confirmed that is what they really want to do, and ssh will
+             refuse to connect to hosts whose host key has changed.  The host
+             keys of known hosts will be verified automatically in all cases.
+
+     SyslogFacility
+             Gives the facility code that is used when logging messages from
+             ssh(1).  The possible values are: DAEMON, USER, AUTH, LOCAL0,
+             LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.  The
+             default is USER.
+
+     TCPKeepAlive
+             Specifies whether the system should send TCP keepalive messages
+             to the other side.  If they are sent, death of the connection or
+             crash of one of the machines will be properly noticed.  However,
+             this means that connections will die if the route is down
+             temporarily, and some people find it annoying.
+
+             The default is yes (to send TCP keepalive messages), and the
+             client will notice if the network goes down or the remote host
+             dies.  This is important in scripts, and many users want it too.
+
+             To disable TCP keepalive messages, the value should be set to no.
+             See also ServerAliveInterval for protocol-level keepalives.
+
+     Tunnel  Request tun(4) device forwarding between the client and the
+             server.  The argument must be yes, point-to-point (layer 3),
+             ethernet (layer 2), or no (the default).  Specifying yes requests
+             the default tunnel mode, which is point-to-point.
+
+     TunnelDevice
+             Specifies the tun(4) devices to open on the client (local_tun)
+             and the server (remote_tun).
+
+             The argument must be local_tun[:remote_tun].  The devices may be
+             specified by numerical ID or the keyword any, which uses the next
+             available tunnel device.  If remote_tun is not specified, it
+             defaults to any.  The default is any:any.
+
+     UpdateHostKeys
+             Specifies whether ssh(1) should accept notifications of
+             additional hostkeys from the server sent after authentication has
+             completed and add them to UserKnownHostsFile.  The argument must
+             be yes, no or ask.  This option allows learning alternate
+             hostkeys for a server and supports graceful key rotation by
+             allowing a server to send replacement public keys before old ones
+             are removed.  Additional hostkeys are only accepted if the key
+             used to authenticate the host was already trusted or explicitly
+             accepted by the user.
+
+             UpdateHostKeys is enabled by default if the user has not
+             overridden the default UserKnownHostsFile setting, otherwise
+             UpdateHostKeys will be set to ask.
+
+             If UpdateHostKeys is set to ask, then the user is asked to
+             confirm the modifications to the known_hosts file.  Confirmation
+             is currently incompatible with ControlPersist, and will be
+             disabled if it is enabled.
+
+             Presently, only sshd(8) from OpenSSH 6.8 and greater support the
+             "hostkeys@openssh.com" protocol extension used to inform the
+             client of all the server's hostkeys.
+
+     User    Specifies the user to log in as.  This can be useful when a
+             different user name is used on different machines.  This saves
+             the trouble of having to remember to give the user name on the
+             command line.
+
+     UserKnownHostsFile
+             Specifies one or more files to use for the user host key
+             database, separated by whitespace.  The default is
+             ~/.ssh/known_hosts, ~/.ssh/known_hosts2.
+
+     VerifyHostKeyDNS
+             Specifies whether to verify the remote key using DNS and SSHFP
+             resource records.  If this option is set to yes, the client will
+             implicitly trust keys that match a secure fingerprint from DNS.
+             Insecure fingerprints will be handled as if this option was set
+             to ask.  If this option is set to ask, information on fingerprint
+             match will be displayed, but the user will still need to confirm
+             new host keys according to the StrictHostKeyChecking option.  The
+             default is no.
+
+             See also VERIFYING HOST KEYS in ssh(1).
+
+     VisualHostKey
+             If this flag is set to yes, an ASCII art representation of the
+             remote host key fingerprint is printed in addition to the
+             fingerprint string at login and for unknown host keys.  If this
+             flag is set to no (the default), no fingerprint strings are
+             printed at login and only the fingerprint string will be printed
+             for unknown host keys.
+
+     XAuthLocation
+             Specifies the full pathname of the xauth(1) program.  The default
+             is /usr/X11R6/bin/xauth.
+
+PATTERNS
+     A pattern consists of zero or more non-whitespace characters, M-bM-^@M-^X*M-bM-^@M-^Y (a
+     wildcard that matches zero or more characters), or M-bM-^@M-^X?M-bM-^@M-^Y (a wildcard that
+     matches exactly one character).  For example, to specify a set of
+     declarations for any host in the ".co.uk" set of domains, the following
+     pattern could be used:
+
+           Host *.co.uk
+
+     The following pattern would match any host in the 192.168.0.[0-9] network
+     range:
+
+           Host 192.168.0.?
+
+     A pattern-list is a comma-separated list of patterns.  Patterns within
+     pattern-lists may be negated by preceding them with an exclamation mark
+     (M-bM-^@M-^X!M-bM-^@M-^Y).  For example, to allow a key to be used from anywhere within an
+     organization except from the "dialup" pool, the following entry (in
+     authorized_keys) could be used:
+
+           from="!*.dialup.example.com,*.example.com"
+
+     Note that a negated match will never produce a positive result by itself.
+     For example, attempting to match "host3" against the following pattern-
+     list will fail:
+
+           from="!host1,!host2"
+
+     The solution here is to include a term that will yield a positive match,
+     such as a wildcard:
+
+           from="!host1,!host2,*"
+
+TOKENS
+     Arguments to some keywords can make use of tokens, which are expanded at
+     runtime:
+
+           %%    A literal M-bM-^@M-^X%M-bM-^@M-^Y.
+           %C    Hash of %l%h%p%r.
+           %d    Local user's home directory.
+           %h    The remote hostname.
+           %i    The local user ID.
+           %L    The local hostname.
+           %l    The local hostname, including the domain name.
+           %n    The original remote hostname, as given on the command line.
+           %p    The remote port.
+           %r    The remote username.
+           %T    The local tun(4) or tap(4) network interface assigned if
+                 tunnel forwarding was requested, or "NONE" otherwise.
+           %u    The local username.
+
+     Match exec accepts the tokens %%, %h, %i, %L, %l, %n, %p, %r, and %u.
+
+     CertificateFile accepts the tokens %%, %d, %h, %i, %l, %r, and %u.
+
+     ControlPath accepts the tokens %%, %C, %h, %i, %L, %l, %n, %p, %r, and
+     %u.
+
+     Hostname accepts the tokens %% and %h.
+
+     IdentityAgent and IdentityFile accept the tokens %%, %d, %h, %i, %l, %r,
+     and %u.
+
+     LocalCommand accepts the tokens %%, %C, %d, %h, %i, %l, %n, %p, %r, %T,
+     and %u.
+
+     ProxyCommand accepts the tokens %%, %h, %n, %p, and %r.
+
+     RemoteCommand accepts the tokens %%, %C, %d, %h, %i, %l, %n, %p, %r, and
+     %u.
+
+FILES
+     ~/.ssh/config
+             This is the per-user configuration file.  The format of this file
+             is described above.  This file is used by the SSH client.
+             Because of the potential for abuse, this file must have strict
+             permissions: read/write for the user, and not writable by others.
+
+     /etc/ssh/ssh_config
+             Systemwide configuration file.  This file provides defaults for
+             those values that are not specified in the user's configuration
+             file, and for those users who do not have a configuration file.
+             This file must be world-readable.
+
+SEE ALSO
+     ssh(1)
+
+AUTHORS
+     OpenSSH is a derivative of the original and free ssh 1.2.12 release by
+     Tatu Ylonen.  Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo
+     de Raadt and Dug Song removed many bugs, re-added newer features and
+     created OpenSSH.  Markus Friedl contributed the support for SSH protocol
+     versions 1.5 and 2.0.
+
+OpenBSD 6.6                    February 7, 2020                    OpenBSD 6.6
diff --git a/sshd.0 b/sshd.0
new file mode 100644
index 000000000..15ef5dd3b
--- /dev/null
+++ b/sshd.0
@@ -0,0 +1,667 @@
+SSHD(8)                     System Manager's Manual                    SSHD(8)
+
+NAME
+     sshd M-bM-^@M-^S OpenSSH daemon
+
+SYNOPSIS
+     sshd [-46DdeiqTt] [-C connection_spec] [-c host_certificate_file]
+          [-E log_file] [-f config_file] [-g login_grace_time]
+          [-h host_key_file] [-o option] [-p port] [-u len]
+
+DESCRIPTION
+     sshd (OpenSSH Daemon) is the daemon program for ssh(1).  Together these
+     programs replace rlogin and rsh, and provide secure encrypted
+     communications between two untrusted hosts over an insecure network.
+
+     sshd listens for connections from clients.  It is normally started at
+     boot from /etc/rc.  It forks a new daemon for each incoming connection.
+     The forked daemons handle key exchange, encryption, authentication,
+     command execution, and data exchange.
+
+     sshd can be configured using command-line options or a configuration file
+     (by default sshd_config(5)); command-line options override values
+     specified in the configuration file.  sshd rereads its configuration file
+     when it receives a hangup signal, SIGHUP, by executing itself with the
+     name and options it was started with, e.g. /usr/sbin/sshd.
+
+     The options are as follows:
+
+     -4      Forces sshd to use IPv4 addresses only.
+
+     -6      Forces sshd to use IPv6 addresses only.
+
+     -C connection_spec
+             Specify the connection parameters to use for the -T extended test
+             mode.  If provided, any Match directives in the configuration
+             file that would apply are applied before the configuration is
+             written to standard output.  The connection parameters are
+             supplied as keyword=value pairs and may be supplied in any order,
+             either with multiple -C options or as a comma-separated list.
+             The keywords are M-bM-^@M-^\addr,M-bM-^@M-^] M-bM-^@M-^\userM-bM-^@M-^], M-bM-^@M-^\hostM-bM-^@M-^], M-bM-^@M-^\laddrM-bM-^@M-^], M-bM-^@M-^\lportM-bM-^@M-^], and
+             M-bM-^@M-^\rdomainM-bM-^@M-^] and correspond to source address, user, resolved source
+             host name, local address, local port number and routing domain
+             respectively.
+
+     -c host_certificate_file
+             Specifies a path to a certificate file to identify sshd during
+             key exchange.  The certificate file must match a host key file
+             specified using the -h option or the HostKey configuration
+             directive.
+
+     -D      When this option is specified, sshd will not detach and does not
+             become a daemon.  This allows easy monitoring of sshd.
+
+     -d      Debug mode.  The server sends verbose debug output to standard
+             error, and does not put itself in the background.  The server
+             also will not fork and will only process one connection.  This
+             option is only intended for debugging for the server.  Multiple
+             -d options increase the debugging level.  Maximum is 3.
+
+     -E log_file
+             Append debug logs to log_file instead of the system log.
+
+     -e      Write debug logs to standard error instead of the system log.
+
+     -f config_file
+             Specifies the name of the configuration file.  The default is
+             /etc/ssh/sshd_config.  sshd refuses to start if there is no
+             configuration file.
+
+     -g login_grace_time
+             Gives the grace time for clients to authenticate themselves
+             (default 120 seconds).  If the client fails to authenticate the
+             user within this many seconds, the server disconnects and exits.
+             A value of zero indicates no limit.
+
+     -h host_key_file
+             Specifies a file from which a host key is read.  This option must
+             be given if sshd is not run as root (as the normal host key files
+             are normally not readable by anyone but root).  The default is
+             /etc/ssh/ssh_host_ecdsa_key, /etc/ssh/ssh_host_ed25519_key and
+             /etc/ssh/ssh_host_rsa_key.  It is possible to have multiple host
+             key files for the different host key algorithms.
+
+     -i      Specifies that sshd is being run from inetd(8).
+
+     -o option
+             Can be used to give options in the format used in the
+             configuration file.  This is useful for specifying options for
+             which there is no separate command-line flag.  For full details
+             of the options, and their values, see sshd_config(5).
+
+     -p port
+             Specifies the port on which the server listens for connections
+             (default 22).  Multiple port options are permitted.  Ports
+             specified in the configuration file with the Port option are
+             ignored when a command-line port is specified.  Ports specified
+             using the ListenAddress option override command-line ports.
+
+     -q      Quiet mode.  Nothing is sent to the system log.  Normally the
+             beginning, authentication, and termination of each connection is
+             logged.
+
+     -T      Extended test mode.  Check the validity of the configuration
+             file, output the effective configuration to stdout and then exit.
+             Optionally, Match rules may be applied by specifying the
+             connection parameters using one or more -C options.
+
+     -t      Test mode.  Only check the validity of the configuration file and
+             sanity of the keys.  This is useful for updating sshd reliably as
+             configuration options may change.
+
+     -u len  This option is used to specify the size of the field in the utmp
+             structure that holds the remote host name.  If the resolved host
+             name is longer than len, the dotted decimal value will be used
+             instead.  This allows hosts with very long host names that
+             overflow this field to still be uniquely identified.  Specifying
+             -u0 indicates that only dotted decimal addresses should be put
+             into the utmp file.  -u0 may also be used to prevent sshd from
+             making DNS requests unless the authentication mechanism or
+             configuration requires it.  Authentication mechanisms that may
+             require DNS include HostbasedAuthentication and using a
+             from="pattern-list" option in a key file.  Configuration options
+             that require DNS include using a USER@HOST pattern in AllowUsers
+             or DenyUsers.
+
+AUTHENTICATION
+     The OpenSSH SSH daemon supports SSH protocol 2 only.  Each host has a
+     host-specific key, used to identify the host.  Whenever a client
+     connects, the daemon responds with its public host key.  The client
+     compares the host key against its own database to verify that it has not
+     changed.  Forward secrecy is provided through a Diffie-Hellman key
+     agreement.  This key agreement results in a shared session key.  The rest
+     of the session is encrypted using a symmetric cipher.  The client selects
+     the encryption algorithm to use from those offered by the server.
+     Additionally, session integrity is provided through a cryptographic
+     message authentication code (MAC).
+
+     Finally, the server and the client enter an authentication dialog.  The
+     client tries to authenticate itself using host-based authentication,
+     public key authentication, challenge-response authentication, or password
+     authentication.
+
+     Regardless of the authentication type, the account is checked to ensure
+     that it is accessible.  An account is not accessible if it is locked,
+     listed in DenyUsers or its group is listed in DenyGroups .  The
+     definition of a locked account is system dependent. Some platforms have
+     their own account database (eg AIX) and some modify the passwd field (
+     M-bM-^@M-^X*LK*M-bM-^@M-^Y on Solaris and UnixWare, M-bM-^@M-^X*M-bM-^@M-^Y on HP-UX, containing M-bM-^@M-^XNologinM-bM-^@M-^Y on
+     Tru64, a leading M-bM-^@M-^X*LOCKED*M-bM-^@M-^Y on FreeBSD and a leading M-bM-^@M-^X!M-bM-^@M-^Y on most
+     Linuxes).  If there is a requirement to disable password authentication
+     for the account while allowing still public-key, then the passwd field
+     should be set to something other than these values (eg M-bM-^@M-^XNPM-bM-^@M-^Y or M-bM-^@M-^X*NP*M-bM-^@M-^Y ).
+
+     If the client successfully authenticates itself, a dialog for preparing
+     the session is entered.  At this time the client may request things like
+     allocating a pseudo-tty, forwarding X11 connections, forwarding TCP
+     connections, or forwarding the authentication agent connection over the
+     secure channel.
+
+     After this, the client either requests a shell or execution of a command.
+     The sides then enter session mode.  In this mode, either side may send
+     data at any time, and such data is forwarded to/from the shell or command
+     on the server side, and the user terminal in the client side.
+
+     When the user program terminates and all forwarded X11 and other
+     connections have been closed, the server sends command exit status to the
+     client, and both sides exit.
+
+LOGIN PROCESS
+     When a user successfully logs in, sshd does the following:
+
+           1.   If the login is on a tty, and no command has been specified,
+                prints last login time and /etc/motd (unless prevented in the
+                configuration file or by ~/.hushlogin; see the FILES section).
+
+           2.   If the login is on a tty, records login time.
+
+           3.   Checks /etc/nologin; if it exists, prints contents and quits
+                (unless root).
+
+           4.   Changes to run with normal user privileges.
+
+           5.   Sets up basic environment.
+
+           6.   Reads the file ~/.ssh/environment, if it exists, and users are
+                allowed to change their environment.  See the
+                PermitUserEnvironment option in sshd_config(5).
+
+           7.   Changes to user's home directory.
+
+           8.   If ~/.ssh/rc exists and the sshd_config(5) PermitUserRC option
+                is set, runs it; else if /etc/ssh/sshrc exists, runs it;
+                otherwise runs xauth.  The M-bM-^@M-^\rcM-bM-^@M-^] files are given the X11
+                authentication protocol and cookie in standard input.  See
+                SSHRC, below.
+
+           9.   Runs user's shell or command.  All commands are run under the
+                user's login shell as specified in the system password
+                database.
+
+SSHRC
+     If the file ~/.ssh/rc exists, sh(1) runs it after reading the environment
+     files but before starting the user's shell or command.  It must not
+     produce any output on stdout; stderr must be used instead.  If X11
+     forwarding is in use, it will receive the "proto cookie" pair in its
+     standard input (and DISPLAY in its environment).  The script must call
+     xauth(1) because sshd will not run xauth automatically to add X11
+     cookies.
+
+     The primary purpose of this file is to run any initialization routines
+     which may be needed before the user's home directory becomes accessible;
+     AFS is a particular example of such an environment.
+
+     This file will probably contain some initialization code followed by
+     something similar to:
+
+        if read proto cookie && [ -n "$DISPLAY" ]; then
+                if [ `echo $DISPLAY | cut -c1-10` = 'localhost:' ]; then
+                        # X11UseLocalhost=yes
+                        echo add unix:`echo $DISPLAY |
+                            cut -c11-` $proto $cookie
+                else
+                        # X11UseLocalhost=no
+                        echo add $DISPLAY $proto $cookie
+                fi | xauth -q -
+        fi
+
+     If this file does not exist, /etc/ssh/sshrc is run, and if that does not
+     exist either, xauth is used to add the cookie.
+
+AUTHORIZED_KEYS FILE FORMAT
+     AuthorizedKeysFile specifies the files containing public keys for public
+     key authentication; if this option is not specified, the default is
+     ~/.ssh/authorized_keys and ~/.ssh/authorized_keys2.  Each line of the
+     file contains one key (empty lines and lines starting with a M-bM-^@M-^X#M-bM-^@M-^Y are
+     ignored as comments).  Public keys consist of the following space-
+     separated fields: options, keytype, base64-encoded key, comment.  The
+     options field is optional.  The supported key types are:
+
+           sk-ecdsa-sha2-nistp256@openssh.com
+           ecdsa-sha2-nistp256
+           ecdsa-sha2-nistp384
+           ecdsa-sha2-nistp521
+           sk-ssh-ed25519@openssh.com
+           ssh-ed25519
+           ssh-dss
+           ssh-rsa
+
+     The comment field is not used for anything (but may be convenient for the
+     user to identify the key).
+
+     Note that lines in this file can be several hundred bytes long (because
+     of the size of the public key encoding) up to a limit of 8 kilobytes,
+     which permits RSA keys up to 16 kilobits.  You don't want to type them
+     in; instead, copy the id_dsa.pub, id_ecdsa.pub, id_ecdsa_sk.pub,
+     id_ed25519.pub, id_ed25519_sk.pub, or the id_rsa.pub file and edit it.
+
+     sshd enforces a minimum RSA key modulus size of 1024 bits.
+
+     The options (if present) consist of comma-separated option
+     specifications.  No spaces are permitted, except within double quotes.
+     The following option specifications are supported (note that option
+     keywords are case-insensitive):
+
+     agent-forwarding
+             Enable authentication agent forwarding previously disabled by the
+             restrict option.
+
+     cert-authority
+             Specifies that the listed key is a certification authority (CA)
+             that is trusted to validate signed certificates for user
+             authentication.
+
+             Certificates may encode access restrictions similar to these key
+             options.  If both certificate restrictions and key options are
+             present, the most restrictive union of the two is applied.
+
+     command="command"
+             Specifies that the command is executed whenever this key is used
+             for authentication.  The command supplied by the user (if any) is
+             ignored.  The command is run on a pty if the client requests a
+             pty; otherwise it is run without a tty.  If an 8-bit clean
+             channel is required, one must not request a pty or should specify
+             no-pty.  A quote may be included in the command by quoting it
+             with a backslash.
+
+             This option might be useful to restrict certain public keys to
+             perform just a specific operation.  An example might be a key
+             that permits remote backups but nothing else.  Note that the
+             client may specify TCP and/or X11 forwarding unless they are
+             explicitly prohibited, e.g. using the restrict key option.
+
+             The command originally supplied by the client is available in the
+             SSH_ORIGINAL_COMMAND environment variable.  Note that this option
+             applies to shell, command or subsystem execution.  Also note that
+             this command may be superseded by a sshd_config(5) ForceCommand
+             directive.
+
+             If a command is specified and a forced-command is embedded in a
+             certificate used for authentication, then the certificate will be
+             accepted only if the two commands are identical.
+
+     environment="NAME=value"
+             Specifies that the string is to be added to the environment when
+             logging in using this key.  Environment variables set this way
+             override other default environment values.  Multiple options of
+             this type are permitted.  Environment processing is disabled by
+             default and is controlled via the PermitUserEnvironment option.
+
+     expiry-time="timespec"
+             Specifies a time after which the key will not be accepted.  The
+             time may be specified as a YYYYMMDD date or a YYYYMMDDHHMM[SS]
+             time in the system time-zone.
+
+     from="pattern-list"
+             Specifies that in addition to public key authentication, either
+             the canonical name of the remote host or its IP address must be
+             present in the comma-separated list of patterns.  See PATTERNS in
+             ssh_config(5) for more information on patterns.
+
+             In addition to the wildcard matching that may be applied to
+             hostnames or addresses, a from stanza may match IP addresses
+             using CIDR address/masklen notation.
+
+             The purpose of this option is to optionally increase security:
+             public key authentication by itself does not trust the network or
+             name servers or anything (but the key); however, if somebody
+             somehow steals the key, the key permits an intruder to log in
+             from anywhere in the world.  This additional option makes using a
+             stolen key more difficult (name servers and/or routers would have
+             to be compromised in addition to just the key).
+
+     no-agent-forwarding
+             Forbids authentication agent forwarding when this key is used for
+             authentication.
+
+     no-port-forwarding
+             Forbids TCP forwarding when this key is used for authentication.
+             Any port forward requests by the client will return an error.
+             This might be used, e.g. in connection with the command option.
+
+     no-pty  Prevents tty allocation (a request to allocate a pty will fail).
+
+     no-user-rc
+             Disables execution of ~/.ssh/rc.
+
+     no-X11-forwarding
+             Forbids X11 forwarding when this key is used for authentication.
+             Any X11 forward requests by the client will return an error.
+
+     permitlisten="[host:]port"
+             Limit remote port forwarding with the ssh(1) -R option such that
+             it may only listen on the specified host (optional) and port.
+             IPv6 addresses can be specified by enclosing the address in
+             square brackets.  Multiple permitlisten options may be applied
+             separated by commas.  Hostnames may include wildcards as
+             described in the PATTERNS section in ssh_config(5).  A port
+             specification of * matches any port.  Note that the setting of
+             GatewayPorts may further restrict listen addresses.  Note that
+             ssh(1) will send a hostname of M-bM-^@M-^\localhostM-bM-^@M-^] if a listen host was
+             not specified when the forwarding was requested, and that this
+             name is treated differently to the explicit localhost addresses
+             M-bM-^@M-^\127.0.0.1M-bM-^@M-^] and M-bM-^@M-^\::1M-bM-^@M-^].
+
+     permitopen="host:port"
+             Limit local port forwarding with the ssh(1) -L option such that
+             it may only connect to the specified host and port.  IPv6
+             addresses can be specified by enclosing the address in square
+             brackets.  Multiple permitopen options may be applied separated
+             by commas.  No pattern matching or name lookup is performed on
+             the specified hostnames, they must be literal host names and/or
+             addresses.  A port specification of * matches any port.
+
+     port-forwarding
+             Enable port forwarding previously disabled by the restrict
+             option.
+
+     principals="principals"
+             On a cert-authority line, specifies allowed principals for
+             certificate authentication as a comma-separated list.  At least
+             one name from the list must appear in the certificate's list of
+             principals for the certificate to be accepted.  This option is
+             ignored for keys that are not marked as trusted certificate
+             signers using the cert-authority option.
+
+     pty     Permits tty allocation previously disabled by the restrict
+             option.
+
+     no-touch-required
+             Do not require demonstration of user presence for signatures made
+             using this key.  This option only makes sense for the FIDO
+             authenticator algorithms ecdsa-sk and ed25519-sk.
+
+     restrict
+             Enable all restrictions, i.e. disable port, agent and X11
+             forwarding, as well as disabling PTY allocation and execution of
+             ~/.ssh/rc.  If any future restriction capabilities are added to
+             authorized_keys files they will be included in this set.
+
+     tunnel="n"
+             Force a tun(4) device on the server.  Without this option, the
+             next available device will be used if the client requests a
+             tunnel.
+
+     user-rc
+             Enables execution of ~/.ssh/rc previously disabled by the
+             restrict option.
+
+     X11-forwarding
+             Permits X11 forwarding previously disabled by the restrict
+             option.
+
+     An example authorized_keys file:
+
+        # Comments allowed at start of line
+        ssh-rsa AAAAB3Nza...LiPk== user@example.net
+        from="*.sales.example.net,!pc.sales.example.net" ssh-rsa
+        AAAAB2...19Q== john@example.net
+        command="dump /home",no-pty,no-port-forwarding ssh-rsa
+        AAAAC3...51R== example.net
+        permitopen="192.0.2.1:80",permitopen="192.0.2.2:25" ssh-rsa
+        AAAAB5...21S==
+        permitlisten="localhost:8080",permitopen="localhost:22000" ssh-rsa
+        AAAAB5...21S==
+        tunnel="0",command="sh /etc/netstart tun0" ssh-rsa AAAA...==
+        jane@example.net
+        restrict,command="uptime" ssh-rsa AAAA1C8...32Tv==
+        user@example.net
+        restrict,pty,command="nethack" ssh-rsa AAAA1f8...IrrC5==
+        user@example.net
+        no-touch-required sk-ecdsa-sha2-nistp256@openssh.com AAAAInN...Ko==
+        user@example.net
+
+SSH_KNOWN_HOSTS FILE FORMAT
+     The /etc/ssh/ssh_known_hosts and ~/.ssh/known_hosts files contain host
+     public keys for all known hosts.  The global file should be prepared by
+     the administrator (optional), and the per-user file is maintained
+     automatically: whenever the user connects to an unknown host, its key is
+     added to the per-user file.
+
+     Each line in these files contains the following fields: markers
+     (optional), hostnames, keytype, base64-encoded key, comment.  The fields
+     are separated by spaces.
+
+     The marker is optional, but if it is present then it must be one of
+     M-bM-^@M-^\@cert-authorityM-bM-^@M-^], to indicate that the line contains a certification
+     authority (CA) key, or M-bM-^@M-^\@revokedM-bM-^@M-^], to indicate that the key contained on
+     the line is revoked and must not ever be accepted.  Only one marker
+     should be used on a key line.
+
+     Hostnames is a comma-separated list of patterns (M-bM-^@M-^X*M-bM-^@M-^Y and M-bM-^@M-^X?M-bM-^@M-^Y act as
+     wildcards); each pattern in turn is matched against the host name.  When
+     sshd is authenticating a client, such as when using
+     HostbasedAuthentication, this will be the canonical client host name.
+     When ssh(1) is authenticating a server, this will be the host name given
+     by the user, the value of the ssh(1) HostkeyAlias if it was specified, or
+     the canonical server hostname if the ssh(1) CanonicalizeHostname option
+     was used.
+
+     A pattern may also be preceded by M-bM-^@M-^X!M-bM-^@M-^Y to indicate negation: if the host
+     name matches a negated pattern, it is not accepted (by that line) even if
+     it matched another pattern on the line.  A hostname or address may
+     optionally be enclosed within M-bM-^@M-^X[M-bM-^@M-^Y and M-bM-^@M-^X]M-bM-^@M-^Y brackets then followed by M-bM-^@M-^X:M-bM-^@M-^Y
+     and a non-standard port number.
+
+     Alternately, hostnames may be stored in a hashed form which hides host
+     names and addresses should the file's contents be disclosed.  Hashed
+     hostnames start with a M-bM-^@M-^X|M-bM-^@M-^Y character.  Only one hashed hostname may
+     appear on a single line and none of the above negation or wildcard
+     operators may be applied.
+
+     The keytype and base64-encoded key are taken directly from the host key;
+     they can be obtained, for example, from /etc/ssh/ssh_host_rsa_key.pub.
+     The optional comment field continues to the end of the line, and is not
+     used.
+
+     Lines starting with M-bM-^@M-^X#M-bM-^@M-^Y and empty lines are ignored as comments.
+
+     When performing host authentication, authentication is accepted if any
+     matching line has the proper key; either one that matches exactly or, if
+     the server has presented a certificate for authentication, the key of the
+     certification authority that signed the certificate.  For a key to be
+     trusted as a certification authority, it must use the M-bM-^@M-^\@cert-authorityM-bM-^@M-^]
+     marker described above.
+
+     The known hosts file also provides a facility to mark keys as revoked,
+     for example when it is known that the associated private key has been
+     stolen.  Revoked keys are specified by including the M-bM-^@M-^\@revokedM-bM-^@M-^] marker at
+     the beginning of the key line, and are never accepted for authentication
+     or as certification authorities, but instead will produce a warning from
+     ssh(1) when they are encountered.
+
+     It is permissible (but not recommended) to have several lines or
+     different host keys for the same names.  This will inevitably happen when
+     short forms of host names from different domains are put in the file.  It
+     is possible that the files contain conflicting information;
+     authentication is accepted if valid information can be found from either
+     file.
+
+     Note that the lines in these files are typically hundreds of characters
+     long, and you definitely don't want to type in the host keys by hand.
+     Rather, generate them by a script, ssh-keyscan(1) or by taking, for
+     example, /etc/ssh/ssh_host_rsa_key.pub and adding the host names at the
+     front.  ssh-keygen(1) also offers some basic automated editing for
+     ~/.ssh/known_hosts including removing hosts matching a host name and
+     converting all host names to their hashed representations.
+
+     An example ssh_known_hosts file:
+
+        # Comments allowed at start of line
+        closenet,...,192.0.2.53 1024 37 159...93 closenet.example.net
+        cvs.example.net,192.0.2.10 ssh-rsa AAAA1234.....=
+        # A hashed hostname
+        |1|JfKTdBh7rNbXkVAQCRp4OQoPfmI=|USECr3SWf1JUPsms5AqfD5QfxkM= ssh-rsa
+        AAAA1234.....=
+        # A revoked key
+        @revoked * ssh-rsa AAAAB5W...
+        # A CA key, accepted for any host in *.mydomain.com or *.mydomain.org
+        @cert-authority *.mydomain.org,*.mydomain.com ssh-rsa AAAAB5W...
+
+FILES
+     ~/.hushlogin
+             This file is used to suppress printing the last login time and
+             /etc/motd, if PrintLastLog and PrintMotd, respectively, are
+             enabled.  It does not suppress printing of the banner specified
+             by Banner.
+
+     ~/.rhosts
+             This file is used for host-based authentication (see ssh(1) for
+             more information).  On some machines this file may need to be
+             world-readable if the user's home directory is on an NFS
+             partition, because sshd reads it as root.  Additionally, this
+             file must be owned by the user, and must not have write
+             permissions for anyone else.  The recommended permission for most
+             machines is read/write for the user, and not accessible by
+             others.
+
+     ~/.shosts
+             This file is used in exactly the same way as .rhosts, but allows
+             host-based authentication without permitting login with
+             rlogin/rsh.
+
+     ~/.ssh/
+             This directory is the default location for all user-specific
+             configuration and authentication information.  There is no
+             general requirement to keep the entire contents of this directory
+             secret, but the recommended permissions are read/write/execute
+             for the user, and not accessible by others.
+
+     ~/.ssh/authorized_keys
+             Lists the public keys (DSA, ECDSA, Ed25519, RSA) that can be used
+             for logging in as this user.  The format of this file is
+             described above.  The content of the file is not highly
+             sensitive, but the recommended permissions are read/write for the
+             user, and not accessible by others.
+
+             If this file, the ~/.ssh directory, or the user's home directory
+             are writable by other users, then the file could be modified or
+             replaced by unauthorized users.  In this case, sshd will not
+             allow it to be used unless the StrictModes option has been set to
+             M-bM-^@M-^\noM-bM-^@M-^].
+
+     ~/.ssh/environment
+             This file is read into the environment at login (if it exists).
+             It can only contain empty lines, comment lines (that start with
+             M-bM-^@M-^X#M-bM-^@M-^Y), and assignment lines of the form name=value.  The file
+             should be writable only by the user; it need not be readable by
+             anyone else.  Environment processing is disabled by default and
+             is controlled via the PermitUserEnvironment option.
+
+     ~/.ssh/known_hosts
+             Contains a list of host keys for all hosts the user has logged
+             into that are not already in the systemwide list of known host
+             keys.  The format of this file is described above.  This file
+             should be writable only by root/the owner and can, but need not
+             be, world-readable.
+
+     ~/.ssh/rc
+             Contains initialization routines to be run before the user's home
+             directory becomes accessible.  This file should be writable only
+             by the user, and need not be readable by anyone else.
+
+     /etc/hosts.equiv
+             This file is for host-based authentication (see ssh(1)).  It
+             should only be writable by root.
+
+     /etc/moduli
+             Contains Diffie-Hellman groups used for the "Diffie-Hellman Group
+             Exchange" key exchange method.  The file format is described in
+             moduli(5).  If no usable groups are found in this file then fixed
+             internal groups will be used.
+
+     /etc/motd
+             See motd(5).
+
+     /etc/nologin
+             If this file exists, sshd refuses to let anyone except root log
+             in.  The contents of the file are displayed to anyone trying to
+             log in, and non-root connections are refused.  The file should be
+             world-readable.
+
+     /etc/shosts.equiv
+             This file is used in exactly the same way as hosts.equiv, but
+             allows host-based authentication without permitting login with
+             rlogin/rsh.
+
+     /etc/ssh/ssh_host_ecdsa_key
+     /etc/ssh/ssh_host_ed25519_key
+     /etc/ssh/ssh_host_rsa_key
+             These files contain the private parts of the host keys.  These
+             files should only be owned by root, readable only by root, and
+             not accessible to others.  Note that sshd does not start if these
+             files are group/world-accessible.
+
+     /etc/ssh/ssh_host_ecdsa_key.pub
+     /etc/ssh/ssh_host_ed25519_key.pub
+     /etc/ssh/ssh_host_rsa_key.pub
+             These files contain the public parts of the host keys.  These
+             files should be world-readable but writable only by root.  Their
+             contents should match the respective private parts.  These files
+             are not really used for anything; they are provided for the
+             convenience of the user so their contents can be copied to known
+             hosts files.  These files are created using ssh-keygen(1).
+
+     /etc/ssh/ssh_known_hosts
+             Systemwide list of known host keys.  This file should be prepared
+             by the system administrator to contain the public host keys of
+             all machines in the organization.  The format of this file is
+             described above.  This file should be writable only by root/the
+             owner and should be world-readable.
+
+     /etc/ssh/sshd_config
+             Contains configuration data for sshd.  The file format and
+             configuration options are described in sshd_config(5).
+
+     /etc/ssh/sshrc
+             Similar to ~/.ssh/rc, it can be used to specify machine-specific
+             login-time initializations globally.  This file should be
+             writable only by root, and should be world-readable.
+
+     /var/empty
+             chroot(2) directory used by sshd during privilege separation in
+             the pre-authentication phase.  The directory should not contain
+             any files and must be owned by root and not group or world-
+             writable.
+
+     /var/run/sshd.pid
+             Contains the process ID of the sshd listening for connections (if
+             there are several daemons running concurrently for different
+             ports, this contains the process ID of the one started last).
+             The content of this file is not sensitive; it can be world-
+             readable.
+
+SEE ALSO
+     scp(1), sftp(1), ssh(1), ssh-add(1), ssh-agent(1), ssh-keygen(1),
+     ssh-keyscan(1), chroot(2), login.conf(5), moduli(5), sshd_config(5),
+     inetd(8), sftp-server(8)
+
+AUTHORS
+     OpenSSH is a derivative of the original and free ssh 1.2.12 release by
+     Tatu Ylonen.  Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo
+     de Raadt and Dug Song removed many bugs, re-added newer features and
+     created OpenSSH.  Markus Friedl contributed the support for SSH protocol
+     versions 1.5 and 2.0.  Niels Provos and Markus Friedl contributed support
+     for privilege separation.
+
+OpenBSD 6.6                    January 25, 2020                    OpenBSD 6.6
diff --git a/sshd_config.0 b/sshd_config.0
new file mode 100644
index 000000000..1d655a3b8
--- /dev/null
+++ b/sshd_config.0
@@ -0,0 +1,1145 @@
+SSHD_CONFIG(5)                File Formats Manual               SSHD_CONFIG(5)
+
+NAME
+     sshd_config M-bM-^@M-^S OpenSSH daemon configuration file
+
+DESCRIPTION
+     sshd(8) reads configuration data from /etc/ssh/sshd_config (or the file
+     specified with -f on the command line).  The file contains keyword-
+     argument pairs, one per line.  For each keyword, the first obtained value
+     will be used.  Lines starting with M-bM-^@M-^X#M-bM-^@M-^Y and empty lines are interpreted as
+     comments.  Arguments may optionally be enclosed in double quotes (") in
+     order to represent arguments containing spaces.
+
+     The possible keywords and their meanings are as follows (note that
+     keywords are case-insensitive and arguments are case-sensitive):
+
+     AcceptEnv
+             Specifies what environment variables sent by the client will be
+             copied into the session's environ(7).  See SendEnv and SetEnv in
+             ssh_config(5) for how to configure the client.  The TERM
+             environment variable is always accepted whenever the client
+             requests a pseudo-terminal as it is required by the protocol.
+             Variables are specified by name, which may contain the wildcard
+             characters M-bM-^@M-^X*M-bM-^@M-^Y and M-bM-^@M-^X?M-bM-^@M-^Y.  Multiple environment variables may be
+             separated by whitespace or spread across multiple AcceptEnv
+             directives.  Be warned that some environment variables could be
+             used to bypass restricted user environments.  For this reason,
+             care should be taken in the use of this directive.  The default
+             is not to accept any environment variables.
+
+     AddressFamily
+             Specifies which address family should be used by sshd(8).  Valid
+             arguments are any (the default), inet (use IPv4 only), or inet6
+             (use IPv6 only).
+
+     AllowAgentForwarding
+             Specifies whether ssh-agent(1) forwarding is permitted.  The
+             default is yes.  Note that disabling agent forwarding does not
+             improve security unless users are also denied shell access, as
+             they can always install their own forwarders.
+
+     AllowGroups
+             This keyword can be followed by a list of group name patterns,
+             separated by spaces.  If specified, login is allowed only for
+             users whose primary group or supplementary group list matches one
+             of the patterns.  Only group names are valid; a numerical group
+             ID is not recognized.  By default, login is allowed for all
+             groups.  The allow/deny groups directives are processed in the
+             following order: DenyGroups, AllowGroups.
+
+             See PATTERNS in ssh_config(5) for more information on patterns.
+
+     AllowStreamLocalForwarding
+             Specifies whether StreamLocal (Unix-domain socket) forwarding is
+             permitted.  The available options are yes (the default) or all to
+             allow StreamLocal forwarding, no to prevent all StreamLocal
+             forwarding, local to allow local (from the perspective of ssh(1))
+             forwarding only or remote to allow remote forwarding only.  Note
+             that disabling StreamLocal forwarding does not improve security
+             unless users are also denied shell access, as they can always
+             install their own forwarders.
+
+     AllowTcpForwarding
+             Specifies whether TCP forwarding is permitted.  The available
+             options are yes (the default) or all to allow TCP forwarding, no
+             to prevent all TCP forwarding, local to allow local (from the
+             perspective of ssh(1)) forwarding only or remote to allow remote
+             forwarding only.  Note that disabling TCP forwarding does not
+             improve security unless users are also denied shell access, as
+             they can always install their own forwarders.
+
+     AllowUsers
+             This keyword can be followed by a list of user name patterns,
+             separated by spaces.  If specified, login is allowed only for
+             user names that match one of the patterns.  Only user names are
+             valid; a numerical user ID is not recognized.  By default, login
+             is allowed for all users.  If the pattern takes the form
+             USER@HOST then USER and HOST are separately checked, restricting
+             logins to particular users from particular hosts.  HOST criteria
+             may additionally contain addresses to match in CIDR
+             address/masklen format.  The allow/deny users directives are
+             processed in the following order: DenyUsers, AllowUsers.
+
+             See PATTERNS in ssh_config(5) for more information on patterns.
+
+     AuthenticationMethods
+             Specifies the authentication methods that must be successfully
+             completed for a user to be granted access.  This option must be
+             followed by one or more lists of comma-separated authentication
+             method names, or by the single string any to indicate the default
+             behaviour of accepting any single authentication method.  If the
+             default is overridden, then successful authentication requires
+             completion of every method in at least one of these lists.
+
+             For example, "publickey,password publickey,keyboard-interactive"
+             would require the user to complete public key authentication,
+             followed by either password or keyboard interactive
+             authentication.  Only methods that are next in one or more lists
+             are offered at each stage, so for this example it would not be
+             possible to attempt password or keyboard-interactive
+             authentication before public key.
+
+             For keyboard interactive authentication it is also possible to
+             restrict authentication to a specific device by appending a colon
+             followed by the device identifier bsdauth or pam.  depending on
+             the server configuration.  For example,
+             "keyboard-interactive:bsdauth" would restrict keyboard
+             interactive authentication to the bsdauth device.
+
+             If the publickey method is listed more than once, sshd(8)
+             verifies that keys that have been used successfully are not
+             reused for subsequent authentications.  For example,
+             "publickey,publickey" requires successful authentication using
+             two different public keys.
+
+             Note that each authentication method listed should also be
+             explicitly enabled in the configuration.
+
+             The available authentication methods are: "gssapi-with-mic",
+             "hostbased", "keyboard-interactive", "none" (used for access to
+             password-less accounts when PermitEmptyPasswords is enabled),
+             "password" and "publickey".
+
+     AuthorizedKeysCommand
+             Specifies a program to be used to look up the user's public keys.
+             The program must be owned by root, not writable by group or
+             others and specified by an absolute path.  Arguments to
+             AuthorizedKeysCommand accept the tokens described in the TOKENS
+             section.  If no arguments are specified then the username of the
+             target user is used.
+
+             The program should produce on standard output zero or more lines
+             of authorized_keys output (see AUTHORIZED_KEYS in sshd(8)).  If a
+             key supplied by AuthorizedKeysCommand does not successfully
+             authenticate and authorize the user then public key
+             authentication continues using the usual AuthorizedKeysFile
+             files.  By default, no AuthorizedKeysCommand is run.
+
+     AuthorizedKeysCommandUser
+             Specifies the user under whose account the AuthorizedKeysCommand
+             is run.  It is recommended to use a dedicated user that has no
+             other role on the host than running authorized keys commands.  If
+             AuthorizedKeysCommand is specified but AuthorizedKeysCommandUser
+             is not, then sshd(8) will refuse to start.
+
+     AuthorizedKeysFile
+             Specifies the file that contains the public keys used for user
+             authentication.  The format is described in the AUTHORIZED_KEYS
+             FILE FORMAT section of sshd(8).  Arguments to AuthorizedKeysFile
+             accept the tokens described in the TOKENS section.  After
+             expansion, AuthorizedKeysFile is taken to be an absolute path or
+             one relative to the user's home directory.  Multiple files may be
+             listed, separated by whitespace.  Alternately this option may be
+             set to none to skip checking for user keys in files.  The default
+             is ".ssh/authorized_keys .ssh/authorized_keys2".
+
+     AuthorizedPrincipalsCommand
+             Specifies a program to be used to generate the list of allowed
+             certificate principals as per AuthorizedPrincipalsFile.  The
+             program must be owned by root, not writable by group or others
+             and specified by an absolute path.  Arguments to
+             AuthorizedPrincipalsCommand accept the tokens described in the
+             TOKENS section.  If no arguments are specified then the username
+             of the target user is used.
+
+             The program should produce on standard output zero or more lines
+             of AuthorizedPrincipalsFile output.  If either
+             AuthorizedPrincipalsCommand or AuthorizedPrincipalsFile is
+             specified, then certificates offered by the client for
+             authentication must contain a principal that is listed.  By
+             default, no AuthorizedPrincipalsCommand is run.
+
+     AuthorizedPrincipalsCommandUser
+             Specifies the user under whose account the
+             AuthorizedPrincipalsCommand is run.  It is recommended to use a
+             dedicated user that has no other role on the host than running
+             authorized principals commands.  If AuthorizedPrincipalsCommand
+             is specified but AuthorizedPrincipalsCommandUser is not, then
+             sshd(8) will refuse to start.
+
+     AuthorizedPrincipalsFile
+             Specifies a file that lists principal names that are accepted for
+             certificate authentication.  When using certificates signed by a
+             key listed in TrustedUserCAKeys, this file lists names, one of
+             which must appear in the certificate for it to be accepted for
+             authentication.  Names are listed one per line preceded by key
+             options (as described in AUTHORIZED_KEYS FILE FORMAT in sshd(8)).
+             Empty lines and comments starting with M-bM-^@M-^X#M-bM-^@M-^Y are ignored.
+
+             Arguments to AuthorizedPrincipalsFile accept the tokens described
+             in the TOKENS section.  After expansion, AuthorizedPrincipalsFile
+             is taken to be an absolute path or one relative to the user's
+             home directory.  The default is none, i.e. not to use a
+             principals file M-bM-^@M-^S in this case, the username of the user must
+             appear in a certificate's principals list for it to be accepted.
+
+             Note that AuthorizedPrincipalsFile is only used when
+             authentication proceeds using a CA listed in TrustedUserCAKeys
+             and is not consulted for certification authorities trusted via
+             ~/.ssh/authorized_keys, though the principals= key option offers
+             a similar facility (see sshd(8) for details).
+
+     Banner  The contents of the specified file are sent to the remote user
+             before authentication is allowed.  If the argument is none then
+             no banner is displayed.  By default, no banner is displayed.
+
+     CASignatureAlgorithms
+             Specifies which algorithms are allowed for signing of
+             certificates by certificate authorities (CAs).  The default is:
+
+                   ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
+                   ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa
+
+             Certificates signed using other algorithms will not be accepted
+             for public key or host-based authentication.
+
+     ChallengeResponseAuthentication
+             Specifies whether challenge-response authentication is allowed
+             (e.g. via PAM or through authentication styles supported in
+             login.conf(5)) The default is yes.
+
+     ChrootDirectory
+             Specifies the pathname of a directory to chroot(2) to after
+             authentication.  At session startup sshd(8) checks that all
+             components of the pathname are root-owned directories which are
+             not writable by any other user or group.  After the chroot,
+             sshd(8) changes the working directory to the user's home
+             directory.  Arguments to ChrootDirectory accept the tokens
+             described in the TOKENS section.
+
+             The ChrootDirectory must contain the necessary files and
+             directories to support the user's session.  For an interactive
+             session this requires at least a shell, typically sh(1), and
+             basic /dev nodes such as null(4), zero(4), stdin(4), stdout(4),
+             stderr(4), and tty(4) devices.  For file transfer sessions using
+             SFTP no additional configuration of the environment is necessary
+             if the in-process sftp-server is used, though sessions which use
+             logging may require /dev/log inside the chroot directory on some
+             operating systems (see sftp-server(8) for details).
+
+             For safety, it is very important that the directory hierarchy be
+             prevented from modification by other processes on the system
+             (especially those outside the jail).  Misconfiguration can lead
+             to unsafe environments which sshd(8) cannot detect.
+
+             The default is none, indicating not to chroot(2).
+
+     Ciphers
+             Specifies the ciphers allowed.  Multiple ciphers must be comma-
+             separated.  If the specified list begins with a M-bM-^@M-^X+M-bM-^@M-^Y character,
+             then the specified ciphers will be appended to the default set
+             instead of replacing them.  If the specified list begins with a
+             M-bM-^@M-^X-M-bM-^@M-^Y character, then the specified ciphers (including wildcards)
+             will be removed from the default set instead of replacing them.
+             If the specified list begins with a M-bM-^@M-^X^M-bM-^@M-^Y character, then the
+             specified ciphers will be placed at the head of the default set.
+
+             The supported ciphers are:
+
+                   3des-cbc
+                   aes128-cbc
+                   aes192-cbc
+                   aes256-cbc
+                   aes128-ctr
+                   aes192-ctr
+                   aes256-ctr
+                   aes128-gcm@openssh.com
+                   aes256-gcm@openssh.com
+                   chacha20-poly1305@openssh.com
+
+             The default is:
+
+                   chacha20-poly1305@openssh.com,
+                   aes128-ctr,aes192-ctr,aes256-ctr,
+                   aes128-gcm@openssh.com,aes256-gcm@openssh.com
+
+             The list of available ciphers may also be obtained using "ssh -Q
+             cipher".
+
+     ClientAliveCountMax
+             Sets the number of client alive messages which may be sent
+             without sshd(8) receiving any messages back from the client.  If
+             this threshold is reached while client alive messages are being
+             sent, sshd will disconnect the client, terminating the session.
+             It is important to note that the use of client alive messages is
+             very different from TCPKeepAlive.  The client alive messages are
+             sent through the encrypted channel and therefore will not be
+             spoofable.  The TCP keepalive option enabled by TCPKeepAlive is
+             spoofable.  The client alive mechanism is valuable when the
+             client or server depend on knowing when a connection has become
+             unresponsive.
+
+             The default value is 3.  If ClientAliveInterval is set to 15, and
+             ClientAliveCountMax is left at the default, unresponsive SSH
+             clients will be disconnected after approximately 45 seconds.
+             Setting a zero ClientAliveCountMax disables connection
+             termination.
+
+     ClientAliveInterval
+             Sets a timeout interval in seconds after which if no data has
+             been received from the client, sshd(8) will send a message
+             through the encrypted channel to request a response from the
+             client.  The default is 0, indicating that these messages will
+             not be sent to the client.
+
+     Compression
+             Specifies whether compression is enabled after the user has
+             authenticated successfully.  The argument must be yes, delayed (a
+             legacy synonym for yes) or no.  The default is yes.
+
+     DenyGroups
+             This keyword can be followed by a list of group name patterns,
+             separated by spaces.  Login is disallowed for users whose primary
+             group or supplementary group list matches one of the patterns.
+             Only group names are valid; a numerical group ID is not
+             recognized.  By default, login is allowed for all groups.  The
+             allow/deny groups directives are processed in the following
+             order: DenyGroups, AllowGroups.
+
+             See PATTERNS in ssh_config(5) for more information on patterns.
+
+     DenyUsers
+             This keyword can be followed by a list of user name patterns,
+             separated by spaces.  Login is disallowed for user names that
+             match one of the patterns.  Only user names are valid; a
+             numerical user ID is not recognized.  By default, login is
+             allowed for all users.  If the pattern takes the form USER@HOST
+             then USER and HOST are separately checked, restricting logins to
+             particular users from particular hosts.  HOST criteria may
+             additionally contain addresses to match in CIDR address/masklen
+             format.  The allow/deny users directives are processed in the
+             following order: DenyUsers, AllowUsers.
+
+             See PATTERNS in ssh_config(5) for more information on patterns.
+
+     DisableForwarding
+             Disables all forwarding features, including X11, ssh-agent(1),
+             TCP and StreamLocal.  This option overrides all other forwarding-
+             related options and may simplify restricted configurations.
+
+     ExposeAuthInfo
+             Writes a temporary file containing a list of authentication
+             methods and public credentials (e.g. keys) used to authenticate
+             the user.  The location of the file is exposed to the user
+             session through the SSH_USER_AUTH environment variable.  The
+             default is no.
+
+     FingerprintHash
+             Specifies the hash algorithm used when logging key fingerprints.
+             Valid options are: md5 and sha256.  The default is sha256.
+
+     ForceCommand
+             Forces the execution of the command specified by ForceCommand,
+             ignoring any command supplied by the client and ~/.ssh/rc if
+             present.  The command is invoked by using the user's login shell
+             with the -c option.  This applies to shell, command, or subsystem
+             execution.  It is most useful inside a Match block.  The command
+             originally supplied by the client is available in the
+             SSH_ORIGINAL_COMMAND environment variable.  Specifying a command
+             of internal-sftp will force the use of an in-process SFTP server
+             that requires no support files when used with ChrootDirectory.
+             The default is none.
+
+     GatewayPorts
+             Specifies whether remote hosts are allowed to connect to ports
+             forwarded for the client.  By default, sshd(8) binds remote port
+             forwardings to the loopback address.  This prevents other remote
+             hosts from connecting to forwarded ports.  GatewayPorts can be
+             used to specify that sshd should allow remote port forwardings to
+             bind to non-loopback addresses, thus allowing other hosts to
+             connect.  The argument may be no to force remote port forwardings
+             to be available to the local host only, yes to force remote port
+             forwardings to bind to the wildcard address, or clientspecified
+             to allow the client to select the address to which the forwarding
+             is bound.  The default is no.
+
+     GSSAPIAuthentication
+             Specifies whether user authentication based on GSSAPI is allowed.
+             The default is no.
+
+     GSSAPICleanupCredentials
+             Specifies whether to automatically destroy the user's credentials
+             cache on logout.  The default is yes.
+
+     GSSAPIStrictAcceptorCheck
+             Determines whether to be strict about the identity of the GSSAPI
+             acceptor a client authenticates against.  If set to yes then the
+             client must authenticate against the host service on the current
+             hostname.  If set to no then the client may authenticate against
+             any service key stored in the machine's default store.  This
+             facility is provided to assist with operation on multi homed
+             machines.  The default is yes.
+
+     HostbasedAcceptedKeyTypes
+             Specifies the key types that will be accepted for hostbased
+             authentication as a list of comma-separated patterns.
+             Alternately if the specified list begins with a M-bM-^@M-^X+M-bM-^@M-^Y character,
+             then the specified key types will be appended to the default set
+             instead of replacing them.  If the specified list begins with a
+             M-bM-^@M-^X-M-bM-^@M-^Y character, then the specified key types (including wildcards)
+             will be removed from the default set instead of replacing them.
+             If the specified list begins with a M-bM-^@M-^X^M-bM-^@M-^Y character, then the
+             specified key types will be placed at the head of the default
+             set.  The default for this option is:
+
+                ecdsa-sha2-nistp256-cert-v01@openssh.com,
+                ecdsa-sha2-nistp384-cert-v01@openssh.com,
+                ecdsa-sha2-nistp521-cert-v01@openssh.com,
+                sk-ecdsa-sha2-nistp256-cert-v01@openssh.com,
+                ssh-ed25519-cert-v01@openssh.com,
+                sk-ssh-ed25519-cert-v01@openssh.com,
+                rsa-sha2-512-cert-v01@openssh.com,
+                rsa-sha2-256-cert-v01@openssh.com,
+                ssh-rsa-cert-v01@openssh.com,
+                ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
+                sk-ecdsa-sha2-nistp256@openssh.com,
+                ssh-ed25519,sk-ssh-ed25519@openssh.com,
+                rsa-sha2-512,rsa-sha2-256,ssh-rsa
+
+             The list of available key types may also be obtained using "ssh
+             -Q HostbasedAcceptedKeyTypes".
+
+     HostbasedAuthentication
+             Specifies whether rhosts or /etc/hosts.equiv authentication
+             together with successful public key client host authentication is
+             allowed (host-based authentication).  The default is no.
+
+     HostbasedUsesNameFromPacketOnly
+             Specifies whether or not the server will attempt to perform a
+             reverse name lookup when matching the name in the ~/.shosts,
+             ~/.rhosts, and /etc/hosts.equiv files during
+             HostbasedAuthentication.  A setting of yes means that sshd(8)
+             uses the name supplied by the client rather than attempting to
+             resolve the name from the TCP connection itself.  The default is
+             no.
+
+     HostCertificate
+             Specifies a file containing a public host certificate.  The
+             certificate's public key must match a private host key already
+             specified by HostKey.  The default behaviour of sshd(8) is not to
+             load any certificates.
+
+     HostKey
+             Specifies a file containing a private host key used by SSH.  The
+             defaults are /etc/ssh/ssh_host_ecdsa_key,
+             /etc/ssh/ssh_host_ed25519_key and /etc/ssh/ssh_host_rsa_key.
+
+             Note that sshd(8) will refuse to use a file if it is group/world-
+             accessible and that the HostKeyAlgorithms option restricts which
+             of the keys are actually used by sshd(8).
+
+             It is possible to have multiple host key files.  It is also
+             possible to specify public host key files instead.  In this case
+             operations on the private key will be delegated to an
+             ssh-agent(1).
+
+     HostKeyAgent
+             Identifies the UNIX-domain socket used to communicate with an
+             agent that has access to the private host keys.  If the string
+             "SSH_AUTH_SOCK" is specified, the location of the socket will be
+             read from the SSH_AUTH_SOCK environment variable.
+
+     HostKeyAlgorithms
+             Specifies the host key algorithms that the server offers.  The
+             default for this option is:
+
+                ecdsa-sha2-nistp256-cert-v01@openssh.com,
+                ecdsa-sha2-nistp384-cert-v01@openssh.com,
+                ecdsa-sha2-nistp521-cert-v01@openssh.com,
+                sk-ecdsa-sha2-nistp256-cert-v01@openssh.com,
+                ssh-ed25519-cert-v01@openssh.com,
+                sk-ssh-ed25519-cert-v01@openssh.com,
+                rsa-sha2-512-cert-v01@openssh.com,
+                rsa-sha2-256-cert-v01@openssh.com,
+                ssh-rsa-cert-v01@openssh.com,
+                ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
+                sk-ecdsa-sha2-nistp256@openssh.com,
+                ssh-ed25519,sk-ssh-ed25519@openssh.com,
+                rsa-sha2-512,rsa-sha2-256,ssh-rsa
+
+             The list of available key types may also be obtained using "ssh
+             -Q HostKeyAlgorithms".
+
+     IgnoreRhosts
+             Specifies that .rhosts and .shosts files will not be used in
+             HostbasedAuthentication.
+
+             /etc/hosts.equiv and /etc/shosts.equiv are still used.  The
+             default is yes.
+
+     IgnoreUserKnownHosts
+             Specifies whether sshd(8) should ignore the user's
+             ~/.ssh/known_hosts during HostbasedAuthentication and use only
+             the system-wide known hosts file /etc/ssh/known_hosts.  The
+             default is M-bM-^@M-^\noM-bM-^@M-^].
+
+     Include
+             Include the specified configuration file(s).  Multiple pathnames
+             may be specified and each pathname may contain glob(7) wildcards.
+             Files without absolute paths are assumed to be in /etc/ssh.  An
+             Include directive may appear inside a Match block to perform
+             conditional inclusion.
+
+     IPQoS   Specifies the IPv4 type-of-service or DSCP class for the
+             connection.  Accepted values are af11, af12, af13, af21, af22,
+             af23, af31, af32, af33, af41, af42, af43, cs0, cs1, cs2, cs3,
+             cs4, cs5, cs6, cs7, ef, le, lowdelay, throughput, reliability, a
+             numeric value, or none to use the operating system default.  This
+             option may take one or two arguments, separated by whitespace.
+             If one argument is specified, it is used as the packet class
+             unconditionally.  If two values are specified, the first is
+             automatically selected for interactive sessions and the second
+             for non-interactive sessions.  The default is af21 (Low-Latency
+             Data) for interactive sessions and cs1 (Lower Effort) for non-
+             interactive sessions.
+
+     KbdInteractiveAuthentication
+             Specifies whether to allow keyboard-interactive authentication.
+             The argument to this keyword must be yes or no.  The default is
+             to use whatever value ChallengeResponseAuthentication is set to
+             (by default yes).
+
+     KerberosAuthentication
+             Specifies whether the password provided by the user for
+             PasswordAuthentication will be validated through the Kerberos
+             KDC.  To use this option, the server needs a Kerberos servtab
+             which allows the verification of the KDC's identity.  The default
+             is no.
+
+     KerberosGetAFSToken
+             If AFS is active and the user has a Kerberos 5 TGT, attempt to
+             acquire an AFS token before accessing the user's home directory.
+             The default is no.
+
+     KerberosOrLocalPasswd
+             If password authentication through Kerberos fails then the
+             password will be validated via any additional local mechanism
+             such as /etc/passwd.  The default is yes.
+
+     KerberosTicketCleanup
+             Specifies whether to automatically destroy the user's ticket
+             cache file on logout.  The default is yes.
+
+     KexAlgorithms
+             Specifies the available KEX (Key Exchange) algorithms.  Multiple
+             algorithms must be comma-separated.  Alternately if the specified
+             list begins with a M-bM-^@M-^X+M-bM-^@M-^Y character, then the specified methods will
+             be appended to the default set instead of replacing them.  If the
+             specified list begins with a M-bM-^@M-^X-M-bM-^@M-^Y character, then the specified
+             methods (including wildcards) will be removed from the default
+             set instead of replacing them.  If the specified list begins with
+             a M-bM-^@M-^X^M-bM-^@M-^Y character, then the specified methods will be placed at the
+             head of the default set.  The supported algorithms are:
+
+                   curve25519-sha256
+                   curve25519-sha256@libssh.org
+                   diffie-hellman-group1-sha1
+                   diffie-hellman-group14-sha1
+                   diffie-hellman-group14-sha256
+                   diffie-hellman-group16-sha512
+                   diffie-hellman-group18-sha512
+                   diffie-hellman-group-exchange-sha1
+                   diffie-hellman-group-exchange-sha256
+                   ecdh-sha2-nistp256
+                   ecdh-sha2-nistp384
+                   ecdh-sha2-nistp521
+                   sntrup4591761x25519-sha512@tinyssh.org
+
+             The default is:
+
+                   curve25519-sha256,curve25519-sha256@libssh.org,
+                   ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
+                   diffie-hellman-group-exchange-sha256,
+                   diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,
+                   diffie-hellman-group14-sha256
+
+             The list of available key exchange algorithms may also be
+             obtained using "ssh -Q KexAlgorithms".
+
+     ListenAddress
+             Specifies the local addresses sshd(8) should listen on.  The
+             following forms may be used:
+
+                   ListenAddress hostname|address [rdomain domain]
+                   ListenAddress hostname:port [rdomain domain]
+                   ListenAddress IPv4_address:port [rdomain domain]
+                   ListenAddress [hostname|address]:port [rdomain domain]
+
+             The optional rdomain qualifier requests sshd(8) listen in an
+             explicit routing domain.  If port is not specified, sshd will
+             listen on the address and all Port options specified.  The
+             default is to listen on all local addresses on the current
+             default routing domain.  Multiple ListenAddress options are
+             permitted.  For more information on routing domains, see
+             rdomain(4).
+
+     LoginGraceTime
+             The server disconnects after this time if the user has not
+             successfully logged in.  If the value is 0, there is no time
+             limit.  The default is 120 seconds.
+
+     LogLevel
+             Gives the verbosity level that is used when logging messages from
+             sshd(8).  The possible values are: QUIET, FATAL, ERROR, INFO,
+             VERBOSE, DEBUG, DEBUG1, DEBUG2, and DEBUG3.  The default is INFO.
+             DEBUG and DEBUG1 are equivalent.  DEBUG2 and DEBUG3 each specify
+             higher levels of debugging output.  Logging with a DEBUG level
+             violates the privacy of users and is not recommended.
+
+     MACs    Specifies the available MAC (message authentication code)
+             algorithms.  The MAC algorithm is used for data integrity
+             protection.  Multiple algorithms must be comma-separated.  If the
+             specified list begins with a M-bM-^@M-^X+M-bM-^@M-^Y character, then the specified
+             algorithms will be appended to the default set instead of
+             replacing them.  If the specified list begins with a M-bM-^@M-^X-M-bM-^@M-^Y
+             character, then the specified algorithms (including wildcards)
+             will be removed from the default set instead of replacing them.
+             If the specified list begins with a M-bM-^@M-^X^M-bM-^@M-^Y character, then the
+             specified algorithms will be placed at the head of the default
+             set.
+
+             The algorithms that contain "-etm" calculate the MAC after
+             encryption (encrypt-then-mac).  These are considered safer and
+             their use recommended.  The supported MACs are:
+
+                   hmac-md5
+                   hmac-md5-96
+                   hmac-sha1
+                   hmac-sha1-96
+                   hmac-sha2-256
+                   hmac-sha2-512
+                   umac-64@openssh.com
+                   umac-128@openssh.com
+                   hmac-md5-etm@openssh.com
+                   hmac-md5-96-etm@openssh.com
+                   hmac-sha1-etm@openssh.com
+                   hmac-sha1-96-etm@openssh.com
+                   hmac-sha2-256-etm@openssh.com
+                   hmac-sha2-512-etm@openssh.com
+                   umac-64-etm@openssh.com
+                   umac-128-etm@openssh.com
+
+             The default is:
+
+                   umac-64-etm@openssh.com,umac-128-etm@openssh.com,
+                   hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,
+                   hmac-sha1-etm@openssh.com,
+                   umac-64@openssh.com,umac-128@openssh.com,
+                   hmac-sha2-256,hmac-sha2-512,hmac-sha1
+
+             The list of available MAC algorithms may also be obtained using
+             "ssh -Q mac".
+
+     Match   Introduces a conditional block.  If all of the criteria on the
+             Match line are satisfied, the keywords on the following lines
+             override those set in the global section of the config file,
+             until either another Match line or the end of the file.  If a
+             keyword appears in multiple Match blocks that are satisfied, only
+             the first instance of the keyword is applied.
+
+             The arguments to Match are one or more criteria-pattern pairs or
+             the single token All which matches all criteria.  The available
+             criteria are User, Group, Host, LocalAddress, LocalPort, RDomain,
+             and Address (with RDomain representing the rdomain(4) on which
+             the connection was received).
+
+             The match patterns may consist of single entries or comma-
+             separated lists and may use the wildcard and negation operators
+             described in the PATTERNS section of ssh_config(5).
+
+             The patterns in an Address criteria may additionally contain
+             addresses to match in CIDR address/masklen format, such as
+             192.0.2.0/24 or 2001:db8::/32.  Note that the mask length
+             provided must be consistent with the address - it is an error to
+             specify a mask length that is too long for the address or one
+             with bits set in this host portion of the address.  For example,
+             192.0.2.0/33 and 192.0.2.0/8, respectively.
+
+             Only a subset of keywords may be used on the lines following a
+             Match keyword.  Available keywords are AcceptEnv,
+             AllowAgentForwarding, AllowGroups, AllowStreamLocalForwarding,
+             AllowTcpForwarding, AllowUsers, AuthenticationMethods,
+             AuthorizedKeysCommand, AuthorizedKeysCommandUser,
+             AuthorizedKeysFile, AuthorizedPrincipalsCommand,
+             AuthorizedPrincipalsCommandUser, AuthorizedPrincipalsFile,
+             Banner, ChrootDirectory, ClientAliveCountMax,
+             ClientAliveInterval, DenyGroups, DenyUsers, ForceCommand,
+             GatewayPorts, GSSAPIAuthentication, HostbasedAcceptedKeyTypes,
+             HostbasedAuthentication, HostbasedUsesNameFromPacketOnly,
+             Include, IPQoS, KbdInteractiveAuthentication,
+             KerberosAuthentication, LogLevel, MaxAuthTries, MaxSessions,
+             PasswordAuthentication, PermitEmptyPasswords, PermitListen,
+             PermitOpen, PermitRootLogin, PermitTTY, PermitTunnel,
+             PermitUserRC, PubkeyAcceptedKeyTypes, PubkeyAuthentication,
+             RekeyLimit, RevokedKeys, RDomain, SetEnv, StreamLocalBindMask,
+             StreamLocalBindUnlink, TrustedUserCAKeys, X11DisplayOffset,
+             X11Forwarding and X11UseLocalhost.
+
+     MaxAuthTries
+             Specifies the maximum number of authentication attempts permitted
+             per connection.  Once the number of failures reaches half this
+             value, additional failures are logged.  The default is 6.
+
+     MaxSessions
+             Specifies the maximum number of open shell, login or subsystem
+             (e.g. sftp) sessions permitted per network connection.  Multiple
+             sessions may be established by clients that support connection
+             multiplexing.  Setting MaxSessions to 1 will effectively disable
+             session multiplexing, whereas setting it to 0 will prevent all
+             shell, login and subsystem sessions while still permitting
+             forwarding.  The default is 10.
+
+     MaxStartups
+             Specifies the maximum number of concurrent unauthenticated
+             connections to the SSH daemon.  Additional connections will be
+             dropped until authentication succeeds or the LoginGraceTime
+             expires for a connection.  The default is 10:30:100.
+
+             Alternatively, random early drop can be enabled by specifying the
+             three colon separated values start:rate:full (e.g. "10:30:60").
+             sshd(8) will refuse connection attempts with a probability of
+             rate/100 (30%) if there are currently start (10) unauthenticated
+             connections.  The probability increases linearly and all
+             connection attempts are refused if the number of unauthenticated
+             connections reaches full (60).
+
+     PasswordAuthentication
+             Specifies whether password authentication is allowed.  The
+             default is yes.
+
+     PermitEmptyPasswords
+             When password authentication is allowed, it specifies whether the
+             server allows login to accounts with empty password strings.  The
+             default is no.
+
+     PermitListen
+             Specifies the addresses/ports on which a remote TCP port
+             forwarding may listen.  The listen specification must be one of
+             the following forms:
+
+                   PermitListen port
+                   PermitListen host:port
+
+             Multiple permissions may be specified by separating them with
+             whitespace.  An argument of any can be used to remove all
+             restrictions and permit any listen requests.  An argument of none
+             can be used to prohibit all listen requests.  The host name may
+             contain wildcards as described in the PATTERNS section in
+             ssh_config(5).  The wildcard M-bM-^@M-^X*M-bM-^@M-^Y can also be used in place of a
+             port number to allow all ports.  By default all port forwarding
+             listen requests are permitted.  Note that the GatewayPorts option
+             may further restrict which addresses may be listened on.  Note
+             also that ssh(1) will request a listen host of M-bM-^@M-^\localhostM-bM-^@M-^] if no
+             listen host was specifically requested, and this name is treated
+             differently to explicit localhost addresses of M-bM-^@M-^\127.0.0.1M-bM-^@M-^] and
+             M-bM-^@M-^\::1M-bM-^@M-^].
+
+     PermitOpen
+             Specifies the destinations to which TCP port forwarding is
+             permitted.  The forwarding specification must be one of the
+             following forms:
+
+                   PermitOpen host:port
+                   PermitOpen IPv4_addr:port
+                   PermitOpen [IPv6_addr]:port
+
+             Multiple forwards may be specified by separating them with
+             whitespace.  An argument of any can be used to remove all
+             restrictions and permit any forwarding requests.  An argument of
+             none can be used to prohibit all forwarding requests.  The
+             wildcard M-bM-^@M-^X*M-bM-^@M-^Y can be used for host or port to allow all hosts or
+             ports respectively.  Otherwise, no pattern matching or address
+             lookups are performed on supplied names.  By default all port
+             forwarding requests are permitted.
+
+     PermitRootLogin
+             Specifies whether root can log in using ssh(1).  The argument
+             must be yes, prohibit-password, forced-commands-only, or no.  The
+             default is prohibit-password.
+
+             If this option is set to prohibit-password (or its deprecated
+             alias, without-password), password and keyboard-interactive
+             authentication are disabled for root.
+
+             If this option is set to forced-commands-only, root login with
+             public key authentication will be allowed, but only if the
+             command option has been specified (which may be useful for taking
+             remote backups even if root login is normally not allowed).  All
+             other authentication methods are disabled for root.
+
+             If this option is set to no, root is not allowed to log in.
+
+     PermitTTY
+             Specifies whether pty(4) allocation is permitted.  The default is
+             yes.
+
+     PermitTunnel
+             Specifies whether tun(4) device forwarding is allowed.  The
+             argument must be yes, point-to-point (layer 3), ethernet (layer
+             2), or no.  Specifying yes permits both point-to-point and
+             ethernet.  The default is no.
+
+             Independent of this setting, the permissions of the selected
+             tun(4) device must allow access to the user.
+
+     PermitUserEnvironment
+             Specifies whether ~/.ssh/environment and environment= options in
+             ~/.ssh/authorized_keys are processed by sshd(8).  Valid options
+             are yes, no or a pattern-list specifying which environment
+             variable names to accept (for example "LANG,LC_*").  The default
+             is no.  Enabling environment processing may enable users to
+             bypass access restrictions in some configurations using
+             mechanisms such as LD_PRELOAD.
+
+     PermitUserRC
+             Specifies whether any ~/.ssh/rc file is executed.  The default is
+             yes.
+
+     PidFile
+             Specifies the file that contains the process ID of the SSH
+             daemon, or none to not write one.  The default is
+             /var/run/sshd.pid.
+
+     Port    Specifies the port number that sshd(8) listens on.  The default
+             is 22.  Multiple options of this type are permitted.  See also
+             ListenAddress.
+
+     PrintLastLog
+             Specifies whether sshd(8) should print the date and time of the
+             last user login when a user logs in interactively.  The default
+             is yes.
+
+     PrintMotd
+             Specifies whether sshd(8) should print /etc/motd when a user logs
+             in interactively.  (On some systems it is also printed by the
+             shell, /etc/profile, or equivalent.)  The default is yes.
+
+     PubkeyAcceptedKeyTypes
+             Specifies the key types that will be accepted for public key
+             authentication as a list of comma-separated patterns.
+             Alternately if the specified list begins with a M-bM-^@M-^X+M-bM-^@M-^Y character,
+             then the specified key types will be appended to the default set
+             instead of replacing them.  If the specified list begins with a
+             M-bM-^@M-^X-M-bM-^@M-^Y character, then the specified key types (including wildcards)
+             will be removed from the default set instead of replacing them.
+             If the specified list begins with a M-bM-^@M-^X^M-bM-^@M-^Y character, then the
+             specified key types will be placed at the head of the default
+             set.  The default for this option is:
+
+                ecdsa-sha2-nistp256-cert-v01@openssh.com,
+                ecdsa-sha2-nistp384-cert-v01@openssh.com,
+                ecdsa-sha2-nistp521-cert-v01@openssh.com,
+                sk-ecdsa-sha2-nistp256-cert-v01@openssh.com,
+                ssh-ed25519-cert-v01@openssh.com,
+                sk-ssh-ed25519-cert-v01@openssh.com,
+                rsa-sha2-512-cert-v01@openssh.com,
+                rsa-sha2-256-cert-v01@openssh.com,
+                ssh-rsa-cert-v01@openssh.com,
+                ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
+                sk-ecdsa-sha2-nistp256@openssh.com,
+                ssh-ed25519,sk-ssh-ed25519@openssh.com,
+                rsa-sha2-512,rsa-sha2-256,ssh-rsa
+
+             The list of available key types may also be obtained using "ssh
+             -Q PubkeyAcceptedKeyTypes".
+
+     PubkeyAuthOptions
+             Sets one or more public key authentication options.  Two option
+             keywords are currently supported: none (the default; indicating
+             no additional options are enabled) and touch-required.
+
+             The touch-required option causes public key authentication using
+             a FIDO authenticator algorithm (i.e. ecdsa-sk or ed25519-sk) to
+             always require the signature to attest that a physically present
+             user explicitly confirmed the authentication (usually by touching
+             the authenticator).  By default, sshd(8) requires user presence
+             unless overridden with an authorized_keys option.  The
+             touch-required flag disables this override.  This option has no
+             effect for other, non-authenticator public key types.
+
+     PubkeyAuthentication
+             Specifies whether public key authentication is allowed.  The
+             default is yes.
+
+     RekeyLimit
+             Specifies the maximum amount of data that may be transmitted
+             before the session key is renegotiated, optionally followed a
+             maximum amount of time that may pass before the session key is
+             renegotiated.  The first argument is specified in bytes and may
+             have a suffix of M-bM-^@M-^XKM-bM-^@M-^Y, M-bM-^@M-^XMM-bM-^@M-^Y, or M-bM-^@M-^XGM-bM-^@M-^Y to indicate Kilobytes,
+             Megabytes, or Gigabytes, respectively.  The default is between
+             M-bM-^@M-^X1GM-bM-^@M-^Y and M-bM-^@M-^X4GM-bM-^@M-^Y, depending on the cipher.  The optional second
+             value is specified in seconds and may use any of the units
+             documented in the TIME FORMATS section.  The default value for
+             RekeyLimit is default none, which means that rekeying is
+             performed after the cipher's default amount of data has been sent
+             or received and no time based rekeying is done.
+
+     RevokedKeys
+             Specifies revoked public keys file, or none to not use one.  Keys
+             listed in this file will be refused for public key
+             authentication.  Note that if this file is not readable, then
+             public key authentication will be refused for all users.  Keys
+             may be specified as a text file, listing one public key per line,
+             or as an OpenSSH Key Revocation List (KRL) as generated by
+             ssh-keygen(1).  For more information on KRLs, see the KEY
+             REVOCATION LISTS section in ssh-keygen(1).
+
+     RDomain
+             Specifies an explicit routing domain that is applied after
+             authentication has completed.  The user session, as well and any
+             forwarded or listening IP sockets, will be bound to this
+             rdomain(4).  If the routing domain is set to %D, then the domain
+             in which the incoming connection was received will be applied.
+
+     SecurityKeyProvider
+             Specifies a path to a library that will be used when loading FIDO
+             authenticator-hosted keys, overriding the default of using the
+             built-in USB HID support.
+
+     SetEnv  Specifies one or more environment variables to set in child
+             sessions started by sshd(8) as M-bM-^@M-^\NAME=VALUEM-bM-^@M-^].  The environment
+             value may be quoted (e.g. if it contains whitespace characters).
+             Environment variables set by SetEnv override the default
+             environment and any variables specified by the user via AcceptEnv
+             or PermitUserEnvironment.
+
+     StreamLocalBindMask
+             Sets the octal file creation mode mask (umask) used when creating
+             a Unix-domain socket file for local or remote port forwarding.
+             This option is only used for port forwarding to a Unix-domain
+             socket file.
+
+             The default value is 0177, which creates a Unix-domain socket
+             file that is readable and writable only by the owner.  Note that
+             not all operating systems honor the file mode on Unix-domain
+             socket files.
+
+     StreamLocalBindUnlink
+             Specifies whether to remove an existing Unix-domain socket file
+             for local or remote port forwarding before creating a new one.
+             If the socket file already exists and StreamLocalBindUnlink is
+             not enabled, sshd will be unable to forward the port to the Unix-
+             domain socket file.  This option is only used for port forwarding
+             to a Unix-domain socket file.
+
+             The argument must be yes or no.  The default is no.
+
+     StrictModes
+             Specifies whether sshd(8) should check file modes and ownership
+             of the user's files and home directory before accepting login.
+             This is normally desirable because novices sometimes accidentally
+             leave their directory or files world-writable.  The default is
+             yes.  Note that this does not apply to ChrootDirectory, whose
+             permissions and ownership are checked unconditionally.
+
+     Subsystem
+             Configures an external subsystem (e.g. file transfer daemon).
+             Arguments should be a subsystem name and a command (with optional
+             arguments) to execute upon subsystem request.
+
+             The command sftp-server implements the SFTP file transfer
+             subsystem.
+
+             Alternately the name internal-sftp implements an in-process SFTP
+             server.  This may simplify configurations using ChrootDirectory
+             to force a different filesystem root on clients.
+
+             By default no subsystems are defined.
+
+     SyslogFacility
+             Gives the facility code that is used when logging messages from
+             sshd(8).  The possible values are: DAEMON, USER, AUTH, LOCAL0,
+             LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.  The
+             default is AUTH.
+
+     TCPKeepAlive
+             Specifies whether the system should send TCP keepalive messages
+             to the other side.  If they are sent, death of the connection or
+             crash of one of the machines will be properly noticed.  However,
+             this means that connections will die if the route is down
+             temporarily, and some people find it annoying.  On the other
+             hand, if TCP keepalives are not sent, sessions may hang
+             indefinitely on the server, leaving "ghost" users and consuming
+             server resources.
+
+             The default is yes (to send TCP keepalive messages), and the
+             server will notice if the network goes down or the client host
+             crashes.  This avoids infinitely hanging sessions.
+
+             To disable TCP keepalive messages, the value should be set to no.
+
+     TrustedUserCAKeys
+             Specifies a file containing public keys of certificate
+             authorities that are trusted to sign user certificates for
+             authentication, or none to not use one.  Keys are listed one per
+             line; empty lines and comments starting with M-bM-^@M-^X#M-bM-^@M-^Y are allowed.  If
+             a certificate is presented for authentication and has its signing
+             CA key listed in this file, then it may be used for
+             authentication for any user listed in the certificate's
+             principals list.  Note that certificates that lack a list of
+             principals will not be permitted for authentication using
+             TrustedUserCAKeys.  For more details on certificates, see the
+             CERTIFICATES section in ssh-keygen(1).
+
+     UseDNS  Specifies whether sshd(8) should look up the remote host name,
+             and to check that the resolved host name for the remote IP
+             address maps back to the very same IP address.
+
+             If this option is set to no (the default) then only addresses and
+             not host names may be used in ~/.ssh/authorized_keys from and
+             sshd_config Match Host directives.
+
+     UsePAM  Enables the Pluggable Authentication Module interface.  If set to
+             yes this will enable PAM authentication using
+             ChallengeResponseAuthentication and PasswordAuthentication in
+             addition to PAM account and session module processing for all
+             authentication types.
+
+             Because PAM challenge-response authentication usually serves an
+             equivalent role to password authentication, you should disable
+             either PasswordAuthentication or ChallengeResponseAuthentication.
+
+             If UsePAM is enabled, you will not be able to run sshd(8) as a
+             non-root user.  The default is no.
+
+     VersionAddendum
+             Optionally specifies additional text to append to the SSH
+             protocol banner sent by the server upon connection.  The default
+             is none.
+
+     X11DisplayOffset
+             Specifies the first display number available for sshd(8)'s X11
+             forwarding.  This prevents sshd from interfering with real X11
+             servers.  The default is 10.
+
+     X11Forwarding
+             Specifies whether X11 forwarding is permitted.  The argument must
+             be yes or no.  The default is no.
+
+             When X11 forwarding is enabled, there may be additional exposure
+             to the server and to client displays if the sshd(8) proxy display
+             is configured to listen on the wildcard address (see
+             X11UseLocalhost), though this is not the default.  Additionally,
+             the authentication spoofing and authentication data verification
+             and substitution occur on the client side.  The security risk of
+             using X11 forwarding is that the client's X11 display server may
+             be exposed to attack when the SSH client requests forwarding (see
+             the warnings for ForwardX11 in ssh_config(5)).  A system
+             administrator may have a stance in which they want to protect
+             clients that may expose themselves to attack by unwittingly
+             requesting X11 forwarding, which can warrant a no setting.
+
+             Note that disabling X11 forwarding does not prevent users from
+             forwarding X11 traffic, as users can always install their own
+             forwarders.
+
+     X11UseLocalhost
+             Specifies whether sshd(8) should bind the X11 forwarding server
+             to the loopback address or to the wildcard address.  By default,
+             sshd binds the forwarding server to the loopback address and sets
+             the hostname part of the DISPLAY environment variable to
+             localhost.  This prevents remote hosts from connecting to the
+             proxy display.  However, some older X11 clients may not function
+             with this configuration.  X11UseLocalhost may be set to no to
+             specify that the forwarding server should be bound to the
+             wildcard address.  The argument must be yes or no.  The default
+             is yes.
+
+     XAuthLocation
+             Specifies the full pathname of the xauth(1) program, or none to
+             not use one.  The default is /usr/X11R6/bin/xauth.
+
+TIME FORMATS
+     sshd(8) command-line arguments and configuration file options that
+     specify time may be expressed using a sequence of the form:
+     time[qualifier], where time is a positive integer value and qualifier is
+     one of the following:
+
+           M-bM-^_M-(noneM-bM-^_M-)  seconds
+           s | S   seconds
+           m | M   minutes
+           h | H   hours
+           d | D   days
+           w | W   weeks
+
+     Each member of the sequence is added together to calculate the total time
+     value.
+
+     Time format examples:
+
+           600     600 seconds (10 minutes)
+           10m     10 minutes
+           1h30m   1 hour 30 minutes (90 minutes)
+
+TOKENS
+     Arguments to some keywords can make use of tokens, which are expanded at
+     runtime:
+
+           %%    A literal M-bM-^@M-^X%M-bM-^@M-^Y.
+           %D    The routing domain in which the incoming connection was
+                 received.
+           %F    The fingerprint of the CA key.
+           %f    The fingerprint of the key or certificate.
+           %h    The home directory of the user.
+           %i    The key ID in the certificate.
+           %K    The base64-encoded CA key.
+           %k    The base64-encoded key or certificate for authentication.
+           %s    The serial number of the certificate.
+           %T    The type of the CA key.
+           %t    The key or certificate type.
+           %U    The numeric user ID of the target user.
+           %u    The username.
+
+     AuthorizedKeysCommand accepts the tokens %%, %f, %h, %k, %t, %U, and %u.
+
+     AuthorizedKeysFile accepts the tokens %%, %h, %U, and %u.
+
+     AuthorizedPrincipalsCommand accepts the tokens %%, %F, %f, %h, %i, %K,
+     %k, %s, %T, %t, %U, and %u.
+
+     AuthorizedPrincipalsFile accepts the tokens %%, %h, %U, and %u.
+
+     ChrootDirectory accepts the tokens %%, %h, %U, and %u.
+
+     RoutingDomain accepts the token %D.
+
+FILES
+     /etc/ssh/sshd_config
+             Contains configuration data for sshd(8).  This file should be
+             writable by root only, but it is recommended (though not
+             necessary) that it be world-readable.
+
+SEE ALSO
+     sftp-server(8), sshd(8)
+
+AUTHORS
+     OpenSSH is a derivative of the original and free ssh 1.2.12 release by
+     Tatu Ylonen.  Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo
+     de Raadt and Dug Song removed many bugs, re-added newer features and
+     created OpenSSH.  Markus Friedl contributed the support for SSH protocol
+     versions 1.5 and 2.0.  Niels Provos and Markus Friedl contributed support
+     for privilege separation.
+
+OpenBSD 6.6                    February 7, 2020                    OpenBSD 6.6