ChangeLog   [plain text]

 - (djm) OpenBSD CVS Sync
   - 2008/07/18 22:51:01
     no need for .Pp before or after .Sh;
   - 2008/07/21 08:19:07
 - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
   [contrib/suse/openssh.spec] Update version number in README and RPM specs
 - (djm) Release OpenSSH-5.1

 - (djm) OpenBSD CVS Sync
   - 2008/07/17 08:48:00
     strnvis preauth banner; pointed out by mpf@ ok markus@
   - 2008/07/17 08:51:07
     strip trailing '.' from hostname when HostbasedUsesNameFromPacketOnly=yes
     report and patch from res AT (bz#1200); ok markus@
 - (dtucker) [openbsd-compat/bsd-cygwin_util.c]  Remove long-unneeded compat
   code, replace with equivalent cygwin library call.  Patch from vinschen
   at, ok djm@.
 - (djm) [sshconnect2.c] vis.h isn't available everywhere

 - OpenBSD CVS Sync
   - 2008/07/15 02:23:14
     number of pipelined requests is now 64;
     prodded by Iain.Morgan AT
   - 2008/07/16 11:51:14
     rename variable first_gc -> last_gc (since it is actually the last
     in the list).
   - 2008/07/16 11:52:19
     this loop index should be automatic, not static

 - (djm) OpenBSD CVS Sync
   - 2008/07/13 21:22:52
     Change "ssh-keygen -F [host] -l" to not display random art unless
     -v is also specified, making it consistent with the manual and other
     uses of -l.
     ok grunk@
   - 2008/07/13 22:13:07
     use struct sockaddr_storage instead of struct sockaddr for accept(2)
     address argument. from visibilis AT in bz#1485; ok markus@
   - 2008/07/13 22:16:03
     increase number of piplelined requests so they properly fill the
     (recently increased) channel window. prompted by rapier AT;
     ok markus@
   - 2008/07/14 01:55:56
     mention requirement for /dev/log inside chroot when using sftp-server
     with ChrootDirectory
 - (djm) [openbsd-compat/bindresvport.c] Rename variables s/sin/in/ to
   avoid clash with sin(3) function; reported by
   cristian.ionescu-idbohrn AT
 - (djm) [openbsd-compat/rresvport.c] Add unistd.h for missing close()
   prototype; reported by cristian.ionescu-idbohrn AT
 - (djm) [umac.c] Rename variable s/buffer_ptr/bufp/ to avoid clash;
   reported by cristian.ionescu-idbohrn AT
 - (djm) [contrib/cygwin/Makefile contrib/cygwin/ssh-host-config]
   [contrib/cygwin/ssh-user-config contrib/cygwin/sshd-inetd]
   Revamped and simplified Cygwin ssh-host-config script that uses
   unified csih configuration tool. Requires recent Cygwin.
   Patch from vinschen AT

 - (djm) OpenBSD CVS Sync
   - 2008/07/12 04:52:50
     unbreak; move clearing of cctx struct to before first use
     reported by dkrause@
   - 2008/07/12 05:33:41
     better description for -i flag:
     s/RSA authentication/public key authentication/
 - (djm) [openbsd-compat/fake-rfc2553.c openbsd-compat/fake-rfc2553.h]
   return EAI_FAMILY when trying to lookup unsupported address family;
   from vinschen AT

 - (djm) OpenBSD CVS Sync
   - 2008/07/07 00:31:41
     we don't need arg after the debug3() was removed.  from lint.
     ok djm@
   - 2008/07/07 23:32:51
     /*NOTREACHED*/ for lint warning:
       warning: function key_equal falls off bottom without returning value
     ok djm@
   - 2008/07/10 18:05:58
     missing bzero; from mickey; ok djm@
   - 2008/07/10 18:08:11
     [clientloop.c monitor.c monitor_wrap.c packet.c packet.h sshd.c]
     sync v1 and v2 traffic accounting; add it to sshd, too;
     ok djm@, dtucker@

 - (djm) [] Print "all tests passed" when all regress tests pass
 - (djm) [auth1.c] Fix format string vulnerability in protocol 1 PAM
   account check failure path. The vulnerable format buffer is supplied
   from PAM and should not contain attacker-supplied data.
 - (djm) [auth.c] Missing unistd.h for close()
 - (djm) [] Add -Wformat-security to CFLAGS for gcc 3.x and 4.x

 - (djm) [auth.c] Fixed test for locked account on HP/UX with shadowed
   passwords disabled. bz#1083 report & patch from senthilkumar_sen AT, w/ dtucker@
 - (djm) [atomicio.c] Disable poll() fallback in atomiciov for
   Tru64. readv doesn't seem to be a comparable object there.
   bz#1386, patch from dtucker@ ok me
 - (djm) [] Pass though pass to conch for interop tests
 - (djm) [] unbreak: remove extra closing brace
 - (djm) OpenBSD CVS Sync
   - 2008/07/04 23:08:25
     handle EINTR in packet_write_poll()l ok dtucker@
   - 2008/07/04 23:30:16
     [auth1.c auth2.c]
     Make protocol 1 MaxAuthTries logic match protocol 2's.
     Do not treat the first protocol 2 authentication attempt as
     a failure IFF it is for method "none".
     Makes MaxAuthTries' user-visible behaviour identical for
     protocol 1 vs 2.
     ok dtucker@
   - 2008/07/05 05:16:01

 - (dtucker) OpenBSD CVS Sync
   - 2008/07/02 13:30:34
     really really remove the freebie "none" auth try for protocol 2
   - 2008/07/02 13:47:39
     [ssh.1 ssh.c]
     When forking after authentication ("ssh -f") with ExitOnForwardFailure
     enabled, delay the fork until after replies for any -R forwards have
     been seen. Allows for robust detection of -R forward failure when
     using -f (similar to bz#92); ok dtucker@
   - 2008/07/03 21:46:58
     avoid nasty double free; ok dtucker@ djm@
   - 2008/07/04 03:44:59
     [servconf.c groupaccess.h groupaccess.c]
     support negation of groups in "Match group" block (bz#1315); ok dtucker@
   - 2008/07/04 03:47:02
     Make debug a little clearer.  ok djm@
   - 2008/06/30 08:07:34
     shell portability: use "=" instead of "==" in test(1) expressions,
     double-quote string with backslash escaped /
   - 2008/06/30 10:31:11
     remove "set -e" left over from debugging
   - 2008/06/30 10:43:03
     explicitly disable conch options that could interfere with the test
 - (dtucker) [sftp-server.c] Bug #1447: fall back to racy rename if link
   returns EXDEV.  Patch from Mike Garrison, ok djm@
 - (djm) [atomicio.c channels.c clientloop.c defines.h includes.h]
   [packet.c scp.c serverloop.c sftp-client.c ssh-agent.c ssh-keyscan.c]
   [sshd.c] Explicitly handle EWOULDBLOCK wherever we handle EAGAIN, on
   some platforms (HP nonstop) it is a distinct errno;
   bz#1467 reported by sconeu AT; ok dtucker@

 - (dtucker) OpenBSD CVS Sync
    - 2008/06/30 08:05:59
      typo: s/constraint_date/constraint_data/
   - 2008/06/30 12:15:39
     only pass channel requests on session channels through to the session
     channel handler, avoiding spurious log messages; ok! markus@
   - 2008/06/30 12:16:02
     only send notifications for session channels; ok! markus@
   - 2008/06/30 12:18:34
     clarify that is only sent on session channels
   - 2008/07/01 07:20:52
     Check ExitOnForwardFailure if forwardings are disabled due to a failed
     host key check.  ok djm@
   - 2008/07/01 07:24:22
     [sshconnect.c sshd.c]
     Send CR LF during protocol banner exchanges, but only for Protocol 2 only,
     in order to comply with RFC 4253.  bz #1443, ok djm@
   - 2008/07/01 23:12:47
     fix some typos; ok djm@
   - 2008/07/02 02:24:18
     [sshd_config sshd_config.5 sshd.8 servconf.c]
     increase default size of ssh protocol 1 ephemeral key from 768 to 1024
     bits; prodded by & ok dtucker@ ok deraadt@
   - 2008/07/02 12:03:51
     [auth-rsa.c auth.c auth2-pubkey.c auth.h]
     Merge duplicate host key file checks, based in part on a patch from Rob
     Holland via bz #1348 .  Also checks for non-regular files during protocol
     1 RSA auth.  ok djm@
   - 2008/07/02 12:36:39
     [auth2-none.c auth2.c]
     Make protocol 2 MaxAuthTries behaviour a little more sensible:
     Check whether client has exceeded MaxAuthTries before running
     an authentication method and skip it if they have, previously it
     would always allow one try (for "none" auth).
     Preincrement failure count before post-auth test - previously this
     checked and postincremented, also to allow one "none" try.
     Together, these two changes always count the "none" auth method
     which could be skipped by a malicious client (e.g. an SSH worm)
     to get an extra attempt at a real auth method. They also make
     MaxAuthTries=0 a useful way to block users entirely (esp. in a
     sshd_config Match block).
     Also, move sending of any preauth banner from "none" auth method
     to the first call to input_userauth_request(), so worms that skip
     the "none" method get to see it too.

 - (djm) OpenBSD CVS Sync
   - 2008/06/10 23:13:43
     [regress/Makefile regress/]
     Add regress test for key options.  ok djm@
   - 2008/06/11 23:11:40
     Don't run cipher-speed test by default; mistakenly enabled by me
   - 2008/06/28 13:57:25
     [regress/Makefile regress/ regress/]
     very basic regress test against Twisted Conch in "make interop"
     target (conch is available in ports/devel/py-twisted/conch);
     ok markus@
 - (djm) [regress/Makefile] search for conch by path, like we do putty

 - (djm) OpenBSD CVS Sync
   - 2008/06/21 07:46:46
     use optopt to get invalid flag, instead of return value of getopt,
     which is always '?';  ok djm@
   - 2008/06/25 11:13:43
     add key length to visual fingerprint; zap magical constants;
     ok grunk@ djm@
   - 2008/06/26 06:10:09
     [sftp-client.c sftp-server.c]
     allow the sftp chmod(2)-equivalent operation to set set[ug]id/sticky
     bits. Note that this only affects explicit setting of modes (e.g. via
     sftp(1)'s chmod command) and not file transfers. (bz#1310)
     ok deraadt@ at c2k8
   - 2008/06/26 09:19:40
     [dh.c dh.h moduli.c]
     when loading moduli from /etc/moduli in sshd(8), check that they
     are of the expected "safe prime" structure and have had
     appropriate primality tests performed;
     feedback and ok dtucker@
   - 2008/06/26 11:46:31
     [readconf.c readconf.h ssh.1 ssh_config.5 sshconnect.c]
     Move SSH Fingerprint Visualization away from sharing the config option
     CheckHostIP to an own config option named VisualHostKey.
     While there, fix the behaviour that ssh would draw a random art picture
     on every newly seen host even when the option was not enabled.
     prodded by deraadt@, discussions,
     help and ok markus@ djm@ dtucker@
   - 2008/06/26 21:11:46
     add VisualHostKey to the list of options listed in -o;
   - 2008/06/28 07:25:07
     spelling fixes
   - 2008/06/28 13:58:23
     refuse to add a key that has unknown constraints specified;
     ok markus
   - 2008/06/28 14:05:15
     reset global compat flag after processing a protocol 2 signature
     request with the legacy DSA encoding flag set; ok markus
   - 2008/06/28 14:08:30
     document the protocol used by ssh-agent; "looks ok" markus@

 - (djm) [RFC.nroff contrib/cygwin/Makefile contrib/suse/openssh.spec]
   RFC.nroff lacks a license, remove it (it is long gone in OpenBSD).

 - (djm) [ moduli.5] Include moduli(5) manpage from OpenBSD.
 - (djm) [ contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
   [contrib/suse/openssh.spec] Include moduli.5 in RPM spec files.

 - (dtucker) OpenBSD CVS Sync
   - 2008/06/16 13:22:53
     [session.c channels.c]
     Rename the isatty argument to is_tty so we don't shadow
     isatty(3).  ok markus@
 - (dtucker) [channels.c] isatty -> is_tty here too.

 - (dtucker) [] Enable -fno-builtin-memset when using gcc.
 - OpenBSD CVS Sync
   - 2008/06/14 15:49:48
     wrap long line at 80 chars
   - 2008/06/14 17:07:11
     ensure default umask disallows at least group and world write; ok djm@
   - 2008/06/14 18:33:43
     suppress the warning message from chdir(homedir) failures
     when chrooted (bz#1461); ok dtucker
   - 2008/06/14 19:42:10
     Mention that scp follows symlinks during -r.  bz #1466,
     from nectar at apple
   - 2008/06/15 16:55:38
     MaxSessions is allowed in a Match block too
   - 2008/06/15 16:58:40
     [servconf.c sshd_config.5]
     Allow MaxAuthTries within a Match block.  ok djm@
   - 2008/06/15 20:06:26
     [channels.c channels.h session.c]
     don't call isatty() on a pty master, instead pass a flag down to
     channel_set_fds() indicating that te fds refer to a tty. Fixes a
     hang on exit on Solaris (bz#1463) in portable but is actually
     a generic bug; ok dtucker deraadt markus

 - (djm) [openbsd-compat/sigact.c] Avoid NULL derefs in ancient sigaction
   replacement code; patch from ighighi AT in bz#1240;
   ok dtucker

 - (dtucker) OpenBSD CVS Sync
   - 2008/06/13 09:44:36
     compile on older gcc; no decl after code
   - 2008/06/13 13:56:59
     Clear key options in the monitor on failed authentication, prevents
     applying additional restrictions to non-pubkey authentications in
     the case where pubkey fails but another method subsequently succeeds.
     bz #1472, found by Colin Watson, ok markus@ djm@
   - 2008/06/13 14:18:51
     [auth2-pubkey.c auth-rhosts.c]
     Include unistd.h for close(), prevents warnings in -portable
   - 2008/06/13 17:21:20
     Friendlier error messages for mux fallback.  ok djm@
   - 2008/06/13 18:55:22
     Prevent -Wsign-compare warnings on LP64 systems.  bz #1192, ok deraadt@
   - 2008/06/13 20:13:26
     Explain the use of SSH fpr visualization using random art, and cite the
     original scientific paper inspiring that technique.
     Much help with English and nroff by jmc@, thanks.
 - (dtucker) [] Bug #1276: avoid linking against libgssapi, which
   despite its name doesn't seem to implement all of GSSAPI.  Patch from
   Jan Engelhardt, sanity checked by Simon Wilkinson.

 - (dtucker) OpenBSD CVS Sync
   - 2008/06/11 07:30:37
     kill trailing whitespace;
   - 2008/06/11 21:01:35
     [ssh_config.5 key.h readconf.c readconf.h ssh-keygen.1 ssh-keygen.c key.c
     Introduce SSH Fingerprint ASCII Visualization, a technique inspired by the
     graphical hash visualization schemes known as "random art", and by
     Dan Kaminsky's musings on the subject during a BlackOp talk at the
     23C3 in Berlin.
     Scientific publication (original paper):
     "Hash Visualization: a New Technique to improve Real-World Security",
     Perrig A. and Song D., 1999, International Workshop on Cryptographic
     Techniques and E-Commerce (CrypTEC '99)
     The algorithm used here is a worm crawling over a discrete plane,
     leaving a trace (augmenting the field) everywhere it goes.
     Movement is taken from dgst_raw 2bit-wise.  Bumping into walls
     makes the respective movement vector be ignored for this turn,
     thus switching to the other color of the chessboard.
     Graphs are not unambiguous for now, because circles in graphs can be
     walked in either direction.
     discussions with several people,
     help, corrections and ok markus@ djm@
   - 2008/06/11 21:38:25
     ssh-keygen -lv -f /etc/ssh/
     would not display you the random art as intended, spotted by canacar@
   - 2008/06/11 22:20:46
     [ssh-keygen.c ssh-keygen.1]
     ssh-keygen would write fingerprints to STDOUT, and random art to STDERR,
     that is not how it was envisioned.
     Also correct manpage saying that -v is needed along with -l for it to work.
     spotted by naddy@
   - 2008/06/11 23:02:22
     simpler way of computing the augmentations; ok grunk@
   - 2008/06/11 23:03:56
     CheckHostIP set to ``fingerprint'' will display both hex and random art
     spotted by naddy@
   - 2008/06/11 23:51:57
     #define statements that are not atoms need braces around them, else they
     will cause trouble in some cases.
     Also do a computation of -1 once, and not in a loop several times.
     spotted by otto@
   - 2008/06/12 00:03:49
     [dns.c canohost.c sshconnect.c]
     Do not pass "0" strings as ports to getaddrinfo because the lookups
     can slow things down and we never use the service info anyway. bz
     #859, patch from YOSHIFUJI Hideaki and John Devitofranceschi.  ok
     deraadt@ djm@
     djm belives that the reason for the "0" strings is to ensure that
     it's not possible to call getaddrinfo with both host and port being
     NULL.  In the case of canohost.c host is a local array.  In the
     case of sshconnect.c, it's checked for null immediately before use.
     In dns.c it ultimately comes from ssh.c:main() and is guaranteed to
     be non-null but it's not obvious, so I added a warning message in
     case it is ever passed a null.
   - 2008/06/12 00:13:55
     Make ssh print the random art also when ssh'ing to a host using IP only.
     spotted by naddy@, ok and help djm@ dtucker@
   - 2008/06/12 00:13:13
     use an odd number of rows and columns and a separate start marker, looks
     better; ok grunk@
   - 2008/06/12 03:40:52
     [clientloop.h mux.c channels.c clientloop.c channels.h]
     Enable ~ escapes for multiplex slave sessions; give each channel
     its own escape state and hook the escape filters up to muxed
     channels. bz #1331
     Mux slaves do not currently support the ~^Z and ~& escapes.
     NB. this change cranks the mux protocol version, so a new ssh
     mux client will not be able to connect to a running old ssh
     mux master.
     ok dtucker@
   - 2008/06/12 04:06:00
     [clientloop.h ssh.c clientloop.c]
     maintain an ordered queue of outstanding global requests that we
     expect replies to, similar to the per-channel confirmation queue.
     Use this queue to verify success or failure for remote forward
     establishment in a race free way.
     ok dtucker@
   - 2008/06/12 04:17:47
     thall shalt not code past the eightieth column
   - 2008/06/12 04:24:06
     thal shalt not code past the eightieth column
   - 2008/06/12 05:15:41
     document forwarding method
   - 2008/06/12 05:32:30
     some more TODO for me
   - 2008/06/12 05:42:46
     supply the key type (rsa1, rsa, dsa) as a caption in the frame of the
     random art.  while there, stress the fact that the field base should at
     least be 8 characters for the pictures to make sense.
     comment and ok djm@
   - 2008/06/12 06:32:59
     We already mark the start of the worm, now also mark the end of the worm
     in our random art drawings.
     ok djm@
   - 2008/06/12 15:19:17
     [clientloop.h channels.h clientloop.c channels.c mux.c]
     The multiplexing escape char handler commit last night introduced a
     small memory leak per session; plug it.
   - 2008/06/12 16:35:31
     [ssh_config.5 ssh.c]
     keyword expansion for localcommand.  ok djm@
   - 2008/06/12 19:10:09
     [ssh_config.5 ssh-keygen.1]
     tweak the ascii art text; ok grunk
   - 2008/06/12 20:38:28
     [sshd.c sshconnect.c packet.h misc.c misc.h packet.c]
     Make keepalive timeouts apply while waiting for a packet, particularly
     during key renegotiation (bz #1363).  With djm and Matt Day, ok djm@
   - 2008/06/12 20:47:04
     print extension revisions for extensions that we understand
   - 2008/06/12 21:06:25
     I was coalescing expected global request confirmation replies at
     the wrong end of the queue - fix; prompted by markus@
   - 2008/06/12 21:14:46
     make ssh-keygen -lf show the key type just as ssh-add -l would do it
     ok djm@ markus@
   - 2008/06/12 22:03:36
     add my copyright, ok djm@
   - 2008/06/12 23:24:58
     tweak wording in message, ok deraadt@ jmc@
   - 2008/06/13 00:12:02
     [sftp.h log.h]
     replace __dead with __attribute__((noreturn)), makes things
     a little easier to port.  Also, add it to sigdie().  ok djm@
   - 2008/06/13 00:16:49
     fall back to creating a new TCP connection on most multiplexing errors
     (socket connect fail, invalid version, refused permittion, corrupted
     messages, etc.); bz #1329 ok dtucker@
   - 2008/06/13 00:47:53
     upcast size_t to u_long to match format arg; ok djm@
   - 2008/06/13 00:51:47
     upcast another size_t to u_long to match format
   - 2008/06/13 01:38:23
     upcast uid to long with matching %ld, prevents warnings in portable
   - 2008/06/13 04:40:22
     [auth2-pubkey.c auth-rhosts.c]
     refuse to read ~/.shosts or ~/.ssh/authorized_keys that are not
     regular files; report from Solar Designer via Colin Watson in bz#1471
     ok dtucker@ deraadt
  - (dtucker) [clientloop.c serverloop.c]  channel_register_filter now
    takes 2 more args.  with djm@
  - (dtucker) [defines.h] Bug #1112: __dead is, well dead. Based on a patch
    from Todd Vierling.
  - (dtucker) [auth-sia.c] Bug #1241: support password expiry on Tru64 SIA
    systems.  Patch from R. Scott Bailey.
  - (dtucker) [umac.c] STORE_UINT32_REVERSED and endian_convert are never used
    on big endian machines, so ifdef them for little-endian only to prevent
    unused function warnings on big-endians.
  - (dtucker) [openbsd-compat/setenv.c] Make offsets size_t to prevent
    compiler warnings on some platforms.  Based on a discussion with otto@

 - (djm) [channels.c]
   Do not set SO_REUSEADDR on wildcard X11 listeners (X11UseLocalhost=no)
   bz#1464; ok dtucker 

 - (dtucker) OpenBSD CVS Sync
   - 2008/06/10 03:57:27
     [servconf.c match.h sshd_config.5]
     support CIDR address matching in sshd_config "Match address" blocks, with
     full support for negation and fall-back to classic wildcard matching.
     For example:
     Match address,3ffe:ffff::/32,!10.*
         PasswordAuthentication yes
     addrmatch.c code mostly lifted from flowd's addr.c
     feedback and ok dtucker@
   - 2008/06/10 04:17:46
     better reference for pattern-list
   - 2008/06/10 04:50:25
     [sshd.c channels.h channels.c log.c servconf.c log.h servconf.h sshd.8]
     Add extended test mode (-T) and connection parameters for test mode (-C).
     -T causes sshd to write its effective configuration to stdout and exit.
     -C causes any relevant Match rules to be applied before output.  The
     combination allows tesing of the parser and config files.  ok deraadt djm
   - 2008/06/10 07:12:00
     tweak previous;
   - 2008/06/10 08:17:40
     [sshd.8 sshd.c]
     - update usage()
     - fix SYNOPSIS, and sort options
     - some minor additional fixes
   - 2008/06/09 18:06:32
     Don't generate putty keys if we're not going to use them.  ok djm
   - 2008/06/10 05:23:32
     [regress/ regress/Makefile]
     Regress test for Match CIDR rules.  ok djm@
   - 2008/06/10 15:21:41
     Use a more portable construct for checking if we're running a putty test
   - 2008/06/10 15:28:49
     Add quotes
   - 2008/06/10 18:21:24
     clarify that Host patterns are space-separated.  ok deraadt
   - 2008/06/10 22:15:23
     [PROTOCOL ssh.c serverloop.c]
     Add a global request extension that the
     client sends when it knows that it will never request another session
     (i.e. when session multiplexing is disabled). This allows a server to
     disallow further session requests and terminate the session.
     Why would a non-multiplexing client ever issue additional session
     requests? It could have been attacked with something like SSH'jack:
     feedback & ok markus
   - 2008/06/10 23:06:19
     [auth-options.c match.c servconf.c addrmatch.c sshd.8]
     support CIDR address matching in .ssh/authorized_keys from="..." stanzas
     ok and extensive testing dtucker@
   - 2008/06/10 23:21:34
     Use '\0' for a nul byte rather than unadorned 0.  ok djm@
   - 2008/06/10 23:13:43
     [Makefile regress/]
     Add regress test for key options.  ok djm@
 - (dtucker) [openbsd-compat/fake-rfc2553.h] Add sin6_scope_id to sockaddr_in6
   since the new CIDR code in addmatch.c references it.
 - (dtucker) [ regress/] Skip IPv6
   specific tests on platforms that don't do IPv6.
 - (dtucker) [] Define TEST_SSH_IPV6 in make's arguments as well
   as environment.
 - (dtucker) [] Move addrmatch.o to libssh.a where it's needed now.

 - (dtucker) OpenBSD CVS Sync
   - 2008/06/08 17:04:41
     Add case for ENOSYS in errno_to_portable; ok deraadt
   - 2008/06/08 20:15:29
     [sftp.c sftp-client.c sftp-client.h]
     Have the sftp client store the statvfs replies in wire format,
     which prevents problems when the server's native sizes exceed the
     Also extends the sizes of the remaining 32bit wire format to 64bit,
     they're specified as unsigned long in the standard.
   - 2008/06/09 13:02:39
     Extend 32bit -> 64bit values for statvfs extension missed in previous
   - 2008/06/09 13:38:46
     Use a $OpenBSD tag so our scripts will sync changes.

 - (dtucker) [ defines.h sftp-client.c sftp-server.c sftp.c
   openbsd-compat/ openbsd-compat/openbsd-compat.h
   openbsd-compat/bsd-statvfs.{c,h}] Add a null implementation of statvfs and
   fstatvfs and remove #defines around statvfs code.  ok djm@
 - (dtucker) [ defines.h sftp-client.c M sftp-server.c] Add a
   macro to convert fsid to unsigned long for platforms where fsid is a
   2-member array.

 - (dtucker) [mux.c] Include paths.h inside ifdef HAVE_PATHS_H.
 - (dtucker) [ defines.h sftp-client.c sftp-server.c sftp.c]
   Do not enable statvfs extensions on platforms that do not have statvfs.
 - (dtucker) OpenBSD CVS Sync
   - 2008/05/19 06:14:02
     [packet.c] unbreak protocol keepalive timeouts bz#1465; ok dtucker@
   - 2008/05/19 15:45:07
     [sshtty.c ttymodes.c sshpty.h]
     Fix sending tty modes when stdin is not a tty (bz#1199). Previously
     we would send the modes corresponding to a zeroed struct termios,
     whereas we should have been sending an empty list of modes.
     Based on patch from daniel.ritz AT; ok dtucker@ markus@
   - 2008/05/19 15:46:31
     support -l (print fingerprint) in combination with -F (find host) to
     search for a host in ~/.ssh/known_hosts and display its fingerprint;
     ok markus@
   - 2008/05/19 20:53:52
     unbreak tree by committing this bit that I missed from:
     Fix sending tty modes when stdin is not a tty (bz#1199). Previously
     we would send the modes corresponding to a zeroed struct termios,
     whereas we should have been sending an empty list of modes.
     Based on patch from daniel.ritz AT; ok dtucker@ markus@ 

 - (djm) [openbsd-compat/bsd-arc4random.c] Fix math bug that caused bias
   in arc4random_uniform with upper_bound in (2^30,2*31). Note that 
   OpenSSH did not make requests with upper bounds in this range.

 - (djm) [ mux.c sftp.c openbsd-compat/]
   [openbsd-compat/fmt_scaled.c openbsd-compat/openbsd-compat.h]
   Fix compilation on Linux, including pulling in fmt_scaled(3)
   implementation from OpenBSD's libutil.

 - (djm) OpenBSD CVS Sync
   - 2008/04/04 05:14:38
     ChrootDirectory is supported in Match blocks (in fact, it is most useful
     there). Spotted by Minstrel AT
   - 2008/04/04 06:44:26
     oops, some unrelated stuff crept into that commit - backout.
     spotted by jmc@
   - 2008/04/05 02:46:02
     HostbasedAuthentication is supported under Match too
 - (djm) [openbsd-compat/bsd-arc4random.c openbsd-compat/openbsd-compat.c]
     [] Implement arc4random_buf(), import implementation of
     arc4random_uniform() from OpenBSD
 - (djm) [openbsd-compat/bsd-arc4random.c] Warning fixes
 - (djm) [openbsd-compat/port-tun.c] needs sys/queue.h
 - (djm) OpenBSD CVS Sync
   - 2008/04/13 00:22:17
     [dh.c sshd.c]
     Use arc4random_buf() when requesting more than a single word of output
     Use arc4random_uniform() when the desired random number upper bound
     is not a power of two
     ok deraadt@ millert@
   - 2008/04/18 12:32:11
     [sftp-client.c sftp-client.h sftp-server.c sftp.1 sftp.c sftp.h]
     introduce sftp extension methods and that implement statvfs(2)-like operations,
     based on a patch from miklos AT (bz#1399)
     also add a "df" command to the sftp client that uses the to produce a df(1)-like display of filesystem
     space and inode utilisation
     ok markus@
   - 2008/04/18 17:15:47
     macro fixage;
   - 2008/04/18 22:01:33
     remove unneccessary parentheses
   - 2008/04/29 11:20:31
     garbage collect two unused fields in struct mm_master; ok markus@
   - 2008/04/30 10:14:03
     [ssh-keyscan.1 ssh-keyscan.c]
     default to rsa (protocol 2) keys, instead of rsa1 keys; spotted by
     larsnooden AT
   - 2008/05/07 05:49:37
     [servconf.c servconf.h session.c sshd_config.5]
     Enable the AllowAgentForwarding option in sshd_config (global and match
     context), to specify if agents should be permitted on the server.
     As the man page states:
     ``Note that disabling Agent forwarding does not improve security
     unless users are also denied shell access, as they can always install
     their own forwarders.''
     ok djm@, ok and a mild frown markus@
   - 2008/05/07 06:43:35
     push the sshd_config bits in, spotted by ajacoutot@
   - 2008/05/07 08:00:14
   - 2008/05/08 06:59:01
     [bufaux.c buffer.h channels.c packet.c packet.h]
     avoid extra malloc/copy/free when receiving data over the net;
     ~10% speedup for localhost-scp; ok djm@
   - 2008/05/08 12:02:23
     [auth-options.c auth1.c channels.c channels.h clientloop.c gss-serv.c]
     [monitor.c monitor_wrap.c nchan.c servconf.c serverloop.c session.c]
     [ssh.c sshd.c]
     Implement a channel success/failure status confirmation callback
     mechanism. Each channel maintains a queue of callbacks, which will
     be drained in order (RFC4253 guarantees confirm messages are not
     reordered within an channel).
     Also includes a abandonment callback to clean up if a channel is
     closed without sending confirmation messages. This probably
     shouldn't happen in compliant implementations, but it could be
     abused to leak memory.
     ok markus@ (as part of a larger diff)
   - 2008/05/08 12:21:16
     [monitor.c monitor_wrap.c session.h servconf.c servconf.h session.c]
     [sshd_config sshd_config.5]
     Make the maximum number of sessions run-time controllable via
     a sshd_config MaxSessions knob. This is useful for disabling
     login/shell/subsystem access while leaving port-forwarding working
     (MaxSessions 0), disabling connection multiplexing (MaxSessions 1) or
     simply increasing the number of allows multiplexed sessions.
     Because some bozos are sure to configure MaxSessions in excess of the
     number of available file descriptors in sshd (which, at peak, might be
     as many as 9*MaxSessions), audit sshd to ensure that it doesn't leak fds
     on error paths, and make it fail gracefully on out-of-fd conditions -
     sending channel errors instead of than exiting with fatal().
     bz#1090; MaxSessions config bits and manpage from junyer AT
     ok markus@
   - 2008/05/08 13:06:11
     [clientloop.c clientloop.h ssh.c]
     Use new channel status confirmation callback system to properly deal
     with "important" channel requests that fail, in particular command exec,
     shell and subsystem requests. Previously we would optimistically assume
     that the requests would always succeed, which could cause hangs if they
     did not (e.g. when the server runs out of fds) or were unimplemented by
     the server (bz #1384)
     Also, properly report failing multiplex channel requests via the mux
     client stderr (subject to LogLevel in the mux master) - better than
     silently failing.
     most bits ok markus@ (as part of a larger diff)
   - 2008/05/09 04:55:56
     [channels.c channels.h clientloop.c serverloop.c]
     Try additional addresses when connecting to a port forward destination
     whose DNS name resolves to more than one address. The previous behaviour
     was to try the first address and give up.
     Reported by stig AT in bz#343
     great feedback and ok markus@
   - 2008/05/09 14:18:44
     [clientloop.c clientloop.h ssh.c mux.c]
     tidy up session multiplexing code, moving it into its own file and
     making the function names more consistent - making ssh.c and
     clientloop.c a fair bit more readable.
     ok markus@
   - 2008/05/09 14:26:08
     dingo stole my diff hunk
   - 2008/05/09 16:16:06
     re-add the USE_PIPES code and enable it.
     without pipes shutdown-read from the sshd does not trigger
     a SIGPIPE when the forked program does a write.
     ok djm@
     (Id sync only, USE_PIPES never left portable OpenSSH)
   - 2008/05/09 16:17:51
     error-fd race: don't enable the error fd in the select bitmask
     for channels with both in- and output closed, since the channel
     will go away before we call select();
     report, lots of debugging help and ok djm@
   - 2008/05/09 16:21:13
     [channels.h clientloop.c nchan.c serverloop.c]
        ssh -2 localhost od /bin/ls | true
     ignoring SIGPIPE by adding a new channel message (EOW) that signals
     the peer that we're not interested in any data it might send.
     fixes bz #85; discussion, debugging and ok djm@
   - 2008/05/12 20:52:20
     Ensure nh_result lies on a 64-bit boundary (fixes warnings observed
     on Itanium on Linux); from Dale Talcott (bug #1462); ok djm@
   - 2008/05/15 23:52:24
     document eow message in ssh protocol 2 channel state machine;
     feedback and ok markus@
   - 2008/05/18 21:29:05
     comment extension announcement
   - 2008/05/16 08:30:42
     document our protocol extensions and deviations; ok markus@
   - 2008/05/17 01:31:56
     grammar and correctness fixes from stevesk@

 - (djm) [openbsd-compat/bsd-poll.c] Include stdlib.h to avoid compile-
   time warnings on LynxOS. Patch from ops AT
 - (djm) Force string arguments to replacement setproctitle() though
   strnvis first. Ok dtucker@

 - (djm) OpenBSD CVS sync:
   - 2008/04/02 15:36:51
     avoid possible hijacking of x11-forwarded connections (back out 1.183)
     CVE-2008-1483; ok djm@
   - 2008/03/27 22:37:57
     remove trailing whitespace;
   - 2008/04/03 09:50:14
 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
   [contrib/suse/openssh.spec] Crank version numbers in RPM spec files
 - (djm) [README] Update link to release notes
 - (djm) Release 5.0p1

 - (djm) [regress/] Quote putty-related variables in case they are
   empty; report and patch from Peter Stuge
 - (djm) [regress/] Silence noise from detection of putty
   commands; report from Peter Stuge
 - (djm) [session.c] Relocate incorrectly-placed closefrom() that was causing
   crashes when used with ChrootDirectory

 - (dtucker) Cache selinux status earlier so we know if it's enabled after a
   chroot.  Allows ChrootDirectory to work with selinux support compiled in
   but not enabled.  Using it with selinux enabled will require some selinux
   support inside the chroot.  "looks sane" djm@
 - (djm) Fix RCS ident in sftp-server-main.c
 - (djm) OpenBSD CVS sync:
   - 2008/02/11 07:58:28
     [ssh.1 sshd.8 sshd_config.5]
     bump Mdocdate for pages committed in "febuary", necessary because
     of a typo in rcs.c;
   - 2008/03/13 01:49:53
     Correct CMSG_SPACE and CMSG_LEN usage everywhere in the tree. Due to
     an extensive discussion with otto, kettenis, millert, and hshoexer
   - 2008/03/15 16:19:02
     Repair the simple cases for msg_controllen where it should just be
     CMSG_SIZE(sizeof(int)), not sizeof(buffer) which may be larger because
     of alignment; ok kettenis hshoexer
   - 2008/03/23 12:54:01
     prefer POSIX-style file renaming over filexfer rename behaviour if the
     server supports the extension.
     Note that the old (filexfer) behaviour would refuse to clobber an
     existing file. Users who depended on this should adjust their sftp(1)
     ok deraadt@ markus@
   - 2008/03/24 16:11:07
     msg_controllen has to be CMSG_SPACE so that the kernel can account for
     each cmsg_len (ie. msg_controllen = sum of CMSG_ALIGN(cmsg_len).  This
     works now that kernel fd passing has been fixed to accept a bit of
     sloppiness because of this ABI repair.
     lots of discussion with kettenis
   - 2008/03/25 11:58:02
     [session.c sshd_config.5]
     ignore ~/.ssh/rc if a sshd_config ForceCommand is specified;
     from dtucker@ ok deraadt@ djm@
   - 2008/03/25 23:01:41
     last patch had backwards test; spotted by termim AT
   - 2008/03/26 21:28:14
     [auth-options.c auth-options.h session.c sshd.8]
     add no-user-rc authorized_keys option to disable execution of ~/.ssh/rc
   - 2008/03/27 00:16:49
   - 2008/03/24 21:46:54
     disable no-replace rename test now that we prefer a POSIX rename; spotted
     by dkrause@
 - (djm) [] fix alignment of --without-stackprotect description
 - (djm) [] --with-selinux too
 - (djm) [regress/Makefile] cleanup PuTTY interop test droppings
 - (djm) [README] Update link to release notes
 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
   [contrib/suse/openssh.spec] Crank version numbers in RPM spec files
 - (djm) Release 4.9p1

 - (djm) [regress/] Quote putty-related variables in case they are
   empty; report and patch from Peter Stuge
 - (djm) [regress/] Silence noise from detection of putty
   commands; report from Peter Stuge
 - (djm) [session.c] Relocate incorrectly-placed closefrom() that was causing
   crashes when used with ChrootDirectory

 - (tim) [regress/] s/cd/lcd/ in lls test. Reported by
   vinschen at Add () to put echo commands in subshell for lls test
   I mistakenly left out of last commit.
 - (tim) [regress/] Shell portability fix. Reported by imorgan at

 - (djm) [ regress/Makefile] Fix interop-tests target (note to
   self: make changes to next time, not the generated Makefile).
 - (djm) [ regress/] Find installed plink(1) and
   puttygen(1) by $PATH
 - (tim) [scp.c] Use poll.h if available, fall back to sys/poll.h if not. Patch
   by vinschen at
 - (tim) [regress/ regress/] Shell portability fixes
   from vinschen at and imorgan at

 - (djm) OpenBSD CVS Sync
   - 2007/10/29 06:57:13
     [regress/Makefile regress/]
     Add simple regress test for LocalCommand; ok djm@
   - 2007/11/25 15:35:09
     [regress/ regress/]
     more existant -> existent, from Martynas Venckus;
     pfctl changes: ok henning
     ssh changes: ok deraadt
   - 2007/12/12 05:04:03
     unbreak lls command and add a regress test that would have caught the
     breakage; spotted by mouring@
     NB. sftp code change already committed.
   - 2007/12/21 04:13:53
     [regress/Makefile regress/ regress/]
     [regress/ regress/ regress/]
     basic (crypto, kex and transfer) interop regression tests against putty
     To run these, install putty and run "make interop-tests" from the build
     directory - the tests aren't run by default yet.

 - (dtucker) [auth-pam.c monitor.c session.c sshd.c] Bug #926: Move
   pam_open_session and pam_close_session into the privsep monitor, which
   will ensure that pam_session_close is called as root.  Patch from Tomas

 - (dtucker) [] It turns out gcc's -fstack-protector-all doesn't
   always work for all platforms and versions, so test what we can and
   add a configure flag to turn it of if needed.  ok djm@
 - (dtucker) [openbsd-compat/port-aix.{c,h}] Remove AIX specific initgroups
   implementation.  It's not needed to fix bug #1081 and breaks the build
   on some AIX configurations.
 - (dtucker) [openbsd-compat/regress/strtonumtest.c] Bug #1347: Use platform's
   equivalent of LLONG_MAX for the compat regression tests, which makes them
   run on AIX and HP-UX.  Patch from David Leonard.
 - (dtucker) [] Run stack-protector tests with -Werror to catch
   platforms where gcc understands the option but it's not supported (and
   thus generates a warning).

 - (djm) OpenBSD CVS Sync
   - 2008/02/11 07:58:28
     [ssh.1 sshd.8 sshd_config.5]
     bump Mdocdate for pages committed in "febuary", necessary because
     of a typo in rcs.c;
   - 2008/02/13 22:38:17
     [servconf.h session.c sshd.c]
     rekey arc4random and OpenSSL RNG in postauth child
     closefrom fds > 2 before shell/command execution
     ok markus@
   - 2008/02/14 13:10:31
     When started in configuration test mode (-t) do not check that sshd is
     being started with an absolute path.
     ok djm
   - 2008/02/20 15:25:26
     correct boolean encoding for coredump; der Mouse via dugsong
   - 2008/02/22 05:58:56
     closefrom() call was too early, delay it until just before we execute
     the user's rc files (if any).
   - 2008/02/22 20:44:02
     [clientloop.c packet.c packet.h serverloop.c]
     Allow all SSH2 packet types, including UNIMPLEMENTED to reset the
     keepalive timer (bz #1307).  ok markus@
   - 2008/02/27 20:21:15
     add an extension method "" to perform POSIX atomic
     rename() operations. based on patch from miklos AT in bz#1400;
     ok dtucker@ markus@
   - 2008/03/02 18:19:35
     use a union to ensure alignment of the cmsg (pay attention: various other
     parts of the tree need this treatment too); ok djm
   - 2008/03/04 21:15:42
     crank version; from djm
 - (tim) [regress/] Shell portability fix.

 - (dtucker) [] FreeBSD's glob() doesn't behave the way we expect
   either, so use our own.

 - (dtucker) [openbsd-compat/bsd-poll.c] We don't check for select(2) in
   configure (and there's not much point, as openssh won't work without it)
   so HAVE_SELECT is not defined and the poll(2) compat code doesn't get
   built in.  Remove HAVE_SELECT so we can build on platforms without poll.
 - (dtucker) [scp.c] Include sys/poll.h inside HAVE_SYS_POLL_H.
 - (djm) [contrib/gnome-ssh-askpass2.h] Keep askpass windown on top. From
   Debian patch via bernd AT

 - (dtucker) [] Add -fstack-protector to LDFLAGS too, fixes
   linking problems on AIX with gcc 4.1.x.
 - (dtucker) [includes.h ssh-add.c ssh-agent.c ssh-keygen.c ssh.c sshd.c
   openbsd-compat/openssl-compat.{c,h}] Bug #1437 Move the OpenSSL compat
   header to after OpenSSL headers, since some versions of OpenSSL have
   SSLeay_add_all_algorithms as a macro already.
 - (dtucker) [key.c defines.h openbsd-compat/openssl-compat.h] Move old OpenSSL
   compat glue into openssl-compat.h.
 - (dtucker) [ openbsd-compat/port-aix.{c,h}] Bug #1081: Implement
   getgrouplist via getgrset on AIX, rather than iterating over getgrent.
   This allows, eg, Match and AllowGroups directives to work with NIS and
   LDAP groups.
 - (dtucker) [sshd.c] Bug #1042: make log messages for tcpwrappers use the
   same SyslogFacility as the rest of sshd.  Patch from William Knox,
   ok djm@.

 - (dtucker) [openbsd-compat/fake-rfc2553.h] rename ssh_gai_strerror hack
   since it now conflicts with the helper function in misc.c.  From
   vinschen AT
 - (dtucker) [ audit-bsm.c] Bug #1420: Add a local implementation
   of aug_get_machine for systems that don't have their own (eg OS X, FreeBSD).
   Help and testing from csjp at FreeBSD org, vgiffin at apple com.  ok djm@
 - (dtucker) [includes.h openbsd-compat/openssl-compat.c] Bug #1437: reshuffle
   headers so ./configure --with-ssl-engine actually works.  Patch from
   Ian Lister.

 - (tim) [contrib/cygwin/ssh-host-config]
   Grammar changes on SYSCONFDIR LOCALSTATEDIR messages.
   Check more thoroughly that it's possible to create the /var/empty directory.
   Patch by vinschen AT

 - OpenBSD CVS Sync
   - 2008/01/11 07:22:28
     [sftp-client.c sftp-client.h]
     disable unused functions
     initially from tobias@, but disabled them by placing them in
     "#ifdef notyet" which was asked by djm@
     ok djm@ tobias@
   - 2008/01/19 19:13:28
     satisfy the pedants: -q does not suppress all diagnostic messages (e.g.
     some commandline parsing warnings go unconditionally to stdout).
   - 2008/01/19 20:48:53
     fd leak on session multiplexing error path. Report and patch from
     gregory_shively AT
   - 2008/01/19 20:51:26
     ignore SIGPIPE in multiplex client mode - we can receive this if the
     server runs out of fds on us midway. Report and patch from
     gregory_shively AT
   - 2008/01/19 22:04:57
     fix remote handle leak in do_download() local file open error path;
     report and fix from sworley AT
   - 2008/01/19 22:22:58
     when hashing individual hosts (ssh-keygen -Hf hostname), make sure we
     hash just the specified hostname and not the entire hostspec from the
     keyfile. It may be of the form "hostname,ipaddr", which would lead to
     a hash that never matches. report and fix from jp AT
   - 2008/01/19 22:37:19
     unbreak line numbering (broken in revision 1.164), fix error message
   - 2008/01/19 23:02:40
     When we added support for specified bind addresses for port forwards, we
     added a quirk SSH_OLD_FORWARD_ADDR. There is a bug in our handling of
     this for -L port forwards that causes the client to listen on both v4
     and v6 addresses when connected to a server with this quirk, despite
     having set as a bind_address.
     report and patch from Jan.Pechanec AT Sun.COM; ok dtucker@
   - 2008/01/19 23:09:49
     [readconf.c readconf.h sshconnect2.c]
     promote rekeylimit to a int64 so it can hold the maximum useful limit
     of 2^32; report and patch from Jan.Pechanec AT Sun.COM, ok dtucker@
   - 2008/01/20 00:38:30
     When uploading, correctly handle the case of an unquoted filename with
     glob metacharacters that match a file exactly but not as a glob, e.g. a
     file called "[abcd]". report and test cases from duncan2nd AT
   - 2008/01/21 17:24:30
     Remove the fixed 100 handle limit in sftp-server and allocate as many
     as we have available file descriptors. Patch from miklos AT;
     ok dtucker@ markus@
   - 2008/01/21 19:20:17
     when a remote write error occurs during an upload, ensure that ACKs for
     all issued requests are properly drained. patch from t8m AT
   - 2008/01/23 01:56:54
     [clientloop.c packet.c serverloop.c]
     Revert the change for bz #1307 as it causes connection aborts if an IGNORE
     packet arrives while we're waiting in packet_read_expect (and possibly
   - 2008/01/31 20:06:50
     explain how to handle local file names containing colons;
     requested by Tamas TEVESZ
     ok dtucker
   - 2008/02/04 21:53:00
     [session.c sftp-server.c sftp.h]
     link sftp-server into sshd; feedback and ok djm@
   - 2008/02/09 12:15:43
     [ssh.1 sshd.8]
     Document the correct permissions for the ~/.ssh/ directory.
     ok jmc
   - 2008/02/10 09:55:37
     mantion that "internal-sftp" is useful with ForceCommand too
   - 2008/02/10 10:54:29
     [servconf.c session.c]
     delay ~ expansion for ChrootDirectory so it expands to the logged-in user's
     home, rather than the user who starts sshd (probably root)

 - (djm) Silence noice from expr in ssh-copy-id; patch from
   mikel AT
 - (djm) Only listen for IPv6 connections on AF_INET6 sockets; patch from
   tsr2600 AT

 - (dtucker) [] Fix message for -fstack-protector-all test.

 - (dtucker) OpenBSD CVS Sync
   - 2007/12/31 10:41:31
     [readconf.c servconf.c]
     Prevent strict-aliasing warnings on newer gcc versions.  bz #1355, patch
     from Dmitry V. Levin, ok djm@
   - 2007/12/31 15:27:04
     When in inetd mode, have sshd generate a Protocol 1 ephemeral server
     key only for connections where the client chooses Protocol 1 as opposed
     to when it's enabled in the server's config.  Speeds up Protocol 2
     connections to inetd-mode servers that also allow Protocol 1.  bz #440,
     based on a patch from bruno at, ok markus@
   - 2008/01/01 08:47:04
     spaces -> tabs from my previous commit
   - 2008/01/01 09:06:39
     If scp -p encounters a pre-epoch timestamp, use the epoch which is
     as close as we can get given that it's used unsigned.  Add a little
     debugging while there.  bz #828, ok djm@
   - 2008/01/01 09:27:33
     [sshd_config.5 servconf.c]
     Allow PermitRootLogin in a Match block.  Allows for, eg, permitting root
     only from the local network.  ok markus@, man page bit ok jmc@
   - 2008/01/01 08:51:20
     Updated moduli file; ok djm@

 - (dtucker) [ openbsd-compat/glob.{c,h}] Bug #1407: force use of
   builtin glob implementation on Mac OS X.  Based on a patch from
   vgiffin at apple.

 - (dtucker) OpenBSD CVS Sync
   - 2007/12/12 05:04:03
     unbreak lls command and add a regress test that would have caught the
     breakage; spotted by mouring@
   - 2007/12/27 14:22:08
     [servconf.c canohost.c misc.c channels.c sshconnect.c misc.h ssh-keyscan.c
     Add a small helper function to consistently handle the EAI_SYSTEM error
     code of getaddrinfo.  Prompted by vgiffin at apple com via bz #1417.
     ok markus@ stevesk@
   - 2007/12/28 15:32:24
     [clientloop.c serverloop.c packet.c]
     Make SSH2_MSG_UNIMPLEMENTED and SSH2_MSG_IGNORE messages reset the
     ServerAlive and ClientAlive timers.  Prevents dropping a connection
     when these are enabled but the peer does not support our keepalives.
     bz #1307, ok djm@.
   - 2007/12/28 22:34:47
     Use the correct packet maximum sizes for remote port and agent forwarding.
     Prevents the server from killing the connection if too much data is queued
     and an excessively large packet gets sent.  bz #1360, ok djm@.

 - (dtucker) [] Enable -fstack-protector-all on systems where
   gcc supports it.  ok djm@
 - (dtucker) [scp.c] Update $OpenBSD tag missing from rev 1.175 and remove
   leftover debug code.
 - (dtucker) OpenBSD CVS Sync
   - 2007/10/29 00:52:45
     Allow build without -DGSSAPI; ok deraadt@
     (Id sync only, Portable already has the ifdefs)
   - 2007/10/29 01:55:04
     Plug tiny mem leaks in ControlPath and ProxyCommand option processing;
     ok djm@
   - 2007/10/29 04:08:08
     [monitor_wrap.c monitor.c]
     Send config block back to slave for invalid users too so options
     set by a Match block (eg Banner) behave the same for non-existent
     users.  Found by and ok djm@
   - 2007/10/29 06:51:59
     ProxyCommand and LocalCommand use the user's shell, not /bin/sh; ok djm@
   - 2007/10/29 06:54:50
     Make LocalCommand work for Protocol 1 too; ok djm@
   - 2007/10/29 07:48:19
     clean up after previous macro removal;
   - 2007/11/03 00:36:14
     fix memory leak in process_cmdline(), patch from Jan.Pechanec AT Sun.COM;
     ok dtucker@
   - 2007/11/03 01:24:06
     bz #1377: getpwuid results were being clobbered by another getpw* call
     inside tilde_expand_filename(); save the data we need carefully
     ok djm
   - 2007/11/03 02:00:32
     Use xstrdup/xfree when saving pwname and pwdir; ok deraadt@
   - 2007/11/03 02:03:49
     avoid errno trashing in signal handler; ok dtucker

 - (djm) OpenBSD CVS Sync
   - 2007/10/29 23:49:41
     remove extra backslash at the end of RB_PROTOTYPE, report from
     Jan.Pechanec AT Sun.COM; ok deraadt@

 - (djm) OpenBSD CVS Sync
   - 2007/09/11 23:49:09
     remove #if defined block not needed; ok markus@ dtucker@
     (NB. RCD ID sync only for portable)
   - 2007/09/21 03:05:23
     document KbdInteractiveAuthentication in ssh_config.5;
     patch from dkg AT
   - 2007/09/21 08:15:29
     [auth-bsdauth.c auth-passwd.c auth.c auth.h auth1.c auth2-chall.c]
     [monitor.c monitor_wrap.c]
     unifdef -DBSD_AUTH
     unifdef -USKEY
     These options have been in use for some years;
     ok markus@ "no objection" millert@
     (NB. RCD ID sync only for portable)
   - 2007/09/25 23:48:57
     When adding a key that already exists, update the properties
     (time, confirm, comment) instead of discarding them. ok djm@ markus@
   - 2007/09/27 00:15:57
     Don't return -1 on error in dh_pub_is_valid(), since it evaluates
     to true.
     Also fix a typo.
     Initial diff from Matthew Dempsky, input from djm.
     OK djm, markus.
   - 2007/09/29 00:25:51
     Remove unused prototype.  ok djm@
   - 2007/10/02 17:49:58
     handles zero-sized strings that fgets can return
     properly removes trailing newline
     removes an unused variable
     correctly counts line number
     "looks ok" ray@ markus@
   - 2007/10/22 19:10:24
     make sure that both the local and remote port are correct when
     parsing -L; Jan Pechanec (bz #1378)
   - 2007/10/24 03:30:02
     rework argument splitting and parsing to cope correctly with common
     shell escapes and make handling of escaped characters consistent
     with sh(1) and between sftp commands (especially between ones that
     glob their arguments and ones that don't).
     parse command flags using getopt(3) rather than hand-rolled parsers.
     ok dtucker@
  - 2007/10/24 03:44:02
     factor out network read/write into an atomicio()-like function, and
     use it to handle short reads, apply bandwidth limits and update
     counters. make network IO non-blocking, so a small trickle of
     reads/writes has a chance of updating the progress meter; bz #799
     ok dtucker@
   - 2006/08/29 09:44:00
     clean up our mess
   - 2006/11/06 09:27:43
     fix quoting for non-(c)sh login shells.
   - 2006/12/13 08:36:36
     Additional test for multiple PermitOpen entries.  ok djm@
   - 2007/06/07 19:41:46
     [regress/ regress/]
     ok djm@
   - 2007/10/24 03:32:35
     [regress/ regress/ regress/]
     comprehensive tests for sftp escaping its interaction with globbing;
     ok dtucker@
   - 2007/10/26 05:30:01
     [regress/ regress/]
     remove "echo -E" crap that I added in last commit and use printf(1) for
     cases where we strictly require echo not to reprocess escape characters.
   - 2005/11/28 17:50:12
     unused arg in internal static API
   - 2007/10/11 18:36:41
     [openbsd-compat/getrrsetbyname.c openbsd-compat/getrrsetbyname.h]
     use RRSIG instead of SIG for DNSSEC. ok djm@
   - 2006/10/21 09:55:03
     remove calls to abort(3) that can't happen anyway; from
     <bret dot lambert at>; ok millert@ deraadt@
   - 2004/04/24 18:11:46
     sync to Niels Provos' version.  avoid unused variable warning in
   - 2004/11/24 18:10:42
   - 2004/05/04 16:59:32
     Remove useless ``elm'' argument from the SIMPLEQ_REMOVE_HEAD macro.
     This matches our SLIST behaviour and NetBSD's SIMPLEQ as well.
     ok millert krw deraadt
   - 2005/02/25 13:29:30
     minor white spacing
   - 2005/10/17 20:19:42
     Performing certain operations on queue.h data structurs produced
     funny results.  An example is calling  LIST_REMOVE on the same
     element twice. This will not fail, but result in a data structure
     referencing who knows what. Prevent these accidents by NULLing some
     fields on remove and replace. This way, either a panic or segfault
     will be produced on the faulty operation.
   - 2005/10/24 20:25:14
     Partly backout. NOLIST, used in LISTs is probably interfering.
     requested by deraadt@
   - 2005/10/25 06:37:47
     Some uvm problem is being exposed with the more strict macros.
     Revert until we've found out what's causing the panics.
   - 2005/11/25 08:06:25
     Introduce debugging aid for queue macros. Disabled by default; but
     developers are encouraged to run with this enabled.
     ok krw@ fgsch@ deraadt@
   - 2007/04/30 18:42:34
     Enable QUEUE_MACRO_DEBUG on DIAGNOSTIC kernels.
     Input and okays from krw@, millert@, otto@, deraadt@, miod@.
   - 2004/10/07 16:56:11
     GLOB_NOESCAPE is POSIX so move it out of the #ifndef _POSIX_SOURCE
     (NB. mostly an RCS ID sync, as portable strips out the conditionals)
 - (djm) [regress/]
   Use more restrictive glob to pick up test files from /bin - some platforms
   ship broken symlinks there which could spoil the test.
 - (djm) [openbsd-compat/bindresvport.c]
   Sync RCS ID after irrelevant (for portable OpenSSH) header shuffling

 - (dtucker) [ atomicio.c] Fall back to including <sys/poll.h> if
   we don't have <poll.h> (eq QNX).  From bacon at cs nyu edu.
 - (dtucker) [ defines.h] Shadow expiry does not work on QNX6
   so disable it for that platform.  From bacon at cs nyu edu.

 - (djm) [atomicio.c] Fix spin avoidance for platforms that define
   EWOULDBLOCK; patch from ben AT

 - (djm) OpenBSD CVS Sync
   - 2007/08/23 02:49:43
     [auth-passwd.c auth.c session.c]
     unifdef HAVE_LOGIN_CAP; ok deraadt@ millert@
     NB. RCS ID sync only for portable
   - 2007/08/23 02:55:51
     [auth-passwd.c auth.c session.c]
     missed include bits from last commit
     NB. RCS ID sync only for portable
   - 2007/08/23 03:06:10
     login_cap.h doesn't belong here
     NB. RCS ID sync only for portable
   - 2007/08/23 03:22:16
     [auth2-none.c sshd_config sshd_config.5]
     Support "Banner=none" to disable displaying of the pre-login banner;
     ok dtucker@ deraadt@
   - 2007/08/23 03:23:26
     Execute ProxyCommands with $SHELL rather than /bin/sh unconditionally
   - 2007/09/04 03:21:03
     [clientloop.c monitor.c monitor_fdpass.c monitor_fdpass.h]
     [monitor_wrap.c ssh.c]
     make file descriptor passing code return an error rather than call fatal()
     when it encounters problems, and use this to make session multiplexing
     masters survive slaves failing to pass all stdio FDs; ok markus@
   - 2007/09/04 11:15:56
     [ssh.c sshconnect.c sshconnect.h]
     make ssh(1)'s ConnectTimeout option apply to both the TCP connection and
     SSH banner exchange (previously it just covered the TCP connection).
     This allows callers of ssh(1) to better detect and deal with stuck servers
     that accept a TCP connection but don't progress the protocol, and also
     makes ConnectTimeout useful for connections via a ProxyCommand;
     feedback and "looks ok" markus@
   - 2007/09/09 11:38:01
     [ssh-add.c ssh-agent.1 ssh-agent.c ssh-keygen.c]
     sort synopsis and options in ssh-agent(1); usage is lowercase
     ok jmc@
   - 2007/09/11 04:36:29
     sort #include
     NB. RCS ID sync only
   - 2007/09/11 15:47:17
     [session.c ssh-keygen.c sshlogin.c]
     use strcspn to properly overwrite '\n' in fgets returned buffer
     ok pyr@, ray@, millert@, moritz@, chl@
   - 2007/09/11 23:49:09
     remove #if defined block not needed; ok markus@ dtucker@
     NB. RCS ID sync only
   - 2007/09/12 19:39:19
     use xmalloc() and xfree(); ok markus@ pvalchev@
   - 2007/09/13 04:39:04
     fix incorrect test when setting syslog facility; from Jan Pechanec
   - 2007/09/16 00:55:52
     use off_t instead of u_int64_t for file offsets, matching what the
     progressmeter code expects; bz #842
 - (tim) [defines.h] Fix regression in long password support on OpenServer 6.
   Problem report and additional testing rac AT

 - (dtucker) [openbsd-compat/bsd-asprintf.c] Plug mem leak in error path.
   Patch from Jan.Pechanec at sun com.

 - (dtucker) [openbsd-compat/regress/closefromtest.c] Bug #1358: Always
   return 0 on successful test.  From David.Leonard at quest com.
 - (tim) [] Autoconf didn't define HAVE_LIBIAF because we
   did a AC_CHECK_FUNCS within the AC_CHECK_LIB test.

 - (dtucker) [sshd.8] Many Linux variants use a single "!" to denote locked
   accounts and that's what the code looks for, so make man page and code
   agree.  Pointed out by Roumen Petrov.
 - (dtucker) [INSTALL] Group the parts describing random options and PAM
   implementations together which is hopefully more coherent.
 - (dtucker) [INSTALL] the pid file is not
 - (dtucker) [INSTALL] Give PAM its own heading.
 - (dtucker) [INSTALL] Link to tcpwrappers.

 - (dtucker) [session.c] Call PAM cleanup functions for unauthenticated
   connections too.  Based on a patch from Sandro Wefel, with & ok djm@

 - (dtucker) OpenBSD CVS Sync
   - 2007/08/15 08:14:46
     do NOT fall back to the trused x11 cookie if generation of an untrusted
     cookie fails; from Jan Pechanec, via security-alert at;
     ok dtucker
   - 2007/08/15 08:16:49
     openssh 4.7
   - 2007/08/15 12:13:41
     tun device forwarding now honours ExitOnForwardFailure; ok markus@
 - (dtucker) [openbsd-compat/bsd-cray.c] Remove debug from signal handler.
   ok djm@
 - (dtucker) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec
   contrib/suse/openssh.spec] Crank version.

 - (dtucker) [session.c] Bug #1339: ensure that pam_setcred() is always
   called with PAM_ESTABLISH_CRED at least once, which resolves a problem
   with pam_dhkeys.  Patch from David Leonard, ok djm@

 - (dtucker) [auth-pam.c] Use sigdie here too.  ok djm@
 - (dtucker) [] Bug #1343: Set DISABLE_FD_PASSING for QNX6. From 
   Matt Kraai, ok djm@ 

 - (dtucker) [openbsd-compat/port-aix.c] Comment typo.
 - (dtucker) [README.platform] Document the interaction between PermitRootLogin
   and the AIX native login restrictions.
 - (dtucker) [defines.h] Remove _PATH_{CSHELL,SHELLS} which aren't
   used anywhere and are a potential source of warnings.

 - (djm) OpenBSD CVS Sync
   - 2007/07/12 05:48:05
     Delint: remove some unreachable statements, from Bret Lambert.
     OK markus@ and dtucker@.
   - 2007/08/06 19:16:06
     [scp.1 scp.c]
     the ellipsis is not an optional argument; while here, sync the usage
     and synopsis of commands
     lots of good ideas by jmc@
     ok jmc@
   - 2007/08/07 07:32:53
     [clientloop.c clientloop.h ssh.c]
     bz#1232: ensure that any specified LocalCommand is executed after the
     tunnel device is opened. Also, make failures to open a tunnel device
     fatal when ExitOnForwardFailure is active.
     Reported by h.goebel AT; ok dtucker markus reyk deraadt

 - (tim) [] make FMRI match what package scripts use.
 - (tim) [openbsd-compat/regress/closefromtest.c] Bug 1345: fix open() call.
   Report/patch by David.Leonard AT (and Bernhard Simon)
 - (tim) [] Allow more flexibility where smf(5)
 - (tim) [] s|$FAKE_ROOT/${sysconfdir}|$FAKE_ROOT${sysconfdir}|

 - (djm) bz#1325: Fix SELinux in permissive mode where it would
   incorrectly fatal() on errors. patch from cjwatson AT;
   ok dtucker

 - (dtucker) OpenBSD CVS Sync
   - 2007/06/13 00:21:27
     don't ftruncate() non-regular files; bz#1236 reported by wood AT; ok dtucker@
   - 2007/06/14 21:43:25
     handle EINTR when waiting for mux exit status properly
   - 2007/06/14 22:48:05
     when waiting for the multiplex exit status, read until the master end
     writes an entire int of data *and* closes the client_fd; fixes mux
     regression spotted by dtucker, ok dtucker@
   - 2007/06/19 02:04:43
     if the fd passed to atomicio/atomiciov() is non blocking, then poll() to
     avoid a spin if it is not yet ready for reading/writing; ok dtucker@
   - 2007/06/25 08:20:03
     Correct test for window updates every three packets; prevents sending
     window updates for every single packet.  ok markus@
   - 2007/06/25 12:02:27
     Include <poll.h> like the man page says rather than <sys/poll.h>.  ok djm@
 - (dtucker) [atomicio.c] Test for EWOULDBLOCK in atomiciov to match
 - (dtucker) [atomicio.c openbsd-compat/
   openbsd-compat/bsd-poll.{c,h} openbsd-compat/openbsd-compat.h]
   Add an implementation of poll() built on top of select(2).  Code from
   OpenNTPD with changes suggested by djm.  ok djm@

 - (dtucker) [cipher-ctr.c umac.c openbsd-compat/openssl-compat.h] Move the
   USE_BUILTIN_RIJNDAEL compat goop to openssl-compat.h so it can be
   shared with umac.c.  Allows building with OpenSSL 0.9.5 again including
   umac support.  With tim@ djm@, ok djm.
 - (dtucker) [openbsd-compat/openssl-compat.h] Merge USE_BUILTIN_RIJNDAEL
   sections.  Fixes builds with early OpenSSL 0.9.6 versions.
 - (dtucker) [openbsd-compat/openssl-compat.h] Remove redundant definition
   of USE_BUILTIN_RIJNDAEL since the <0.9.6 test is covered by the
   subsequent <0.9.7 test.

 - (dtucker) OpenBSD CVS Sync
   - 2007/06/11 09:14:00
     increase default channel windows; ok djm
   - 2007/06/12 07:41:00
     better document ssh-add's -d option (delete identies from agent), bz#1224
     new text based on some provided by andrewmc-debian AT;
     ok dtucker@
   - 2007/06/12 08:20:00
     [ssh-gss.h gss-serv.c gss-genr.c]
     relocate server-only GSSAPI code from libssh to server; bz #1225
     patch from simon AT; ok markus@ dtucker@
   - 2007/06/12 08:24:20
     make scp try to skip FIFOs rather than blocking when nothing is listening.
     depends on the platform supporting sane O_NONBLOCK semantics for open
     on FIFOs (apparently POSIX does not mandate this), which OpenBSD does.
     bz #856; report by cjwatson AT; ok markus@
   - 2007/06/12 11:11:08
     fix slave exit value when a control master goes away without passing the
     full exit status by ensuring that the slave reads a full int. bz#1261
     reported by frekko AT; ok markus@ dtucker@
   - 2007/06/12 11:15:17
     [ssh.c ssh.1]
     Add "-K" flag for ssh to set GSSAPIAuthentication=yes and
     GSSAPIDelegateCredentials=yes. This is symmetric with -k (disable GSSAPI)
     and is useful for hosts with /home on Kerberised NFS; bz #1312
     patch from Markus.Kuhn AT; ok dtucker@ markus@
   - 2007/06/12 11:45:27
     improved exit message from multiplex slave sessions; bz #1262
     reported by alexandre.nunes AT; ok dtucker@
   - 2007/06/12 11:56:15
     Pass GSS OID to gss_display_status to provide better information in
     error messages.  Patch from Simon Wilkinson via bz 1220.  ok djm@
   - 2007/06/12 13:41:03
     identies -> identities;
   - 2007/06/12 13:43:55
     add -K to SYNOPSIS;
   - 2007/06/12 13:54:28
     Encode filename with strnvis if the name contains a newline (which can't
     be represented in the scp protocol), from bz #891.  ok markus@

 - (djm) Bugzilla #1306: silence spurious error messages from hang-on-exit
   fix; tested by dtucker@ and jochen.kirn AT
   - 2007/06/07 19:37:34
     [kex.h mac.c mac.h monitor_wrap.c myproposal.h packet.c ssh.1]
     [ssh_config.5 sshd.8 sshd_config.5]
     Add a new MAC algorithm for data integrity, UMAC-64 (not default yet,
     must specify Provides about 20% end-to-end speedup
     compared to hmac-md5. Represents a different approach to message
     authentication to that of HMAC that may be beneficial if HMAC based on
     one of its underlying hash algorithms is found to be vulnerable to a
     new attack.
     in conjunction with and OK djm@
   - 2007/06/08 04:40:40
     Add a "MACs" line after "Ciphers" with the default MAC algorithms,
     to ease people who want to tweak both (eg. for performance reasons).
     ok deraadt@ djm@ dtucker@
   - 2007/06/08 07:43:46
     put the MAC list into a display, like we do for ciphers,
     since groff has trouble handling wide lines;
   - 2007/06/08 07:48:09
     oops, here too: put the MAC list into a display, like we do for
     ciphers, since groff has trouble with wide lines;
   - 2007/06/11 08:04:44
     send 'window adjust' messages every tree packets and do not wait
     until 50% of the window is consumed.  ok djm dtucker
 - (djm) [ umac.c] If platform doesn't provide swap32(3), then
   fallback to provided bit-swizzing functions
 - (dtucker) [openbsd-compat/bsd-misc.c] According to the spec the "remainder"
   argument to nanosleep may be NULL.  Currently this never happens in OpenSSH,
   but check anyway in case this changes or the code gets used elsewhere.
 - (dtucker) [includes.h] Bug #1243: HAVE_PATHS -> HAVE_PATHS_H.  Should
   prevent warnings about redefinitions of various things in paths.h.
   Spotted by cartmanltd at

 - (dtucker) OpenBSD CVS Sync
   - 2007/05/22 10:18:52
     zap double include; from p_nowaczyk AT
     (not required in -portable, Id sync only)
   - 2007/05/30 05:58:13
     tidy: KNF, ARGSUSED and u_int
   - 2007/05/31 19:20:16
     [scp.1 ssh_config.5 sftp-server.8 ssh-agent.1 sshd_config.5 sftp.1
     ssh-keygen.1 ssh-keyscan.1 ssh-add.1 sshd.8 ssh.1 ssh-keysign.8]
     convert to new .Dd format;
     (We will need to teach mdoc2man.awk to understand this too.)
   - 2007/05/31 23:34:29
     gc unreachable code; spotted by Tavis Ormandy
   - 2007/06/02 09:04:58
     memory leak on error path; from arnaud.lacombe.1 AT
   - 2007/06/05 06:52:37
     [kex.c monitor_wrap.c packet.c mac.h kex.h mac.c]
     Preserve MAC ctx between packets, saving 2xhash calls per-packet.
     Yields around a 12-16% end-to-end speedup for arcfour256/hmac-md5
     patch from markus@ tested dtucker@ and myself, ok markus@ and me (I'm
     committing at his request)
 - (dtucker) [mdoc2man.awk] Teach it to deal with $Mdocdate tags that
   OpenBSD's cvs now adds.
 - (dtucker) [mdoc2man.awk] Remove trailing "$" from Mdocdate regex so
   mindrot's cvs doesn't expand it on us.
 - (dtucker) [mdoc2man.awk] Add support for %R references, used for RFCs.

 - (dtucker) OpenBSD CVS Sync
   - 2007/04/14 22:01:58
     remove unused macro; from Dmitry V. Levin <>
   - 2007/04/18 01:12:43
     cast "%llu" format spec to (unsigned long long); do not assume a
     u_int64_t arg is the same as 'unsigned long long'.
     from Dmitry V. Levin <>
     ok markus@ 'Yes, that looks correct' millert@
   - 2007/04/23 10:15:39
     Remove debug() left over from development.  ok deraadt@
   - 2007/05/17 07:50:31
     save and restore errno when logging; ok deraadt@
   - 2007/05/17 07:55:29
     bz#1286 stop reading and processing commands when input or output buffer
     is nearly full, otherwise sftp-server would happily try to grow the
     input/output buffers past the maximum supported by the buffer API and
     promptly fatal()
     based on patch from Thue Janus Kristensen; feedback & ok dtucker@
   - 2007/05/17 20:48:13
     fall back to gethostname() when the outgoing connection is not
     on a socket, such as is the case when ProxyCommand is used.
     Gives hostbased auth an opportunity to work; bz#616, report
     and feedback stuart AT; ok markus@
   - 2007/05/17 20:52:13
     pass received SIGINT from monitor to postauth child so it can clean
     up properly. bz#1196, patch from senthilkumar_sen AT;
     ok markus@
   - 2007/05/17 23:53:41
     djm owes me a vb and a tism cd for breaking ssh compilation
 - (dtucker) [auth-pam.c] malloc+memset -> calloc.  Patch from
   ldv at
 - (dtucker) [auth-pam.c] Return empty string if fgets fails in
   sshpam_tty_conv.  Patch from ldv at

 - (tim) [] Bug #1287: Add missing test for ucred.h.

 - (dtucker) [openbsd-compat/bsd-misc.c] Include unistd.h and sys/types.h
   for select(2) prototype.
 - (dtucker) [auth-shadow.c loginrec.c] Include time.h for time(2) prototype.
 - (dtucker) [ openbsd-compat/getrrsetbyname.c] Bug #1299: Use the
   platform's _res if it has one.  Should fix problem of DNSSEC record lookups
   on NetBSD as reported by Curt Sampson.
 - (dtucker) [openbsd-compat/xmmap.c] Include stdlib.h for mkstemp prototype.
 - (dtucker) [ defines.h] Have configure check for MAXSYMLINKS
   so we don't get redefinition warnings.
 - (dtucker) [openbsd-compat/xmmap.c] Include stdlib.h for mkstemp prototype.
 - (dtucker) [ defines.h] Prevent warnings about __attribute__
   __nonnull__ for versions of GCC that don't support it.
 - (dtucker) [ defines.h] Have configure check for offsetof
   to prevent redefinition warnings.

 - (dtucker) [INSTALL] Update the systems that have PAM as standard.  Link
   to OpenPAM too.
 - (dtucker) [INSTALL] prngd lives at sourceforge these days.

 - (tim) [auth.c defines.h session.c openbsd-compat/port-uw.c
   openbsd-compat/port-uw.h openbsd-compat/xcrypt.c] Rework libiaf test/defines
   to account for IRIX having libiaf but not set_id(). Patch with & ok dtucker@

 - (dtucker) [] Replace single-purpose LIBSELINUX,
   LIBWRAP and LIBPAM variables in Makefile with the general-purpose
   SSHDLIBS.  "I like" djm@

 - (dtucker) OpenBSD CVS Sync
   - 2007/03/09 05:20:06
     [servconf.c sshd.c]
     Move C/R -> kbdint special case to after the defaults have been
     loaded, which makes ChallengeResponse default to yes again.  This
     was broken by the Match changes and not fixed properly subsequently.
     Found by okan at, ok djm@ "please do it" deraadt@
   - 2007/03/19 01:01:29
     Disable the legacy SSH protocol 1 for new installations via
     a configuration override. In the future, we will change the
     server's default itself so users who need the legacy protocol
     will need to turn it on explicitly
   - 2007/03/19 12:16:42
     Remove the signal handler that checks if the agent's parent process
     has gone away, instead check when the select loop returns.  Record when
     the next key will expire when scanning for expired keys.  Set the select
     timeout to whichever of these two things happens next.  With djm@, with &
     ok deraadt@ markus@
   - 2007/03/20 03:56:12
     [readconf.c clientloop.c]
     remove some bogus *p tests from charles longeau
     ok deraadt millert
   - 2007/03/20 15:57:15
     - let synopsis and description agree for -f
     - sort FILES
     - +.Xr ssh-keyscan 1 ,
     from Igor Sobrado
 - (dtucker) [ openbsd-compat/bsd-getpeereid.c] Bug #1287: Use
   getpeerucred to implement getpeereid (currently only Solaris 10 and up).
   Patch by Jan.Pechanec at Sun.
 - (dtucker) [regress/] Do peereid test if we have
   HAVE_GETPEERUCRED too.  Also from Jan Pechanec.

 - (dtucker) [entropy.c scard-opensc.c ssh-rand-helper.c] Bug #1294: include
   string.h to prevent warnings, from vapier at
 - (dtucker) [LICENCE] Add Daniel Walsh as a copyright holder for the
   selinux bits in -portable.
 - (dtucker) [cipher-3des1.c cipher-bf1.c] The OpenSSL 0.9.8e problem in
   bug #1291 also affects Protocol 1 3des.  While at it, use compat-openssl.h
   in cipher-bf1.c.  Patch from Juan Gallego.
 - (dtucker) [README.platform] Info about blibpath on AIX.

 - (djm) OpenBSD CVS Sync
   - 2007/03/01 16:19:33
     sort the `match' keywords;
   - 2007/03/06 10:13:14
     openssh-4.6; "please" deraadt@
 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
   [contrib/suse/openssh.spec] crank spec files for release
 - (djm) [README] correct link to release notes
 - (djm) Release 4.6p1

 - (djm) [] add a --without-openssl-header-check option to
   configure, as some platforms (OS X) ship OpenSSL headers whose version
   does not match that of the shipping library. ok dtucker@
 - (dtucker) [openbsd-compat/openssl-compat.h] Bug #1291: Work around a
   bug in OpenSSL 0.9.8e that prevents aes256-ctr, aes192-ctr and arcfour256
   ciphers from working correctly (disconnects with "Bad packet length"
   errors) as found by Ben Harris.  ok djm@

 - (dtucker) [regress/] Make ttrace gdb error a little more
   general to cover newer gdb versions on HP-UX.

 - (dtucker) [] For Cygwin, read files in textmode (which allows
   CRLF as well as LF lineendings) and write in binary mode.  Patch from
   vinschen at
 - (dtucker) [INSTALL] Update to autoconf-2.61.

 - (dtucker) OpenBSD CVS Sync
   - 2007/03/01 10:28:02
     [auth2.c sshd_config.5 servconf.c]
     Remove ChallengeResponseAuthentication support inside a Match
     block as its interaction with KbdInteractive makes it difficult to
     support.  Also, relocate the CR/kbdint option special-case code into
     servconf.  "please commit" djm@, ok markus@ for the relocation.
 - (tim) [] Clean up Solaris 10 smf(5) bits.
   "Looks sane" dtucker@

 - (dtucker) OpenBSD CVS Sync
   - 2007/02/28 00:55:30
     Remove expired keys periodically so they don't remain in memory when
     the agent is entirely idle, as noted by David R. Piegdon.  This is the
     simple fix, a more efficient one will be done later.  With markus,
     deraadt, with & ok djm.

 - (dtucker) OpenBSD CVS Sync
   - 2007/02/20 10:25:14
     set maximum packet and window sizes the same for multiplexed clients
     as normal connections; ok markus@
   - 2007/02/21 11:00:05
     Clear alarm() before restarting sshd on SIGHUP.  Without this, if there's
     a SIGALRM pending (for SSH1 key regeneration) when sshd is SIGHUP'ed, the
     newly exec'ed sshd will get the SIGALRM and not have a handler for it,
     and the default action will terminate the listening sshd.  Analysis and
     patch from andrew at
   - 2007/02/22 12:58:40
     Check activep so Match and GatewayPorts work together; ok markus@
   - 2007/02/24 03:30:11
     - strlen returns size_t, not int.
     - Pass full buffer size to fgets.
     OK djm@, millert@, and moritz@.

  - (dtucker) OpenBSD CVS Sync
   - 2007/01/10 13:23:22
     do not use a list for SYNOPSIS;
     this is actually part of a larger report sent by eric s. raymond
     and forwarded by brad, but i only read half of it. spotted by brad.
   - 2007/01/12 20:20:41
     [ssh-keygen.1 ssh-keygen.c]
     more secsh -> rfc 4716 updates;
     spotted by wiz@netbsd
     ok markus
   - 2007/01/17 23:22:52
     Honour activep for times (eg ServerAliveInterval) while parsing
     ssh_config and ~/.ssh/config so they work properly with Host directives.
     From via bz #1275.  ok markus@
   - 2007/01/21 01:41:54
     [auth-skey.c kex.c ssh-keygen.c session.c clientloop.c]
   - 2007/01/21 01:45:35
   - 2007/01/22 11:32:50
     return error from do_upload() when a write fails. fixes bz#1252: zero
     exit status from sftp when uploading to a full device. report from
     jirkat AT; ok dtucker@
   - 2007/01/22 13:06:21
     fix detection of whether we should show progress meter or not: scp
     tested isatty(stderr) but wrote the progress meter to stdout. This patch
     makes it test stdout. bz#1265 reported by junkmail AT;
     of dtucker@
   - 2007/02/14 14:32:00
     typos in comments; ok jmc@
   - 2007/02/19 10:45:58
     [monitor_wrap.c servconf.c servconf.h monitor.c sshd_config.5]
     Teach Match how handle config directives that are used before
     authentication.  This allows configurations such as permitting password
     authentication from the local net only while requiring pubkey from
     offsite.  ok djm@, man page bits ok jmc@
 - (dtucker) [contrib/] Add "which" as a shell function since some
   platforms don't have it.  Patch from dleonard at
 - (dtucker) [openbsd-compat/getrrsetbyname.c] Don't attempt to calloc
   an array for signatures when there are none since "calloc(0, n) returns
   NULL on some platforms (eg Tru64), which is explicitly permitted by
   POSIX.  Diagnosis and patch by svallet

 - (djm) [channels.c serverloop.c] Fix so-called "hang on exit" (bz #52)
   when closing a tty session when a background process still holds tty
   fds open. Great detective work and patch by Marc Aurele La France,
   slightly tweaked by me; ok dtucker@

 - (dtucker) [openbsd-compat/bsd-snprintf.c] Static declarations for public
   library interfaces aren't very helpful. Fix up the DOPR_OUTCH macro
   so it works properly and modify its callers so that they don't pre or
   post decrement arguments that are conditionally evaluated. While there,
   put SNPRINTF_CONST back as it prevents build failures in some
   configurations.  ok djm@ (for most of it)

 - (djm) [ssh-rand-helper.8] manpage nits;
   from dleonard AT (bz#1529)

 - (dtucker) [packet.c] Re-remove in_systm.h since it's already in includes.h
   and multiple including it causes problems on old IRIXes.  (It snuck back
   in during a sync.)  Found (again) by Georg Schwarz.

 - (dtucker) [ssh-keygen.c] av -> argv to match earlier sync.
 - (djm) [openbsd-compat/bsd-snprintf.c] Fix integer overflow in return
   value of snprintf replacement, similar to bugs in various libc
   implementations. This overflow is not exploitable in OpenSSH. 
   While I'm fiddling with it, make it a fair bit faster by inlining the
   append-char routine; ok dtucker@

 - (djm) OpenBSD CVS Sync
   - 2006/11/14 19:41:04
     use argc and argv not some made up short form
   - 2006/11/23 01:35:11
     [misc.c sftp.c]
     Don't access buf[strlen(buf) - 1] for zero-length strings.
     ``ok by me'' djm@.
   - 2006/12/11 21:25:46
     [ssh-keygen.1 ssh.1]
     add rfc 4716 (public key format); ok jmc
   - 2006/12/12 03:58:42
     [channels.c compat.c compat.h]
     bz #1019: some versions apparently can't cope with the
     remote port forwarding bind_address being a hostname, so send
     them an address for cases where they are not explicitly
     specified (wildcard or localhost bind).  reported by daveroth AT; ok dtucker@ deraadt@
   - 2006/12/13 08:34:39
     Make PermitOpen work with multiple values like the man pages says.
     bz #1267 with details from peter at, with & ok djm@
   - 2006/12/14 10:01:14
     Make "PermitOpen all" first-match within a block to match the way other
     options work.  ok markus@ djm@
   - 2007/01/02 09:57:25
     do not use lists for SYNOPSIS;
     from eric s. raymond via brad
   - 2007/01/03 00:53:38
     remove small dead code; via Coverity scan
   - 2007/01/03 03:01:40
     [auth2-chall.c channels.c dns.c sftp.c ssh-keygen.c ssh.c]
   - 2007/01/03 04:09:15
     ARGSUSED for lint
   - 2007/01/03 07:22:36

 - (djm) [auth.c] Fix NULL pointer dereference in fakepw().  Crash would
   occur if the server did not have the privsep user and an invalid user
   tried to login and both privsep and krb5 auth are disabled; ok dtucker@
 - (djm) [bsd-asprintf.c] Better test for bad vsnprintf lengths; ok dtucker@

 - (dtucker) OpenBSD CVS Sync
   - 2006/11/07 13:02:07
     BN_hex2bn returns int; from dtucker@

 - (dtucker) [sshd.c] Use privsep_pw if we have it, but only require it
   if we absolutely need it.  Pointed out by Corinna, ok djm@
 - (dtucker) OpenBSD CVS Sync
   - 2006/11/06 21:25:28
     [auth-rsa.c kexgexc.c kexdhs.c key.c ssh-dss.c sshd.c kexgexs.c
     ssh-keygen.c bufbn.c moduli.c scard.c kexdhc.c sshconnect1.c dh.c rsa.c]
     add missing checks for openssl return codes; with & ok djm@
   - 2006/11/07 10:31:31
     [monitor.c version.h]
     correctly check for bad signatures in the monitor, otherwise the monitor
     and the unpriv process can get out of sync. with dtucker@, ok djm@,
 - (dtucker) [README contrib/{caldera,redhat,contrib}/openssh.spec] Bump
 - (dtucker) Release 4.5p1.

 - (djm) OpenBSD CVS Sync
   - 2006/10/28 18:08:10
     correct/expand example of usage of -w; ok jmc@ stevesk@
   - 2006/10/31 16:33:12
     [kexdhc.c kexdhs.c kexgexc.c kexgexs.c]
     check DH_compute_key() for -1 even if it should not happen because of
     earlier calls to dh_pub_is_valid(); report krahmer at; ok djm

 - (dtucker) [openbsd-compat/port-solaris.c] Bug #1255: Make only hwerr
   events fatal in Solaris process contract support and tell it to signal
   only processes in the same process group when something happens.
   Based on information from andrew.benham at and similar to
   a patch from Chad Mynhier.  ok djm@

- (djm) [auth.c] gc some dead code

 - (djm) OpenBSD CVS Sync
   - 2006/09/30 17:48:22
     Clear errno before calling the strtol functions.
     From Paul Stoeber <x0001 at x dot de1 dot cc>.
     OK deraadt@.
   - 2006/10/06 02:29:19
     [ssh-agent.c ssh-keyscan.c ssh.c]
     sys/resource.h needs sys/time.h; prompted by brad@
     (NB. Id sync only for portable)
   - 2006/10/09 23:36:11
     xmalloc -> xcalloc that was missed previously, from portable
     (NB. Id sync only for portable, obviously)
   - 2006/10/10 10:12:45
     sleep before retrying (not after) since sleep changes errno; fixes
     pr 5250;; ok dtucker djm
   - 2006/10/11 12:38:03
     [clientloop.c serverloop.c]
     exit instead of doing a blocking tcp send if we detect a client/server
     timeout, since the tcp sendqueue might be already full (of alive
     requests); ok dtucker, report mpf
   - 2006/10/22 02:25:50
     cancel progress meter when upload write fails; ok deraadt@
 - (tim) [ scard/] Add datarootdir= lines to keep
   autoconf 2.60 from complaining.

 - (dtucker) OpenBSD CVS Sync
   - 2006/09/25 04:55:38
     [ssh-keyscan.1 ssh.1]
     Change "a SSH" to "an SSH".  Hurray, I'm not the only one who
     pronounces "SSH" as "ess-ess-aich".
     OK jmc@ and stevesk@.
 - (dtucker) [sshd.c] Reshuffle storing of pw struct; prevents warnings
   on older versions of OS X.  ok djm@

 - (dtucker) [monitor_fdpass.c] Include sys/in.h, required for cmsg macros
   on older (2.0) Linuxes.  Based on patch from thmo-13 at gmx de.

 - (tim) [] Use uname -r instead of -v in OS_VER for Solaris.
   Differentiate between OpenServer 5 and OpenServer 6
 - (dtucker) [] Set put -lselinux into $LIBS while testing for
   SELinux functions so they're detected correctly.  Patch from pebenito at
 - (tim) [] Some systems have really limited nawk (OpenServer).
   Allow setting alternate awk in openssh-config.local.

 - (tim) [] Move CHECK_HEADERS test before platform specific
   section so additional platform specific CHECK_HEADER tests will work
   correctly. Fixes "<net/if_tap.h> on FreeBSD" problem report by des AT
   Feedback and "seems like a good idea" dtucker@

 - (dtucker) [audit-bsm.c] Include errno.h.  Pointed out by des at

 - (dtucker) [] Bug #1239: Fix configure test for OpenSSH engine
   support.  Patch from andrew.benham at thus net.

 - (dtucker) [entropy.c] Bug #1238: include signal.h to fix compilation error
   on Solaris 8 w/out /dev/random or prngd.  Patch from rl at

 - (dtucker) [bufaux.h] nuke bufaux.h; it's already gone from OpenBSD and not
   referenced any more.  ok djm@
 - (dtucker) [sftp-server.8] Resync; spotted by djm@
 - (dtucker) Release 4.4p1.

 - (tim) [] Remove CFLAGS hack for UnixWare 1.x/2.x (added
   to rev 1.308) to work around broken gcc 2.x header file.

 - (dtucker) [] Bug #1234: Put opensc libs into $LIBS rather than
   $LDFLAGS.  Patch from vapier at gentoo org.

 - (dtucker) [packet.c canohost.c] Include arpa/inet.h for htonl macros on
   some platforms (eg HP-UX 11.00).  From santhi.amirta at gmail com.

 - (dtucker) OpenBSD CVS Sync
   - 2006/09/19 05:52:23
     Use S_IS* macros insted of masking with S_IF* flags. The latter may
     have multiple bits set, which lead to surprising results. Spotted by
     Paul Stoeber, more to come. ok millert@ pedro@ jaredy@ djm@
   - 2006/09/19 21:14:08
     client NULL deref on protocol error; Tavis Ormandy, Google Security Team
 - (dtucker) [defines.h] Include unistd.h before defining getpgrp; fixes
   build error on Ultrix.  From Bernhard Simon.

 - (dtucker) [] On AIX, check to see if the compiler will allow
   macro redefinitions, and if not, remove "-qlanglvl=ansi" from the flags.
   Allows build out of the box with older VAC and XLC compilers.  Found by
   David Bronder and Bernhard Simon.
 - (dtucker) [openbsd-compat/port-aix.{c,h}] Reduce scope of includes.
   Prevents macro redefinition warnings of "RDONLY".

 - OpenBSD CVS Sync
   - 2006/09/16 19:53:37
     [deattack.c deattack.h packet.c]
     limit maximum work performed by the CRC compensation attack detector,
     problem reported by Tavis Ormandy, Google Security Team;
     ok markus@ deraadt@
 - (djm) Add openssh.xml to .cvsignore and sort it
 - (dtucker) [auth-pam.c] Propogate TZ environment variable to PAM auth
   process so that any logging it does is with the right timezone.  From
   Scott Strickler, ok djm@.
 - (dtucker) [monitor.c] Correctly handle auditing of single commands when
   using Protocol 1.  From jhb at freebsd.
 - (djm) [sshd.c] Fix warning/API abuse; ok dtucker@
 - (dtucker) [INSTALL] Add info about audit support.

 - (djm) []
   Support SMF in Solaris Packages if enabled by configure. Patch from
   Chad Mynhier, tested by dtucker@

 - (dtucker) [cipher-aes.c] Include string.h for memcpy and friends.  Noted
   by Pekka Savola.

 - (dtucker) [contrib/aix/] Ensure that perl is available.
 - (dtucker) [] Add -lcrypt to let DragonFly build OOTB.

 - (dtucker) [openbsd-compat/bsd-snprintf.c] Add stdarg.h.
 - (dtucker) [contrib/aix/] Always create privsep user.
 - (dtucker) [] Always create privsep user.  ok djm@

 - (dtucker) [auth-sia.c] Add includes required for build on Tru64.  Patch
   from Chris Adams.
 - (dtucker) [] The BSM header test needs time.h in some cases.

 - (djm) [sshd.c auth.c] Set up fakepw() with privsep uid/gid, so it can
   be used to drop privilege to; fixes Solaris GSSAPI crash reported by
   Magnus Abrante; suggestion and feedback dtucker@
   NB. this change will require that the privilege separation user must
   exist on all the time, not just when UsePrivilegeSeparation=yes
 - (dtucker) [loginrec.c] Wrap paths.h in HAVE_PATHS_H.
 - (dtucker) [regress/] stop_client is racy, so give us a better
   chance of winning.

 - (dtucker) [] s/AC_DEFINES/AC_DEFINE/ spotted by Roumen Petrov.
 - (dtucker) [loginrec.c] Include paths.h for _PATH_BTMP.

 - (dtucker) [] Define BROKEN_UPDWTMP on SCO OSR6 as the native
   updwdtmp seems to generate invalid wtmp entries.  From Roger Cornelius,
   ok djm@

 - (dtucker) [ openbsd-compat/openbsd-compat.h] Check for
   declaration of writev(2) and declare it ourselves if necessary.  Makes
   the atomiciov() calls build on really old systems.  ok djm@

 - (dtucker) [openbsd-compat/port-irix.c] Add errno.h, found by Iain Morgan.
 - (dtucker) [ssh-keyscan.c ssh-rand-helper.c ssh.c sshconnect.c
   openbsd-compat/bindresvport.c openbsd-compat/getrrsetbyname.c
   openbsd-compat/port-tun.c openbsd-compat/rresvport.c] Include <arpa/inet.h>
   for hton* and ntoh* macros.  Required on (at least) HP-UX since we define
   _XOPEN_SOURCE_EXTENDED.  Found by santhi.amirta at gmail com.

 - (djm) [audit-bsm.c audit.c auth-bsdauth.c auth-chall.c auth-pam.c]
   [auth-rsa.c auth-shadow.c auth-sia.c auth1.c auth2-chall.c]
   [auth2-gss.c auth2-kbdint.c auth2-none.c authfd.c authfile.c]
   [cipher-3des1.c cipher-aes.c cipher-bf1.c cipher-ctr.c clientloop.c]
   [dh.c dns.c entropy.c gss-serv-krb5.c gss-serv.c hostfile.c kex.c]
   [kexdhc.c kexdhs.c kexgexc.c kexgexs.c key.c loginrec.c mac.c]
   [md5crypt.c monitor.c monitor_wrap.c readconf.c rsa.c]
   [scard-opensc.c scard.c session.c ssh-add.c ssh-agent.c ssh-dss.c]
   [ssh-keygen.c ssh-keysign.c ssh-rsa.c ssh.c sshconnect.c]
   [sshconnect1.c sshconnect2.c sshd.c]
   [openbsd-compat/bsd-cray.c openbsd-compat/port-aix.c]
   [openbsd-compat/port-linux.c openbsd-compat/port-solaris.c]
   Lots of headers for SCO OSR6, mainly adding stdarg.h for log.h;
   compile problems reported by rac AT
 - (djm) [includes.h monitor.c openbsd-compat/bindresvport.c]
   [openbsd-compat/rresvport.c] Some more headers: netinet/in.h 
   sys/socket.h and unistd.h in various places
 - (dtucker) [openbsd-compat/bsd-cygwin_util.c] Fix implict declaration
   warnings for binary_open and binary_close.  Patch from Corinna Vinschen.
 - (dtucker) [ includes.h openbsd-compat/glob.{c,h}] Explicitly
   test for GLOB_NOMATCH and use our glob functions if it's not found.
   Stops sftp from segfaulting when attempting to get a nonexistent file on
   Cygwin (previous versions of OpenSSH didn't use the native glob). Partly
   from and tested by Corinna Vinschen.
 - (dtucker) [README contrib/{caldera,redhat,suse}/openssh.spec]  Crank

 - (djm) [CREDITS LICENCE auth.c includes.h ]
   [platform.c platform.h sshd.c openbsd-compat/]
   [openbsd-compat/openbsd-compat.h openbsd-compat/port-solaris.c]
   [openbsd-compat/port-solaris.h] Add support for Solaris process
   contracts, enabled with --use-solaris-contracts. Patch from Chad
   Mynhier, tweaked by dtucker@ and myself; ok dtucker@
 - (dtucker) [contrib/cygwin/ssh-host-config] Add SeTcbPrivilege privilege
   while setting up the ssh service account.  Patch from Corinna Vinschen.

 - (djm) OpenBSD CVS Sync
   - 2006/08/21 08:14:01
     Document HostbasedUsesNameFromPacketOnly.  Corrections from jmc@,
     ok jmc@ djm@
   - 2006/08/21 08:15:57
     Add more detail about what permissions are and aren't accepted for
     authorized_keys files.  Corrections jmc@, ok djm@, "looks good" jmc@
   - 2006/08/29 10:40:19
     [channels.c session.c]
     normalise some inconsistent (but harmless) NULL pointer checks
     spotted by the Stanford SATURN tool, via Isil Dillig;
     ok markus@ deraadt@
   - 2006/08/29 12:02:30
     Work around a problem in Heimdal that occurs when KRB5CCNAME file is
     missing, by checking whether or not kerberos allocated us a context
     before attempting to free it.  Patch from Simon Wilkinson, tested by
     biorn@, ok djm@
   - 2006/08/30 00:06:51
     Fix regression where SSH2 banner is printed at loglevels ERROR and FATAL
     where previously it weren't.  bz #1221, found by Dean Kopesky, ok djm@
   - 2006/08/30 00:14:37
     crank to 4.4
 - (djm) [openbsd-compat/xcrypt.c] needs unistd.h
 - (dtucker) [auth.c openbsd-compat/port-aix.c] Bug #1207: always call
   loginsuccess on AIX immediately after authentication to clear the failed
   login count.  Previously this would only happen when an interactive
   session starts (ie when a pty is allocated) but this means that accounts
   that have primarily non-interactive sessions (eg scp's) may gradually
   accumulate enough failures to lock out an account.  This change may have
   a side effect of creating two audit records, one with a tty of "ssh"
   corresponding to the authentication and one with the allocated pty per
   interactive session.

 - (dtucker) [openbsd-compat/basename.c] Include errno.h.
 - (dtucker) [openbsd-compat/bsd-misc.c] Add includes needed for select(2) on
   older systems.
 - (dtucker) [openbsd-compat/bsd-misc.c] Include <sys/select.h> for select(2)
   on POSIX systems.
 - (dtucker) [openbsd-compat/bsd-openpty.c] Include for ioctl(2).
 - (dtucker) [openbsd-compat/rresvport.c] Include <stdlib.h> for malloc.
 - (dtucker) [openbsd-compat/xmmap.c] Move #define HAVE_MMAP to prevent
   unused variable warning when we have a broken or missing mmap(2).

 - (dtucker) [] Bug #1177: fix incorrect path for sshrc in
   Makefile.  Patch from santhi.amirta at gmail, ok djm.

 - (dtucker) [log.c] Move ifdef to prevent unused variable warning.
 - (dtucker) [] Save $LIBS during PAM library tests and restore
   afterward.  Removes the need to mangle $LIBS later to remove -lpam and -ldl.
 - (dtucker) [] Relocate --with-pam parts in preparation for
   fixing bug #1181.  No changes yet.
 - (dtucker) [] Bug #1181: Explicitly test to see if OpenSSL
   (0.9.8a and presumably newer) requires -ldl to successfully link.
 - (dtucker) [] Remove errant "-".

 - (djm) OpenBSD CVS Sync
   - 2006/08/18 22:41:29
     GSSAPI error code should be 0 and not -1; from
 - (dtucker) [openbsd-compat/regress/] Add $(EXEEXT) and add a
   single rule for the test progs.

 - (dtucker) [ openbsd-compat/bsd-closefrom.c] Resync with
   closefrom.c from sudo.
 - (dtucker) [openbsd-compat/bsd-closefrom.c] Comment out rcsid.
 - (dtucker) [openbsd-compat/regress/snprintftest.c] Newline on error.
 - (dtucker) [openbsd-compat/regress/] Use implicit rules for the
   test progs instead; they work better than what we have.
 - (djm) OpenBSD CVS Sync
   - 2006/08/06 01:13:32
     [compress.c monitor.c monitor_wrap.c]
     "zlib.h" can be <zlib.h>; ok djm@ markus@
   - 2006/08/12 20:46:46
     [monitor.c monitor_wrap.c]
     Revert previous include file ordering change, for ssh to compile under
     gcc2 (or until openssl include files are cleaned of parameter names
     in function prototypes)
   - 2006/08/14 12:40:25
     [servconf.c servconf.h sshd_config.5]
     Add ability to match groups to Match keyword in sshd_config.  Feedback
     djm@, stevesk@, ok stevesk@.
   - 2006/08/16 11:47:15
     factor inetd connection, TCP listen and main TCP accept loop out of
     main() into separate functions to improve readability; ok markus@
   - 2006/08/18 09:13:26
     [log.c log.h sshd.c]
     make signal handler termination path shorter; risky code pointed out by
     mark dowd; ok djm markus
   - 2006/08/18 09:15:20
     [auth.h session.c sshd.c]
     delay authentication related cleanups until we're authenticated and
     all alarms have been cancelled; ok deraadt
   - 2006/08/18 10:27:16
     reorder so prototypes are sorted by the files they refer to; no
     binary change
   - 2006/08/18 13:54:54
     [gss-genr.c ssh-gss.h sshconnect2.c]
     bz #1218 - disable SPNEGO as per RFC4462; diff from simon AT
     ok markus@
   - 2006/08/18 14:40:34
     [gss-genr.c ssh-gss.h]
     constify host argument to match the rest of the GSSAPI functions and
     unbreak compilation with -Werror
 - (djm) Disable sigdie() for platforms that cannot safely syslog inside
   a signal handler (basically all of them, excepting OpenBSD);
   ok dtucker@

 - (dtucker) [openbsd-compat/fake-rfc2553.c openbsd-compat/setproctitle.c]
   Include stdlib.h for malloc and friends.
 - (dtucker) [ openbsd-compat/bsd-closefrom.c] Use F_CLOSEM fcntl
   for closefrom() on AIX.  Pointed out by William Ahern.
 - (dtucker) [openbsd-compat/regress/{,closefromtest.c}] Regress
   test for closefrom() in compat code.

 - (djm) [audit-bsm.c] Sprinkle in some headers

 - (dtucker) [LICENCE] Add Reyk to the list for the compat dir.

 - (djm) [openbsd-compat/bsd-getpeereid.c] Add some headers to quiet warnings
   on Solaris 10

 - (dtucker) [defines.h] With the includes.h changes we no longer get the
   name clash on "YES" so we can remove the workaround for it.
 - (dtucker) [openbsd-compat/{bsd-asprintf.c,bsd-openpty.c,bsd-snprintf.c,
   glob.c}] Include stdlib.h for malloc and friends in compat code.

 - (djm) OpenBSD CVS Sync
   - 2006/07/24 13:58:22
     disable tunnel forwarding when no strict host key checking
     and key changed; ok djm@ markus@ dtucker@
   - 2006/07/25 02:01:34
     need #include <string.h>
   - 2006/07/25 02:59:21
     [channels.c clientloop.c packet.c scp.c serverloop.c sftp-client.c]
     [sftp-server.c ssh-agent.c ssh-keyscan.c sshconnect.c sshd.c]
     move #include <sys/time.h> out of includes.h
   - 2006/07/26 02:35:17
     [atomicio.c auth.c dh.c authfile.c buffer.c clientloop.c kex.c]
     [groupaccess.c gss-genr.c kexgexs.c misc.c monitor.c monitor_mm.c]
     [packet.c scp.c serverloop.c session.c sftp-client.c sftp-common.c]
     [sftp-server.c sftp.c ssh-add.c ssh-agent.c ssh-keygen.c sshlogin.c]
     [uidswap.c xmalloc.c]
     move #include <sys/param.h> out of includes.h
   - 2006/07/26 13:57:17
     [authfd.c authfile.c dh.c canohost.c channels.c clientloop.c compat.c]
     [hostfile.c kex.c log.c misc.c moduli.c monitor.c packet.c readpass.c]
     [scp.c servconf.c session.c sftp-server.c sftp.c ssh-add.c ssh-agent.c]
     [ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh.c sshconnect.c]
     [sshconnect1.c sshd.c xmalloc.c]
     move #include <stdlib.h> out of includes.h
   - 2006/07/27 08:00:50
     avoid confusing wording in HashKnownHosts:
     originally spotted by alan amesbury;
     ok deraadt
   - 2006/07/27 08:00:50
     avoid confusing wording in HashKnownHosts:
     originally spotted by alan amesbury;
     ok deraadt
   - 2006/08/01 11:34:36
     Allow fallback to known_hosts entries without port qualifiers for
     non-standard ports too, so that all existing known_hosts entries will be
     recognised.  Requested by, feedback and ok markus@
   - 2006/08/01 23:22:48
     [auth-passwd.c auth-rhosts.c auth-rsa.c auth.c auth.h auth1.c]
     [auth2-chall.c auth2-pubkey.c authfile.c buffer.c canohost.c]
     [channels.c clientloop.c dh.c dns.c dns.h hostfile.c kex.c kexdhc.c]
     [kexgexc.c kexgexs.c key.c key.h log.c misc.c misc.h moduli.c]
     [monitor_wrap.c packet.c progressmeter.c readconf.c readpass.c scp.c]
     [servconf.c session.c sftp-client.c sftp-common.c sftp-server.c sftp.c]
     [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keyscan.c ssh.c sshconnect.c]
     [sshconnect1.c sshconnect2.c sshd.c sshlogin.c sshtty.c uuencode.c]
     [uuencode.h xmalloc.c]
     move #include <stdio.h> out of includes.h
   - 2006/08/01 23:36:12
     [authfile.c channels.c progressmeter.c scard.c servconf.c ssh.c]
     clean extra spaces
   - 2006/08/03 03:34:42
     [OVERVIEW atomicio.c atomicio.h auth-bsdauth.c auth-chall.c auth-krb5.c]
     [auth-options.c auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c]
     [auth-rsa.c auth-skey.c auth.c auth.h auth1.c auth2-chall.c auth2-gss.c]
     [auth2-hostbased.c auth2-kbdint.c auth2-none.c auth2-passwd.c ]
     [auth2-pubkey.c auth2.c authfd.c authfd.h authfile.c bufaux.c bufbn.c]
     [buffer.c buffer.h canohost.c channels.c channels.h cipher-3des1.c]
     [cipher-bf1.c cipher-ctr.c cipher.c cleanup.c clientloop.c compat.c]
     [compress.c deattack.c dh.c dispatch.c dns.c dns.h fatal.c groupaccess.c]
     [groupaccess.h gss-genr.c gss-serv-krb5.c gss-serv.c hostfile.c kex.c]
     [kex.h kexdh.c kexdhc.c kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c]
     [key.h log.c log.h mac.c match.c md-sha256.c misc.c misc.h moduli.c]
     [monitor.c monitor_fdpass.c monitor_mm.c monitor_mm.h monitor_wrap.c]
     [monitor_wrap.h msg.c nchan.c packet.c progressmeter.c readconf.c]
     [readconf.h readpass.c rsa.c scard.c scard.h scp.c servconf.c servconf.h]
     [serverloop.c session.c session.h sftp-client.c sftp-common.c]
     [sftp-common.h sftp-glob.c sftp-server.c sftp.c ssh-add.c ssh-agent.c]
     [ssh-dss.c ssh-gss.h ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rsa.c]
     [ssh.c ssh.h sshconnect.c sshconnect.h sshconnect1.c sshconnect2.c]
     [sshd.c sshlogin.c sshlogin.h sshpty.c sshpty.h sshtty.c ttymodes.c]
     [uidswap.c uidswap.h uuencode.c uuencode.h xmalloc.c xmalloc.h]
     [loginrec.c loginrec.h openbsd-compat/port-aix.c openbsd-compat/port-tun.h]
     almost entirely get rid of the culture of ".h files that include .h files"
     ok djm, sort of ok stevesk
     makes the pain stop in one easy step
     NB. portable commit contains everything *except* removing includes.h, as
     that will take a fair bit more work as we move headers that are required
     for portability workarounds to defines.h. (also, this step wasn't "easy")
   - 2006/08/04 20:46:05
     [monitor.c session.c ssh-agent.c]
 - (djm) [auth-pam.c defines.h] Move PAM related bits to auth-pam.c
 - (djm) [auth-pam.c auth.c bufaux.h entropy.c openbsd-compat/port-tun.c]
   remove last traces of bufaux.h - it was merged into buffer.h in the big
   includes.h commit
 - (djm) [auth.c loginrec.c] Missing netinet/in.h for loginrec
 - (djm) [openbsd-compat/regress/snprintftest.c]
   [openbsd-compat/regress/strduptest.c] Add missing includes so they pass
   compilation with "-Wall -Werror"
 - (djm) [auth-pam.c auth-shadow.c auth2-none.c cleanup.c sshd.c]
   [openbsd-compat/port-tun.c openbsd-compat/port-tun.h] Sprinkle more
   includes for Linux in
 - (dtucker) [cleanup.c] Need defines.h for __dead.
 - (dtucker) [auth2-gss.c] We still need the #ifdef GSSAPI in -portable.
 - (dtucker) [openbsd-compat/{bsd-arc4random.c,port-tun.c,xmmap.c}] Lots of
   #include stdarg.h, needed for log.h.
 - (dtucker) [entropy.c] Needs unistd.h too.
 - (dtucker) [ssh-rand-helper.c] Needs stdarg.h for log.h.
 - (dtucker) [openbsd-compat/getrrsetbyname.c] Nees stdlib.h for malloc.
 - (dtucker) [openbsd-compat/strtonum.c] Include stdlib.h for strtoll,
   otherwise it is implicitly declared as returning an int.
 - (dtucker) OpenBSD CVS Sync
   - 2006/08/05 07:52:52
     [auth2-none.c sshd.c monitor_wrap.c]
     Add headers required to build with KERBEROS5=no.  ok djm@
   - 2006/08/05 08:00:33
     Add headers required to build with -DSKEY.  ok djm@
   - 2006/08/05 08:28:24
     [monitor_wrap.c auth-skey.c auth2-chall.c]
     Zap unused variables in -DSKEY code.  ok djm@
   - 2006/08/05 08:34:04
     Typo in comment
 - (dtucker) [openbsd-compat/bsd-cygwin_util.c] Add headers required to compile
   on Cygwin.
 - (dtucker) [openbsd-compat/fake-rfc2553.c] Add headers needed for inet_ntoa.
 - (dtucker) [auth-skey.c] monitor_wrap.h needs ssh-gss.h.
 - (dtucker) [audit.c audit.h] Repair headers.
 - (dtucker) [audit-bsm.c] Add additional headers now required.

 - (dtucker) [] The "crippled AES" test does not work on recent
   versions of Solaris, so use AC_LINK_IFELSE to actually link the test program
   rather than just compiling it.  Spotted by dlg@.

 - (dtucker) [openbsd-compat/daemon.c] Add unistd.h for fork() prototype.

 - (dtucker) [openbsd-compat/xmmap.c] Need fcntl.h for O_RDRW.

 - (djm) OpenBSD CVS Sync
   - 2006/07/12 13:39:55
      - new sentence, new line
      - s/The the/The/
      - kill a bad comma
   - 2006/07/12 22:28:52
     [auth-options.c canohost.c channels.c includes.h readconf.c]
     [servconf.c ssh-keyscan.c ssh.c sshconnect.c sshd.c]
     move #include <netdb.h> out of includes.h; ok djm@
   - 2006/07/12 22:42:32
     [includes.h ssh.c ssh-rand-helper.c]
     move #include <stddef.h> out of includes.h
   - 2006/07/14 01:15:28
     don't need incompletely-typed 'struct passwd' now with
     #include <pwd.h>; ok markus@
   - 2006/07/17 01:31:10
     [authfd.c authfile.c channels.c cleanup.c clientloop.c groupaccess.c]
     [includes.h log.c misc.c msg.c packet.c progressmeter.c readconf.c]
     [readpass.c scp.c servconf.c sftp-client.c sftp-server.c sftp.c]
     [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh.c]
     [sshconnect.c sshlogin.c sshpty.c uidswap.c]
     move #include <unistd.h> out of includes.h
   - 2006/07/17 12:02:24
     Use '\0' rather than 0 to terminates strings; ok djm@
   - 2006/07/17 12:06:00
     [channels.c channels.h servconf.c sshd_config.5]
     Add PermitOpen directive to sshd_config which is equivalent to the
     "permitopen" key option.  Allows server admin to allow TCP port
     forwarding only two specific host/port pairs.  Useful when combined
     with Match.
     If permitopen is used in both sshd_config and a key option, both
     must allow a given connection before it will be permitted.
     Note that users can still use external forwarders such as netcat,
     so to be those must be controlled too for the limits to be effective.
     Feedback & ok djm@, man page corrections & ok jmc@.
   - 2006/07/18 07:50:40
     tweak; ok dtucker
   - 2006/07/18 07:56:28
     replace DIAGNOSTICS with .Ex;
   - 2006/07/18 08:03:09
     [ssh-agent.1 sshd_config.5]
     mark up angle brackets;
   - 2006/07/18 08:22:23
     Clarify description of Match, with minor correction from jmc@
   - 2006/07/18 22:27:55
     remove unneeded includes; ok djm@
   - 2006/07/19 08:56:41
     [servconf.c sshd_config.5]
     Add support for X11Forwaring, X11DisplayOffset and X11UseLocalhost to
     Match.  ok djm@
   - 2006/07/19 13:07:10
     [servconf.c servconf.h session.c sshd.8 sshd_config sshd_config.5]
     Add ForceCommand keyword to sshd_config, equivalent to the "command="
     key option, man page entry and example in sshd_config.
     Feedback & ok djm@, man page corrections & ok jmc@
   - 2006/07/20 15:26:15
     [auth1.c serverloop.c session.c sshconnect2.c]
     missed some needed #include <unistd.h> when KERBEROS5=no; issue from
   - 2006/07/21 12:43:36
     [channels.c channels.h servconf.c servconf.h sshd_config.5]
     Make PermitOpen take a list of permitted ports and act more like most
     other keywords (ie the first match is the effective setting). This
     also makes it easier to override a previously set PermitOpen. ok djm@
   - 2006/07/21 21:13:30
     more ARGSUSED (lint) for dispatch table-driven functions; ok djm@
   - 2006/07/21 21:26:55
     ARGSUSED for signal handler
   - 2006/07/22 19:08:54
     [includes.h moduli.c progressmeter.c scp.c sftp-common.c]
     [sftp-server.c ssh-agent.c sshlogin.c]
     move #include <time.h> out of includes.h
   - 2006/07/22 20:48:23
     [atomicio.c auth-options.c auth-passwd.c auth-rhosts.c auth-rsa.c]
     [auth.c auth1.c auth2-chall.c auth2-hostbased.c auth2-passwd.c auth2.c]
     [authfd.c authfile.c bufaux.c bufbn.c buffer.c canohost.c channels.c]
     [cipher-3des1.c cipher-bf1.c cipher-ctr.c cipher.c clientloop.c]
     [compat.c deattack.c dh.c dns.c gss-genr.c gss-serv.c hostfile.c]
     [includes.h kex.c kexdhc.c kexdhs.c kexgexc.c kexgexs.c key.c log.c]
     [mac.c match.c md-sha256.c misc.c moduli.c monitor.c monitor_fdpass.c]
     [monitor_mm.c monitor_wrap.c msg.c nchan.c packet.c rsa.c]
     [progressmeter.c readconf.c readpass.c scp.c servconf.c serverloop.c]
     [session.c sftp-client.c sftp-common.c sftp-glob.c sftp-server.c sftp.c]
     [ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c]
     [ssh-keysign.c ssh-rsa.c ssh.c sshconnect.c sshconnect1.c sshconnect2.c]
     [sshd.c sshlogin.c sshpty.c ttymodes.c uidswap.c xmalloc.c]
     move #include <string.h> out of includes.h
   - 2006/07/23 01:11:05
     [auth.h dispatch.c kex.h sftp-client.c]
     #include <signal.h> for sig_atomic_t; need this prior to <sys/param.h>
 - (djm) [acss.c auth-krb5.c auth-options.c auth-pam.c auth-shadow.c]
   [canohost.c channels.c cipher-acss.c defines.h dns.c gss-genr.c]
   [gss-serv-krb5.c gss-serv.c log.h loginrec.c logintest.c readconf.c]
   [servconf.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rand-helper.c]
   [ssh.c sshconnect.c sshd.c openbsd-compat/bindresvport.c]
   [openbsd-compat/bsd-arc4random.c openbsd-compat/bsd-misc.c]
   [openbsd-compat/getrrsetbyname.c openbsd-compat/glob.c]
   [openbsd-compat/mktemp.c openbsd-compat/port-linux.c]
   [openbsd-compat/port-tun.c openbsd-compat/readpassphrase.c]
   [openbsd-compat/setproctitle.c openbsd-compat/xmmap.c]
   make the portable tree compile again - sprinkle unistd.h and string.h 
   back in. Don't redefine __unused, as it turned out to be used in
   headers on Linux, and replace its use in auth-pam.c with ARGSUSED
 - (djm) [openbsd-compat/glob.c]
   Move get_arg_max() into the ifdef HAVE_GLOB block so that it compiles
   on OpenBSD (or other platforms with a decent glob implementation) with
 - (djm) [uuencode.c]
   Add resolv.h, is it contains the prototypes for __b64_ntop/__b64_pton on
   some platforms
 - (djm) [session.c]
   fix compile error with -Werror -Wall: 'path' is only used in
   do_setup_env() if HAVE_LOGIN_CAP is not defined
 - (djm) [openbsd-compat/basename.c openbsd-compat/bsd-closefrom.c]
   [openbsd-compat/bsd-cray.c openbsd-compat/bsd-openpty.c]
   [openbsd-compat/bsd-snprintf.c openbsd-compat/fake-rfc2553.c]
   [openbsd-compat/port-aix.c openbsd-compat/port-irix.c]
   These look to need string.h and/or unistd.h (based on a grep for function
 - (djm) []
   Remove generated openbsd-compat/regress/Makefile in distclean target
 - (djm) [regress/Makefile regress/ regress/]
   [regress/ regress/ regress/]
   Sync regress tests to -current; include dtucker@'s new cfgmatch and 
   forcecommand tests. Add test (not linked in yet)
 - (dtucker) [cleanup.c] Since config.h defines _LARGE_FILES on AIX, including
   system headers before defines.h will cause conflicting definitions.
 - (dtucker) [regress/] Portablize.

 - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h

 - (dtucker) [ defines.h] Only define SHUT_RD (and friends) and
   O_NONBLOCK if they're really needed.  Fixes build errors on HP-UX, old
   Linuxes and probably more.
 - (dtucker) [] OpenBSD needs <sys/types.h> before <sys/socket.h>
   for SHUT_RD.
 - (dtucker) [openbsd-compat/port-tun.c] OpenBSD needs <netinet/in.h> before
 - (dtucker) OpenBSD CVS Sync
   - 2006/07/10 16:01:57
     [sftp-glob.c sftp-common.h sftp.c]
     buffer.h only needed in sftp-common.h and remove some unneeded
     user includes; ok djm@
   - 2006/07/10 16:04:21
     s/and and/and/
   - 2006/07/10 16:37:36
     [readpass.c log.h scp.c fatal.c xmalloc.c includes.h ssh-keyscan.c misc.c
     auth.c packet.c log.c]
     move #include <stdarg.h> out of includes.h; ok markus@
   - 2006/07/11 10:12:07
     Only copy the part of environment variable that we actually use.  Prevents
     ssh bailing when SendEnv is used and an environment variable with a really
     long value exists.  ok djm@
   - 2006/07/11 18:50:48
     [clientloop.c ssh.1 ssh.c channels.c ssh_config.5 readconf.h session.c
     channels.h readconf.c]
     add ExitOnForwardFailure: terminate the connection if ssh(1)
     cannot set up all requested dynamic, local, and remote port
     forwardings. ok djm, dtucker, stevesk, jmc
   - 2006/07/11 20:07:25
     [scp.c auth.c monitor.c serverloop.c sftp-server.c sshpty.c readpass.c
     sshd.c monitor_wrap.c monitor_fdpass.c ssh-agent.c ttymodes.c atomicio.c
     includes.h session.c sshlogin.c monitor_mm.c packet.c sshconnect2.c
     sftp-client.c nchan.c clientloop.c sftp.c misc.c canohost.c channels.c
     ssh-keygen.c progressmeter.c uidswap.c msg.c readconf.c sshconnect.c]
     move #include <errno.h> out of includes.h; ok markus@
   - 2006/07/11 20:16:43
     cast asterisk field precision argument to int to remove warning;
     ok markus@
   - 2006/07/11 20:27:56
     [authfile.c ssh.c]
     need <errno.h> here also (it's also included in <openssl/err.h>)
   - 2006/07/12 11:34:58
     [sshd.c servconf.h servconf.c sshd_config.5 auth.c]
     Add support for conditional directives to sshd_config via a "Match"
     keyword, which works similarly to the "Host" directive in ssh_config.
     Lines after a Match line override the default set in the main section
     if the condition on the Match line is true, eg
     AllowTcpForwarding yes
     Match User anoncvs
             AllowTcpForwarding no
     will allow port forwarding by all users except "anoncvs".
     Currently only a very small subset of directives are supported.
     ok djm@
 - (dtucker) [loginrec.c openbsd-compat/xmmap.c openbsd-compat/bindresvport.c
   openbsd-compat/glob.c openbsd-compat/mktemp.c openbsd-compat/port-tun.c
   openbsd-compat/readpassphrase.c openbsd-compat/strtonum.c] Include <errno.h>.
 - (dtucker) [openbsd-compat/setproctitle.c] Include stdarg.h.
 - (dtucker) [ssh-keyscan.c ssh-rand-helper.c] More errno.h here too.
 - (dtucker) [openbsd-compat/openbsd-compat.h] v*printf needs stdarg.h.
 - (dtucker) [openbsd-compat/bsd-asprintf.c openbsd-compat/port-aix.c
   openbsd-compat/rresvport.c] More errno.h.

 - (dtucker) [ ssh-keygen.c openbsd-compat/bsd-openpty.c
   openbsd-compat/daemon.c] Add includes needed by open(2).  Conditionally
   include paths.h.  Fixes build error on Solaris.
 - (dtucker) [entropy.c] More fcntl.h, this time on AIX (and probably

 - (dtucker) [INSTALL] New autoconf version: 2.60.
 - OpenBSD CVS Sync
   - 2006/06/14 10:50:42
     limit the number of pre-banner characters we will accept; ok markus@
   - 2006/06/26 10:36:15
     mention optional bind_address in runtime port forwarding setup
     command-line help. patch from santhi.amirta AT
   - 2006/07/02 17:12:58
     [ssh.1 ssh.c ssh_config.5 sshd_config.5]
     more details and clarity for tun(4) device forwarding; ok and help
   - 2006/07/02 18:36:47
     [gss-serv-krb5.c gss-serv.c]
     no "servconf.h" needed here
     (gss-serv-krb5.c change not applied, portable needs the server options)
   - 2006/07/02 22:45:59
     [groupaccess.c groupaccess.h includes.h session.c sftp-common.c sshpty.c]
     move #include <grp.h> out of includes.h
     (portable needed uidswap.c too)
   - 2006/07/02 23:01:55
     [clientloop.c ssh.1]
     use -KR[bind_address:]port here; ok djm@
   - 2006/07/03 08:54:20
     [includes.h ssh.c sshconnect.c sshd.c]
     move #include "version.h" out of includes.h; ok markus@
   - 2006/07/03 17:59:32
     [channels.c includes.h]
     move #include <arpa/inet.h> out of includes.h; old ok djm@
     (portable needed session.c too)
   - 2006/07/05 02:42:09
     [canohost.c hostfile.c includes.h misc.c packet.c readconf.c]
     [serverloop.c sshconnect.c uuencode.c]
     move #include <netinet/in.h> out of includes.h; ok deraadt@
     (also ssh-rand-helper.c logintest.c loginrec.c)
   - 2006/07/06 10:47:05
     [servconf.c servconf.h session.c sshd_config.5]
     support arguments to Subsystem commands; ok markus@
   - 2006/07/06 10:47:57
     [sftp-server.8 sftp-server.c]
     add commandline options to enable logging of transactions; ok markus@
   - 2006/07/06 16:03:53
     [auth-options.c auth-options.h auth-passwd.c auth-rh-rsa.c]
     [auth-rhosts.c auth-rsa.c auth.c auth.h auth2-hostbased.c]
     [auth2-pubkey.c auth2.c includes.h misc.c misc.h monitor.c]
     [monitor_wrap.c monitor_wrap.h scp.c serverloop.c session.c]
     [session.h sftp-common.c ssh-add.c ssh-keygen.c ssh-keysign.c]
     [ssh.c sshconnect.c sshconnect.h sshd.c sshpty.c sshpty.h uidswap.c]
     move #include <pwd.h> out of includes.h; ok markus@
   - 2006/07/06 16:22:39
     move #include "dns.h" up
   - 2006/07/06 17:36:37
     typo in comment
   - 2006/07/08 21:47:12
     [authfd.c canohost.c clientloop.c dns.c dns.h includes.h]
     [monitor_fdpass.c nchan.c packet.c servconf.c sftp.c ssh-agent.c]
     [ssh-keyscan.c ssh.c sshconnect.h sshd.c sshlogin.h]
     move #include <sys/socket.h> out of includes.h
   - 2006/07/08 21:48:53
     [monitor.c session.c]
     missed these from last commit:
     move #include <sys/socket.h> out of includes.h
   - 2006/07/08 23:30:06
     move user includes after /usr/include files
   - 2006/07/09 15:15:11
     [auth2-none.c authfd.c authfile.c includes.h misc.c monitor.c]
     [readpass.c scp.c serverloop.c sftp-client.c sftp-server.c]
     [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keysign.c ssh.c sshd.c]
     [sshlogin.c sshpty.c]
     move #include <fcntl.h> out of includes.h
   - 2006/07/09 15:27:59
     use O_RDONLY vs. 0 in open(); no binary change
   - 2006/07/10 11:24:54
     remove optind - it isn't used here
   - 2006/07/10 11:25:53
     don't log variables that aren't yet set
 - (djm) [loginrec.c ssh-rand-helper.c sshd.c openbsd-compat/glob.c]
   [openbsd-compat/mktemp.c openbsd-compat/openbsd-compat.h]
   [openbsd-compat/port-tun.c openbsd-compat/readpassphrase.c]
   [openbsd-compat/xcrypt.c] Fix includes.h fallout, mainly fcntl.h
 - OpenBSD CVS Sync
   - 2006/07/10 12:03:20
     duplicate argv at the start of main() because it gets modified later;
     pointed out by deraadt@ ok markus@
   - 2006/07/10 12:08:08
     fix misparsing of SOCKS 5 packets that could result in a crash;
     reported by mk@ ok markus@
   - 2006/07/10 12:46:51
     [misc.c misc.h sshd.8 sshconnect.c]
     Add port identifier to known_hosts for non-default ports, based originally
     on a patch from Devin Nate in bz#910.
     For any connection using the default port or using a HostKeyAlias the
     format is unchanged, otherwise the host name or address is enclosed
     within square brackets in the same format as sshd's ListenAddress.
     Tested by many, ok markus@.
 - (dtucker) [openbsd-compat/openbsd-compat.h] Need to include <sys/socket.h>
   for struct sockaddr on platforms that use the fake-rfc stuff.

 - (dtucker) [] Try AIX blibpath test in different order when
   compiling with gcc.  gcc 4.1.x will accept (but ignore) -b flags so
   configure would not select the correct libpath linker flags.
 - (dtucker) [INSTALL] A bit more info on autoconf.

 - (dtucker) [ssh-rand-helper.c] Don't exit if mkdir fails because the
   target already exists.

 - (dtucker) [openbsd-compat/openbsd-compat.h] SNPRINTF_CONST for snprintf
   declaration too.  Patch from russ at
 - (dtucker) [openbsd-compat/getrrsetbyname.c] Undef _res before defining it,
   prevents warnings on platforms where _res is in the system headers.
 - (dtucker) [INSTALL] Bug #1202: Note when autoconf is required and which

 - (dtucker) [] Bug #1203: Add missing '[', which causes problems
   with autoconf 2.60.  Patch from vapier at

 - (dtucker) [channels.c serverloop.c] Apply the bug #1102 workaround to ptys
   only, otherwise sshd can hang exiting non-interactive sessions.

 - (dtucker) [] Bug #1193: Define PASSWD_NEEDS_USERNAME on Solaris.
   Works around limitation in Solaris' passwd program for changing passwords
   where the username is longer than 8 characters.  ok djm@
 - (dtucker) [serverloop.c] Get ifdef/ifndef the right way around for the bug
   #1102 workaround.

 - (dtucker) [README.platform openbsd-compat/port-tun.c] Add
   tunnel support for Mac OS X/Darwin via a third-party tun driver.  Patch
   from reyk@, tested by anil@
 - (dtucker) [channels.c serverloop.c] Bug #1102: Around AIX
   4.3.3 ML3 or so, the AIX pty layer starting passing zero-length writes
   on the pty slave as zero-length reads on the pty master, which sshd
   interprets as the descriptor closing.  Since most things don't do zero
   length writes this rarely matters, but occasionally it happens, and when
   it does the SSH pty session appears to hang, so we add a special case for
   this condition.  ok djm@

 - (djm) [getput.h] This file has been replaced by functions in misc.c
 - OpenBSD CVS Sync
   - 2006/05/08 10:49:48
     uint32_t -> u_int32_t (which we use everywhere else)
     (Id sync only - portable already had this)
   - 2006/05/16 09:00:00
     missing free; from Kylene Hall
   - 2006/05/17 12:43:34
     [scp.c sftp.c ssh-agent.c ssh-keygen.c sshconnect.c]
     fix leak; coverity via Kylene Jo Hall
   - 2006/05/18 21:27:25
     [kexdhc.c kexgexc.c]
     paramter -> parameter
   - 2006/05/29 12:54:08
     Add gssapi-with-mic to PreferredAuthentications default list; ok jmc
   - 2006/05/29 12:56:33
     Add GSSAPIAuthentication and GSSAPIDelegateCredentials to examples in
     sample ssh_config.  ok markus@
   - 2006/05/29 16:10:03
     oops - previous was too long; split the list of auths up
   - 2006/05/30 11:46:38
     Sync usage() with man page and reality.
     ok deraadt dtucker
   - 2006/05/29 16:13:23
     add GSSAPI to the list of authentication methods supported;
   - 2006/05/30 11:46:38
     Sync usage() with man page and reality.
     ok deraadt dtucker
   - 2006/06/01 09:21:48
     call get_remote_ipaddr() early; fixes logging after client disconnects;
     report mpf@; ok dtucker@
   - 2006/06/06 10:20:20
     [readpass.c sshconnect.c sshconnect.h sshconnect2.c uidswap.c]
     replace remaining setuid() calls with permanently_set_uid() and
     check seteuid() return values; report Marcus Meissner; ok dtucker djm
   - 2006/06/08 14:45:49
     [readpass.c sshconnect.c sshconnect2.c uidswap.c uidswap.h]
     do not set the gid, noted by solar; ok djm
   - 2006/06/13 01:18:36
     always use a format string, even when printing a constant
   - 2006/06/13 02:17:07
     revert; i am on drugs. spotted by alexander AT

 - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor
   and slave, we can remove the special-case handling in the audit hook in

 - (dtucker) [ssh-rand-helper.c] Check return code of mkdir and fix file
   pointer leak.  From kjhall at, found by coverity.

 - (dtucker) [openbsd-compat/getrrsetbyname.c] Use _compat_res instead of
   _res, prevents problems on some platforms that have _res as a global but
   don't have getrrsetbyname(), eg IRIX 5.3.  Found and tested by at, ok djm@.
 - (dtucker) [defines.h] Find a value for IOV_MAX or use a conservative
   default.  Patch originally from tim@, ok djm
 - (dtucker) [auth-pam.c] Bug #1188: pass result of do_pam_account back and
   do not allow kbdint again after the PAM account check fails.  ok djm@

 - (dtucker) OpenBSD CVS Sync
   - 2006/04/25 08:02:27
     [authfile.c authfile.h sshconnect2.c ssh.c sshconnect1.c]
     Prevent ssh from trying to open private keys with bad permissions more than
     once or prompting for their passphrases (which it subsequently ignores
     anyway), similar to a previous change in ssh-add.  bz #1186, ok djm@
   - 2006/05/04 14:55:23
     tighter DH exponent checks here too; feedback and ok markus@
   - 2006/04/01 05:37:46
     $OpenBSD$ in here too
   - 2006/05/06 08:35:40
     Add $OpenBSD$ in comment here too

 - (dtucker) [auth-pam.c groupaccess.c monitor.c monitor_wrap.c scard-opensc.c
   session.c ssh-rand-helper.c sshd.c openbsd-compat/bsd-cygwin_util.c
   openbsd-compat/setproctitle.c] Convert malloc(foo*bar) -> calloc(foo,bar)
   in Portable-only code; since calloc zeros, remove now-redundant memsets.
   Also add a couple of sanity checks.  With & ok djm@

 - (dtucker) [packet.c] Remove in_systm.h since it's also in includes.h
   and double including it on IRIX 5.3 causes problems.  From Georg Schwarz,
   "no objections" tim@

 - (djm) OpenBSD CVS Sync
   - 2006/04/01 05:42:20
     minimal lint cleanup (unused crud, and some size_t); ok djm
   - 2006/04/01 05:50:29
     xasprintification; ok deraadt@
   - 2006/04/01 05:51:34
     ANSIfy; requested deraadt@
   - 2006/04/02 08:34:52
     sessionid can be 32 bytes now too when sha256 kex is used; ok djm@
   - 2006/04/03 07:10:38
     GSSAPI buffers shouldn't be nul-terminated, spotted in bugzilla #1066
     by dleonard AT use xasprintf() to simplify code while in
     there; "looks right" deraadt@
   - 2006/04/16 00:48:52
     [buffer.c buffer.h channels.c]
     Fix condition where we could exit with a fatal error when an input
     buffer became too large and the remote end had advertised a big window.
     The problem was a mismatch in the backoff math between the channels code
     and the buffer code, so make a buffer_check_alloc() function that the
     channels code can use to propsectivly check whether an incremental
     allocation will succeed.  bz #1131, debugged with the assistance of
     cove AT; ok dtucker@ deraadt@
   - 2006/04/16 00:52:55
     [atomicio.c atomicio.h]
     introduce atomiciov() function that wraps readv/writev to retry
     interrupted transfers like atomicio() does for read/write;
     feedback deraadt@ dtucker@ stevesk@ ok deraadt@
   - 2006/04/16 00:54:10
     avoid making a tiny 4-byte write to send the packet length of sftp
     commands, which would result in a separate tiny packet on the wire by
     using atomiciov(writev, ...) to write the length and the command in one
     pass; ok deraadt@
   - 2006/04/16 07:59:00
     reorder sanity test so that it cannot dereference past the end of the
     iov array; well spotted canacar@!
   - 2006/04/18 10:44:28
     [bufaux.c bufbn.c]
     Move Buffer bignum functions into their own file, bufbn.c. This means
     that sftp and sftp-server (which use the Buffer functions in bufaux.c 
     but not the bignum ones) no longer need to be linked with libcrypto.
     ok markus@
   - 2006/04/20 09:27:09
     [auth.h clientloop.c dispatch.c dispatch.h kex.h]
     replace the last non-sig_atomic_t flag used in a signal handler with a
     sig_atomic_t, unfortunately with some knock-on effects in other (non-
     signal) contexts in which it is used; ok markus@
   - 2006/04/20 09:47:59
     simplify; ok djm@
   - 2006/04/20 21:53:44
     [includes.h session.c sftp.c]
     Switch from using pipes to socketpairs for communication between
     sftp/scp and ssh, and between sshd and its subprocesses. This saves
     a file descriptor per session and apparently makes userland ppp over
     ssh work; ok markus@ deraadt@ (ID Sync only - portable makes this
     decision on a per-platform basis)
   - 2006/04/22 04:06:51
     use setres[ug]id() to permanently revoke privileges; ok deraadt@
     (ID Sync only - portable already uses setres[ug]id() whenever possible)
   - 2006/04/22 18:29:33
     remove extra spaces
 - (djm) [auth.h dispatch.h kex.h] sprinkle in signal.h to get

 - (djm) [ session.c sshpty.c]
   [contrib/redhat/sshd.init openbsd-compat/]
   [openbsd-compat/openbsd-compat.h openbsd-compat/port-linux.c]
   [openbsd-compat/port-linux.h] Add support for SELinux, setting 
   the execution and TTY contexts. based on patch from Daniel Walsh,
   bz #880; ok dtucker@

 - (djm) [canohost.c] Reorder IP options check so that it isn't broken
   by mapped addresses; bz #1179 reported by markw;
   ok dtucker@

 - OpenBSD CVS Sync
   - 2006/03/27 01:21:18
     we can do the size & nmemb check before the integer overflow check; 
   - 2006/03/27 13:03:54
     use strtonum() instead of atoi(), limit dhg size to 64k; ok djm
   - 2006/03/27 23:15:46
     always use a format string for addargs; spotted by mouring@
   - 2006/03/28 00:12:31
     [README.tun ssh.c]
   - 2006/03/28 01:52:28
     do not accept unreasonable X ports numbers; ok djm
   - 2006/03/28 01:53:43
     use strtonum() to parse the pid from the file, and range check it
     better; ok djm
   - 2006/03/30 09:41:25
     ARGSUSED for dispatch table-driven functions
   - 2006/03/30 09:58:16
     [authfd.c bufaux.c deattack.c gss-serv.c mac.c misc.c misc.h]
     [monitor_wrap.c msg.c packet.c sftp-client.c sftp-server.c ssh-agent.c]
     replace {GET,PUT}_XXBIT macros with functionally similar functions,
     silencing a heap of lint warnings. also allows them to use
     __bounded__ checking which can't be applied to macros; requested
     by and feedback from deraadt@
   - 2006/03/30 10:41:25
     [ssh.c ssh_config.5]
     add percent escape chars to the IdentityFile option, bz #1159 based
     on a patch by imaging AT; feedback and ok dtucker@
   - 2006/03/30 11:05:17
     Correctly handle truncated files while converting keys; ok djm@
   - 2006/03/30 11:40:21
     [auth.c monitor.c]
     Prevent duplicate log messages when privsep=yes; ok djm@
   - 2006/03/31 09:09:30
     kill trailing whitespace;
   - 2006/03/31 09:13:56
     remote user escape is %r not %h; spotted by jmc@

 - OpenBSD CVS Sync
   - 2006/03/15 08:46:44
     if no key file are given when printing the DNS host record, use the
     host key file(s) as default. ok djm@
   - 2006/03/16 10:31:45
     Try to display errormessage even if remout == -1
     ok djm@, markus@
   - 2006/03/17 22:31:50
     another unreachable found by lint
   - 2006/03/17 22:31:11
     unreachanble statement, found by lint
   - 2006/03/19 02:22:32
     memory leaks detected by Coverity via elad AT;
     ok deraadt@ dtucker@
   - 2006/03/19 02:22:56
     more memory leaks detected by Coverity via elad AT;
     deraadt@ ok
   - 2006/03/19 02:23:26
     FILE* leak detected by Coverity via elad AT;
     ok deraadt@
   - 2006/03/19 02:24:05
     [dh.c readconf.c servconf.c]
     potential NULL pointer dereferences detected by Coverity
     via elad AT; ok deraadt@
   - 2006/03/19 07:41:30
     memory leaks detected by Coverity via elad AT;
     deraadt@ ok
   - 2006/03/19 11:51:52
     Correct strdelim null test; ok djm@
   - 2006/03/19 18:52:11
     [auth1.c authfd.c channels.c]
   - 2006/03/19 18:53:12
     [kex.c kex.h monitor.c myproposal.h session.c]
   - 2006/03/19 18:56:41
     [clientloop.c progressmeter.c serverloop.c sshd.c]
     ARGSUSED for signal handlers
   - 2006/03/19 18:59:49
     please lint
   - 2006/03/19 18:59:30
   - 2006/03/19 18:59:09
     whoever thought that break after return was a good idea needs to
     get their head examimed
   - 2006/03/20 04:09:44
     memory leaks detected by Coverity via elad AT;
     deraadt@ ok
     that should be all of them now
   - 2006/03/20 11:38:46
     (really) last of the Coverity diffs: avoid possible NULL deref in
     key_free. via elad AT; markus@ ok
   - 2006/03/20 17:10:19
     [auth.c key.c misc.c packet.c ssh-add.c]
     in a switch (), break after return or goto is stupid
   - 2006/03/20 17:13:16
     djm did a typo
   - 2006/03/20 17:17:23
     in a switch (), break after return or goto is stupid
   - 2006/03/20 18:14:02
     [channels.c clientloop.c monitor_wrap.c monitor_wrap.h serverloop.c]
     [ssh.c sshpty.c sshpty.h]
     sprinkle u_int throughout pty subsystem, ok markus
   - 2006/03/20 18:17:20
     [auth1.c auth2.c sshd.c]
     sprinkle some ARGSUSED for table driven functions (which sometimes 
     must ignore their args)
   - 2006/03/20 18:26:55
     [channels.c monitor.c session.c session.h ssh-agent.c ssh-keygen.c]
     [ssh-rsa.c ssh.c sshlogin.c]
     annoying spacing fixes getting in the way of real diffs
   - 2006/03/20 18:27:50
   - 2006/03/20 18:35:12
     x11_fake_data is only ever used as u_char *
   - 2006/03/20 18:41:43
     cast xstrdup to propert u_char *
   - 2006/03/20 18:42:27
     [canohost.c match.c ssh.c sshconnect.c]
     be strict with tolower() casting
   - 2006/03/20 18:48:34
     [channels.c fatal.c kex.c packet.c serverloop.c]
   - 2006/03/20 21:11:53
   - 2006/03/25 00:05:41
     [auth-bsdauth.c auth-skey.c auth.c auth2-chall.c channels.c]
     [clientloop.c deattack.c gss-genr.c kex.c key.c misc.c moduli.c]
     [monitor.c monitor_wrap.c packet.c scard.c sftp-server.c ssh-agent.c]
     [ssh-keyscan.c ssh.c sshconnect.c sshconnect2.c sshd.c uuencode.c]
     [xmalloc.c xmalloc.h]
     introduce xcalloc() and xasprintf() failure-checked allocations 
     functions and use them throughout openssh

     xcalloc is particularly important because malloc(nmemb * size) is a
     dangerous idiom (subject to integer overflow) and it is time for it 
     to die

     feedback and ok deraadt@
   - 2006/03/25 01:13:23
     [buffer.c channels.c deattack.c misc.c scp.c session.c sftp-client.c]
     [sftp-server.c ssh-agent.c ssh-rsa.c xmalloc.c xmalloc.h auth-pam.c]
     change OpenSSH's xrealloc() function from being xrealloc(p, new_size)
     to xrealloc(p, new_nmemb, new_itemsize).

     realloc is particularly prone to integer overflows because it is
     almost always allocating "n * size" bytes, so this is a far safer 
     API; ok deraadt@
   - 2006/03/25 01:30:23
     "abormally" is a perfectly cromulent word, but "abnormally" is better
   - 2006/03/25 13:17:03
     [atomicio.c auth-bsdauth.c auth-chall.c auth-options.c auth-passwd.c]
     [auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth-skey.c auth.c auth1.c]
     [auth2-chall.c auth2-hostbased.c auth2-kbdint.c auth2-none.c]
     [auth2-passwd.c auth2-pubkey.c auth2.c authfd.c authfile.c bufaux.c]
     [buffer.c canohost.c channels.c cipher-3des1.c cipher-bf1.c]
     [cipher-ctr.c cipher.c cleanup.c clientloop.c compat.c compress.c]
     [deattack.c dh.c dispatch.c fatal.c groupaccess.c hostfile.c kex.c]
     [kexdh.c kexdhc.c kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c log.c]
     [mac.c match.c md-sha256.c misc.c monitor.c monitor_fdpass.c]
     [monitor_mm.c monitor_wrap.c msg.c nchan.c packet.c progressmeter.c]
     [readconf.c readpass.c rsa.c scard.c scp.c servconf.c serverloop.c]
     [session.c sftp-client.c sftp-common.c sftp-glob.c sftp-server.c]
     [sftp.c ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c]
     [ssh-keysign.c ssh-rsa.c ssh.c sshconnect.c sshconnect1.c]
     [sshconnect2.c sshd.c sshlogin.c sshpty.c sshtty.c ttymodes.c]
     [uidswap.c uuencode.c xmalloc.c]
     Put $OpenBSD$ tags back (as comments) to replace the RCSID()s that
     Theo nuked - our scripts to sync -portable need them in the files
   - 2006/03/25 18:29:35
     [auth-rsa.c authfd.c packet.c]
     needed casts (always will be needed)
   - 2006/03/25 18:30:55
     [clientloop.c serverloop.c]
   - 2006/03/25 18:36:15
     [sshlogin.c sshlogin.h]
     nicer size_t and time_t types
   - 2006/03/25 18:40:14
     cast strtonum() result to right type
   - 2006/03/25 18:41:45
     mark two more signal handlers ARGSUSED
   - 2006/03/25 18:43:30
     use strtonum() instead of atoi() [limit X screens to 400, sorry]
   - 2006/03/25 18:56:55
     [bufaux.c channels.c packet.c]
     remove (char *) casts to a function that accepts void * for the arg
   - 2006/03/25 18:58:10
     delete cast not required
   - 2006/03/25 22:22:43
     [atomicio.h auth-options.h auth.h auth2-gss.c authfd.h authfile.h]
     [bufaux.h buffer.h canohost.h channels.h cipher.h clientloop.h]
     [compat.h compress.h crc32.c crc32.h deattack.h dh.h dispatch.h]
     [dns.c dns.h getput.h groupaccess.h gss-genr.c gss-serv-krb5.c]
     [gss-serv.c hostfile.h includes.h kex.h key.h log.h mac.h match.h]
     [misc.h monitor.h monitor_fdpass.h monitor_mm.h monitor_wrap.h msg.h]
     [myproposal.h packet.h pathnames.h progressmeter.h readconf.h rsa.h]
     [scard.h servconf.h serverloop.h session.h sftp-common.h sftp.h]
     [ssh-gss.h ssh.h ssh1.h ssh2.h sshconnect.h sshlogin.h sshpty.h]
     [ttymodes.h uidswap.h uuencode.h xmalloc.h]
     standardise spacing in $OpenBSD$ tags; requested by deraadt@
   - 2006/03/26 01:31:48

 - OpenBSD CVS Sync
   - 2006/03/16 04:24:42
     Add RFC4419 (Diffie-Hellman group exchange KEX) to the list of SSH RFCs
     that OpenSSH supports
   - 2006/03/19 18:51:18
     [atomicio.c auth-bsdauth.c auth-chall.c auth-krb5.c auth-options.c]
     [auth-pam.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c]
     [auth-shadow.c auth-skey.c auth.c auth1.c auth2-chall.c]
     [auth2-hostbased.c auth2-kbdint.c auth2-none.c auth2-passwd.c]
     [auth2-pubkey.c auth2.c authfd.c authfile.c bufaux.c buffer.c]
     [canohost.c channels.c cipher-3des1.c cipher-acss.c cipher-aes.c]
     [cipher-bf1.c cipher-ctr.c cipher.c cleanup.c clientloop.c compat.c]
     [compress.c deattack.c dh.c dispatch.c dns.c entropy.c fatal.c]
     [groupaccess.c hostfile.c includes.h kex.c kexdh.c kexdhc.c]
     [kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c log.c loginrec.c]
     [loginrec.h logintest.c mac.c match.c md-sha256.c md5crypt.c misc.c]
     [monitor.c monitor_fdpass.c monitor_mm.c monitor_wrap.c msg.c]
     [nchan.c packet.c progressmeter.c readconf.c readpass.c rsa.c]
     [scard.c scp.c servconf.c serverloop.c session.c sftp-client.c]
     [sftp-common.c sftp-glob.c sftp-server.c sftp.c ssh-add.c]
     [ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c]
     [ssh-rand-helper.c ssh-rsa.c ssh.c sshconnect.c sshconnect1.c]
     [sshconnect2.c sshd.c sshlogin.c sshpty.c sshtty.c ttymodes.c]
     [uidswap.c uuencode.c xmalloc.c openbsd-compat/bsd-arc4random.c]
     [openbsd-compat/bsd-closefrom.c openbsd-compat/bsd-cygwin_util.c]
     [openbsd-compat/bsd-getpeereid.c openbsd-compat/bsd-misc.c]
     [openbsd-compat/bsd-nextstep.c openbsd-compat/bsd-snprintf.c]
     [openbsd-compat/bsd-waitpid.c openbsd-compat/fake-rfc2553.c]
     RCSID() can die
   - 2006/03/19 18:53:12
     [kex.h myproposal.h]
   - 2006/03/20 04:07:22
     GSSAPI related leaks detected by Coverity via elad AT;
     reviewed by simon AT; deraadt@ ok
   - 2006/03/20 04:07:49
     more GSSAPI related leaks detected by Coverity via elad AT;
     reviewed by simon AT; deraadt@ ok
   - 2006/03/20 04:08:18
     last lot of GSSAPI related leaks detected by Coverity via
     elad AT; reviewed by simon AT; deraadt@ ok
   - 2006/03/20 18:14:02
     [monitor_wrap.h sshpty.h]
     sprinkle u_int throughout pty subsystem, ok markus
   - 2006/03/20 18:26:55
     annoying spacing fixes getting in the way of real diffs
   - 2006/03/20 18:41:43
     cast xstrdup to propert u_char *
   - 2006/03/22 21:16:24
     simplify SSHFP example; ok jmc@
   - 2006/03/22 21:27:15
     [deattack.c deattack.h]
     remove IV support from the CRC attack detector, OpenSSH has never used
     it - it only applied to IDEA-CFB, which we don't support.
     prompted by NetBSD Coverity report via elad AT;
     feedback markus@ "nuke it" deraadt@

 - (djm) [auth-pam.c] Fix memleak in error path, from Coverity via
   elad AT
 - (dtucker) [openbsd-compat/bsd-snprintf.c] Bug #1173: make fmtint() take
   a LLONG rather than a long.  Fixes scp'ing of large files on platforms
   with missing/broken snprintfs.  Patch from e.borovac at

 - (dtucker) [entropy.c] Add headers for WIFEXITED and friends.
 - (dtucker) [ md-sha256.c] NetBSD has sha2.h in
   /usr/include/crypto.  Hint from djm@.
 - (tim) [kex.c myproposal.h md-sha256.c openbsd-compat/sha2.c,h]
   Disable sha256 when openssl < 0.9.7. Patch from djm@.
 - (djm) [kex.c] Slightly more clean deactivation of dhgex-sha256 on old
   OpenSSL; ok tim

 - (djm) OpenBSD CVS Sync:
   - 2006/02/06 15:54:07
     - typo fix
     ok jmc@
   - 2006/02/06 21:44:47
     make this a little less ambiguous...
   - 2006/02/07 01:08:04
     [auth-rhosts.c includes.h]
     move #include <netgroup.h> out of includes.h; ok markus@
   - 2006/02/07 01:18:09
     [includes.h ssh-agent.c ssh-keyscan.c sshconnect2.c]
     move #include <sys/queue.h> out of includes.h; ok markus@
   - 2006/02/07 01:42:00
     [channels.c clientloop.c clientloop.h includes.h packet.h]
     [serverloop.c sshpty.c sshpty.h sshtty.c ttymodes.c]
     move #include <termios.h> out of includes.h; ok markus@
   - 2006/02/07 01:52:50
     "log.h" not needed
   - 2006/02/07 03:47:05
     "packet.h" not needed
   - 2006/02/07 03:59:20
     duplicate #include
   - 2006/02/08 12:15:27
     [auth.c clientloop.c includes.h misc.c monitor.c readpass.c]
     [session.c sftp.c ssh-agent.c ssh-keysign.c ssh.c sshconnect.c]
     [sshd.c sshpty.c]
     move #include <paths.h> out of includes.h; ok markus@
   - 2006/02/08 12:32:49
     [includes.h misc.c]
     move #include <netinet/tcp.h> out of includes.h; ok markus@
   - 2006/02/08 13:15:44
     [gss-serv.c monitor.c]
     small KNF
   - 2006/02/08 14:16:59
     <openssl/bn.h> not needed
   - 2006/02/08 14:31:30
     [includes.h ssh-agent.c ssh-keyscan.c ssh.c]
     move #include <sys/resource.h> out of includes.h; ok markus@
   - 2006/02/08 14:38:18
     [includes.h packet.c]
     move #include <netinet/in_systm.h> and <netinet/ip.h> out of
     includes.h; ok markus@
   - 2006/02/08 23:51:24
     [includes.h scp.c sftp-glob.c sftp-server.c]
     move #include <dirent.h> out of includes.h; ok markus@
   - 2006/02/09 00:32:07
     #include <sys/endian.h> not needed; ok djm@
     NB. ID Sync only - we still need this (but it may move later)
   - 2006/02/09 10:10:47
     - move some text into a CAVEATS section
     - merge the COMMAND EXECUTION... section into AUTHENTICATION
   - 2006/02/10 00:27:13
     [channels.c clientloop.c includes.h misc.c progressmeter.c sftp.c]
     [ssh.c sshd.c sshpty.c]
     move #include <sys/ioctl.h> out of includes.h; ok markus@
   - 2006/02/10 01:44:27
     [includes.h monitor.c readpass.c scp.c serverloop.c session.c]
     [sftp.c sshconnect.c sshconnect2.c sshd.c]
     move #include <sys/wait.h> out of includes.h; ok markus@
   - 2006/02/11 19:31:18
     type correctness; from Ray Lai in PR 5011; ok millert@
   - 2006/02/12 06:45:34
     [ssh.c ssh_config.5]
     add a %l expansion code to the ControlPath, which is filled in with the
     local hostname at runtime. Requested by henning@ to avoid some problems
     with /home on NFS; ok dtucker@
   - 2006/02/12 10:44:18
     raise error when the user specifies a RekeyLimit that is smaller than 16
     (the smallest of our cipher's blocksize) or big enough to cause integer
     wraparound; ok & feedback dtucker@
   - 2006/02/12 10:49:44
     slight rewording; ok djm
   - 2006/02/12 10:52:41
     rework the description of authorized_keys a little;
   - 2006/02/12 17:57:19
     sort the list of options permissable w/ authorized_keys;
     ok djm dtucker
   - 2006/02/13 10:16:39
     no need to subsection the authorized_keys examples - instead, convert
     this to look like an actual file. also use proto 2 keys, and use IETF
     example addresses;
   - 2006/02/13 10:21:25
     small tweaks for the ssh_known_hosts section;
   - 2006/02/13 11:02:26
     turn this into an example ssh_known_hosts file; ok djm
   - 2006/02/13 11:08:43
     - avoid nasty line split
     - `*' does not need to be escaped
   - 2006/02/13 11:27:25
     sort FILES and use a -compact list;
   - 2006/02/15 05:08:24
     typo in comment; ok djm@
   - 2006/02/15 16:53:20
     remove the IETF draft references and replace them with some updated RFCs;
   - 2006/02/15 16:55:33
     remove ietf draft references; RFC list now maintained in ssh.1;
   - 2006/02/16 09:05:34
     sync some of the FILES entries w/ ssh.1;
   - 2006/02/19 19:52:10
     move the sshrc stuff out of FILES, and into its own section:
     FILES is not a good place to document how stuff works;
   - 2006/02/19 20:02:17
     sync the (s)hosts.equiv FILES entries w/ those from ssh.1;
   - 2006/02/19 20:05:00
   - 2006/02/19 20:12:25
     add some vertical space;
   - 2006/02/20 16:36:15
     [authfd.c channels.c includes.h session.c ssh-agent.c ssh.c]
     move #include <sys/un.h> out of includes.h; ok djm@
   - 2006/02/20 17:02:44
     [clientloop.c includes.h monitor.c progressmeter.c scp.c]
     [serverloop.c session.c sftp.c ssh-agent.c ssh.c sshd.c]
     move #include <signal.h> out of includes.h; ok markus@
   - 2006/02/20 17:19:54
     [auth-rhosts.c auth-rsa.c auth.c auth2-none.c auth2-pubkey.c]
     [authfile.c clientloop.c includes.h readconf.c scp.c session.c]
     [sftp-client.c sftp-common.c sftp-common.h sftp-glob.c]
     [sftp-server.c sftp.c ssh-add.c ssh-keygen.c ssh.c sshconnect.c]
     [sshconnect2.c sshd.c sshpty.c]
     move #include <sys/stat.h> out of includes.h; ok markus@
   - 2006/02/22 00:04:45
     [canohost.c clientloop.c includes.h match.c readconf.c scp.c ssh.c]
     move #include <ctype.h> out of includes.h; ok djm@
   - 2006/02/24 10:25:14
     add section on patterns;
     from dtucker + myself
   - 2006/02/24 10:33:54
     signpost to PATTERNS;
   - 2006/02/24 10:37:07
     tidy up the refs to PATTERNS;
   - 2006/02/24 10:39:52
     signpost to PATTERNS section;
   - 2006/02/24 20:22:16
     [ssh-keysign.8 ssh_config.5 sshd_config.5]
     some consistency fixes;
   - 2006/02/24 20:31:31
     [ssh.1 ssh_config.5 sshd.8 sshd_config.5]
     more consistency fixes;
   - 2006/02/24 23:20:07
     some grammar/wording fixes;
   - 2006/02/24 23:43:57
     some grammar/wording fixes;
   - 2006/02/24 23:51:17
     oops - bits i missed;
   - 2006/02/25 12:26:17
     document the possible values for KbdInteractiveDevices;
     help/ok dtucker
   - 2006/02/25 12:28:34
     document the order in which allow/deny directives are processed;
     help/ok dtucker
   - 2006/02/26 17:17:18
     move PATTERNS to the end of the main body; requested by dtucker
   - 2006/02/26 18:01:13
     subsection is pointless here;
   - 2006/02/26 18:03:10
   - 2006/02/28 01:10:21
     fix logout recording when privilege separation is disabled, analysis and
     patch from vinschen at; tested by dtucker@ ok deraadt@
     NB. ID sync only - patch already in portable
   - 2006/03/04 04:12:58
     move a debug() outside of a signal handler; ok markus@ a little while back
   - 2006/03/12 04:23:07
     knf nit
   - 2006/03/13 08:16:00
     don't log that we are listening on a socket before the listen() call
     actually succeeds, bz #1162 reported by Senthil Kumar; ok dtucker@
   - 2006/03/13 08:33:00
     Set TCP_NODELAY for all connections not just "interactive" ones.  Fixes
     poor performance and protocol stalls under some network conditions (mindrot
     bugs #556 and #981). Patch originally from markus@, ok djm@
   - 2006/03/13 08:43:16
     Make ssh-keygen handle CR and CRLF line termination when converting IETF
     format keys, in adition to vanilla LF.  mindrot #1157, tested by Chris
     Pepper, ok djm@
   - 2006/03/13 10:14:29
     [misc.c ssh_config.5 sshd_config.5]
     Allow config directives to contain whitespace by surrounding them by double
     quotes.  mindrot #482, man page help from jmc@, ok djm@
   - 2006/03/13 10:26:52
     [authfile.c authfile.h ssh-add.c]
     Make ssh-add check file permissions before attempting to load private
     key files multiple times; it will fail anyway and this prevents confusing
     multiple prompts and warnings.  mindrot #1138, ok djm@
   - 2006/03/14 00:15:39
     log the originating address and not just the name when a reverse
     mapping check fails, requested by linux AT
   - 2006/03/14 16:32:48
     [ssh_config.5 sshd_config.5]
     *AliveCountMax applies to protcol v2 only; ok dtucker, djm
   - 2006/03/07 09:07:40
     [kex.c kex.h monitor.c myproposal.h ssh-keyscan.c sshconnect2.c sshd.c]
     Implement the diffie-hellman-group-exchange-sha256 key exchange method
     using the SHA256 code in libc (and wrapper to make it into an OpenSSL
     EVP), interop tested against CVS PuTTY
     NB. no portability bits committed yet
 - (djm) [ defines.h kex.c md-sha256.c]
   [openbsd-compat/sha2.h openbsd-compat/openbsd-compat.h]
   [openbsd-compat/sha2.c] First stab at portability glue for SHA256
   KEX support, should work with libc SHA256 support or OpenSSL
   EVP_sha256 if present
 - (djm) [includes.h] Restore accidentally dropped netinet/in.h
 - (djm) [ openbsd-compat/] Add added files
 - (djm) [md-sha256.c] md-sha256.c needs sha2.h if present
 - (djm) [regress/.cvsignore] Ignore Makefile here
 - (djm) [loginrec.c] Need stat.h
 - (djm) [openbsd-compat/sha2.h] Avoid include macro clash with
   system sha2.h
 - (djm) [ssh-rand-helper.c] Needs a bunch of headers
 - (djm) [ssh-agent.c] Restore dropped stat.h
 - (djm) [openbsd-compat/sha2.h openbsd-compat/sha2.c] Comment out 
   SHA384, which we don't need and doesn't compile without tweaks
 - (djm) [auth-pam.c clientloop.c includes.h monitor.c session.c]
   [sftp-client.c ssh-keysign.c ssh.c sshconnect.c sshconnect2.c]
   [sshd.c openbsd-compat/bsd-misc.c openbsd-compat/bsd-openpty.c]
   [openbsd-compat/glob.c openbsd-compat/mktemp.c]
   [openbsd-compat/readpassphrase.c] Lots of include fixes for
 - (tim) [includes.h] put sys/stat.h back in to quiet some "macro redefined:"
 - (tim) [openssh/sshpty.c openssh/openbsd-compat/port-tun.c] put in some
   includes removed from includes.h
 - (dtucker) [] Fix glob test conversion to AC_TRY_COMPILE
 - (djm) [includes.h] Put back paths.h, it is needed in defines.h
 - (dtucker) [openbsd-compat/openbsd-compat.h] AIX (at least) needs
   sys/ioctl.h for struct winsize.
 - (dtucker) [] login_cap.h requires sys/types.h on NetBSD.

 - (dtucker) [] Bug #1171: Don't use printf("%lld", longlong)
   since not all platforms support it.  Instead, use internal equivalent while
   computing LLONG_MIN and LLONG_MAX.  Remove special case for alpha-dec-osf*
   as it's no longer required.  Tested by Bernhard Simon, ok djm@

 - (dtucker) [contrib/cygwin/ssh-host-config] Require use of lastlog as a
   file rather than directory, required as Cygwin will be importing lastlog(1).
   Also tightens up permissions on the file.  Patch from
 - (dtucker) [gss-serv-krb5.c] Bug #1166: Correct #ifdefs for gssapi_krb5.h
   includes.  Patch from gentoo.riverrat at

 - (dtucker) [] Bug #1156: QNX apparently needs SSHD_ACQUIRES_CTTY
   patch from kraai at

 - (dtucker) [sshd_config sshd_config.5] Update UsePAM to reflect current
   reality.  Pointed out by tryponraj at

 - (dtucker) [openbsd-compat/openssl-compat.{c,h}] Minor tidy up: only
   compile in compat code if required.

 - (dtucker) [openbsd-compat/openssl-compat.h] Prevent warning about
   redefinition of SSLeay_add_all_algorithms.

 - (dtucker) [INSTALL openbsd-compat/openssl-compat.{c,h}]
   Add optional enabling of OpenSSL's (hardware) Engine support, via
   configure --with-ssl-engine.  Based in part on a diff by michal at

 - (dtucker) [, added openbsd-compat/regress/]
   Add first attempt at regress tests for compat library.  ok djm@

 - (tim) [] Make the names consistent.
   s/ OK dtucker@

 - (dtucker) [openbsd-compat/bsd-cygwin_util.c] Make loop counter unsigned
   to silence compiler warning, from vinschen at
 - (tim) [] Bug #1149. Disable /etc/default/login check for QNX.
 - (dtucker) [README version.h contrib/caldera/openssh.spec
   contrib/redhat/openssh.spec contrib/suse/openssh.spec] Bump version
   strings to match 4.3p2 release.

 - (tim) [session.c] Logout records were not updated on systems with
   post auth privsep disabled due to bug 1086 changes. Analysis and patch
   by vinschen at OK tim@, dtucker@.
 - (dtucker) [] Typo in Ultrix and NewsOS sections (NEED_SETPRGP
   -> NEED_SETPGRP), reported by Bernhard Simon.  ok tim@

 - (tim) [] Remove unnecessary tests for net/if.h and 
   netinet/in_systm.h. OK dtucker@.

 - (tim) [] Add AC_REVISION. Add sys/time.h to lastlog.h test
   for Solaris. OK dtucker@.
 - (tim) [] Bug #1149. Changes in QNX section only. Patch by
   kraai at

 - (tim) [] test for egrep (AC_PROG_EGREP) before first
   AC_CHECK_HEADERS test. Without it, if AC_CHECK_HEADERS is first run
   by a platform specific check, builtin standard includes tests will be
   skipped on the other platforms.
   Analysis and suggestion by vinschen at, patch by dtucker@.
   OK tim@, djm@.

 - (dtucker) [] Bug #1148: Fix "crippled AES" test so that it
   works with picky compilers.  Patch from alex.kiernan at

 - (djm) [regress/] Try 'logname' as well as 'whoami' to 
   determine the user's login name - needed for regress tests on Solaris 
   10 and OpenSolaris
 - (djm) OpenBSD CVS Sync
   - 2006/02/01 09:06:50
     - merge sections on protocols 1 and 2 into a single section
     - remove configuration file section
     ok markus
   - 2006/02/01 09:11:41
     small tweak;
 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
   [contrib/suse/openssh.spec] Update versions ahead of release
   - 2006/02/01 11:27:22
     openssh 4.3
 - (djm) Release OpenSSH 4.3p1

 - (djm) OpenBSD CVS Sync
   - 2006/01/20 11:21:45
     - word change, agreed w/ markus
     - consistency fixes
   - 2006/01/25 09:04:34
     move the options description up the page, and a few additional tweaks
     whilst in here;
     ok markus
   - 2006/01/25 09:07:22
     move subsections to full sections;
   - 2006/01/26 08:47:56
     add a section on verifying host keys in dns;
     written with a lot of help from jakob;
     feedback dtucker/markus;
     ok markus
   - 2006/01/30 12:22:22
     mark channel as write failed or dead instead of read failed on error
     of the channel output filter.
     ok markus@
   - 2006/01/30 13:37:49
     remove an incorrect sentence;
     reported by roumen petrov;
     ok djm markus
   - 2006/01/31 10:19:02
     [misc.c misc.h scp.c sftp.c]
     fix local arbitrary command execution vulnerability on local/local and
     remote/remote copies (CVE-2006-0225, bz #1094), patch by
     t8m AT, polished by dtucker@ and myself; ok markus@
   - 2006/01/31 10:35:43
     "scp a b c" shouldn't clobber "c" when it is not a directory, report and
     fix from biorn@; ok markus@
 - (djm) Sync regress tests to OpenBSD:
   - 2005/03/10 10:20:39
     Regress test for ClearAllForwardings (bz #994); ok markus@
   - 2005/04/25 09:54:09
     Don't call cleanup in multiplex as test-exec will cleanup anyway
     found by tim@, ok djm@
     NB. ID sync only, we already had this
   - 2005/05/20 23:14:15
     force addressfamily=inet for tests, unbreaking dynamic-forward regress for
     recently committed nc SOCKS5 changes
   - 2005/05/24 04:10:54
     oops, new arcfour modes here too
   - 2005/06/30 11:02:37
     allow SUDO=sudo; from Alexander Bluhm
   - 2005/11/14 21:25:56
     all other scripts in this dir use $SUDO, not 'sudo', so pull this even
     ok markus@
   - 2005/12/14 04:36:39
     Fix assumption about how many args scp will pass; ok djm@
     NB. ID sync only, we already had this
   - 2006/01/27 06:49:21
     regress test for local to local scp copies; ok dtucker@
   - 2006/01/31 10:23:23
     regression test for CVE-2006-0225 written by dtucker@
   - 2006/01/31 10:36:33
     regress test for "scp a b c" where "c" is not a directory

 - (dtucker) [] Bug #1144: Use /bin/sh for the
   opensshd.init script interpretter if /sbin/sh does not exist.  ok tim@

 - (dtucker) OpenBSD CVS Sync
   - 2006/01/15 17:37:05
     correction from deraadt
   - 2006/01/18 10:53:29
     add a section on ssh-based vpn, based on reyk's README.tun;
   - 2006/01/20 00:14:55
     [scp.1 ssh.1 ssh_config.5 sftp.1]
     Document RekeyLimit.  Based on patch from jan.iven at from mindrot
     #1056 with feedback from jmc, djm and markus; ok jmc@ djm@

 - (djm) OpenBSD CVS Sync
   - 2006/01/06 13:27:32
     weed out some duplicate info in the known_hosts FILES entries;
     ok djm
   - 2006/01/06 13:29:10
     final round of whacking FILES for duplicate info, and some consistency
     ok djm
   - 2006/01/12 14:44:12
     split sections on tcp and x11 forwarding into two sections.
     add an example in the tcp section, based on sth i wrote for ssh faq;
     help + ok: djm markus dtucker
   - 2006/01/12 18:48:48
     refer to `TCP' rather than `TCP/IP' in the context of connection
     ok markus
   - 2006/01/12 22:20:00
     refer to TCP forwarding, rather than TCP/IP forwarding;
   - 2006/01/12 22:26:02
     refer to TCP forwarding, rather than TCP/IP forwarding;
   - 2006/01/12 22:34:12
     back out a sentence - AUTHENTICATION already documents this;

 - (dtucker) [contrib/cygwin/ssh-host-config] Make sshd service depend on
   tcpip service so it's always started after IP is up.  Patch from
   vinschen at

 - (djm) OpenBSD CVS Sync
   - 2006/01/03 16:31:10
     move FILES to a -compact list, and make each files an item in that list.
     this avoids nastly line wrap when we have long pathnames, and treats
     each file as a separate item;
     remove the .Pa too, since it is useless.
   - 2006/01/03 16:35:30
     use a larger width for the ENVIRONMENT list;
   - 2006/01/03 16:52:36
     put FILES in some sort of order: sort by pathname
   - 2006/01/03 16:55:18
     tweak the description of ~/.ssh/environment
   - 2006/01/04 18:42:46
     chop out some duplication in the .{r,s}hosts/{h,sh}osts.equiv FILES
     ok markus
   - 2006/01/04 18:45:01
     remove .Xr's to rsh(1) and telnet(1): they are hardly needed;
   - 2006/01/04 19:40:24
     +.Xr ssh-keyscan 1 ,
   - 2006/01/04 19:50:09
     -.Xr gzip 1 ,
   - 2006/01/05 23:43:53
     check that stdio file descriptors are actually closed before clobbering
     them in sanitise_stdfd(). problems occurred when a lower numbered fd was
     closed, but higher ones weren't. spotted by, and patch tested by
     Frédéric Olivié

 - (djm) [channels.c] clean up harmless merge error, from reyk@

 - (djm) OpenBSD CVS Sync
   - 2006/01/02 17:09:49
     [ssh_config.5 sshd_config.5]
     some corrections from michael knudsen;

 - (djm) [README.tun] Add README.tun, missed during sync of tun(4) support
 - (djm) OpenBSD CVS Sync
   - 2005/12/31 10:46:17
     some rewording done to make the text read better, plus some
     improvements from djm;
     ok djm
   - 2005/12/31 13:44:04
     clean up ENVIRONMENT a little;
   - 2005/12/31 13:45:19
     .Nm does not require an argument;
   - 2006/01/01 08:59:27
     [includes.h misc.c]
     move <net/if.h>; ok djm@
   - 2006/01/01 10:08:48
     no trailing "\n" for debug()
   - 2006/01/02 01:20:31
     [sftp-client.c sftp-common.h sftp-server.c]
     use a common max. packet length, no binary change
   - 2006/01/02 07:53:44
     clarify tun(4) opening - set the mode and bring the interface up. also
     (re)sets the tun(4) layer 2 LINK0 flag for existing tunnel interfaces.
     suggested and ok by djm@
   - 2006/01/02 12:31:06
     start to cut some duplicate info from FILES;
     help/ok djm

 - (djm) [ includes.h misc.c]
         [openbsd-compat/port-tun.c openbsd-compat/port-tun.h] Add support
         for tunnel forwarding for FreeBSD and NetBSD. NetBSD's support is
         limited to IPv4 tunnels only, and most versions don't support the
         tap(4) device at all.
 - (djm) [] Fix linux/if_tun.h test
 - (djm) [openbsd-compat/port-tun.c] Linux needs linux/if.h too

 - (djm) OpenBSD CVS Sync
   - 2005/12/28 22:46:06
     [canohost.c channels.c clientloop.c]
     use 'break-in' for consistency; ok deraadt@ ok and input jmc@
   - 2005/12/30 15:56:37
     [channels.c channels.h clientloop.c]
     add channel output filter interface.
     ok djm@, suggested by markus@
   - 2005/12/30 16:59:00
     do not suggest that interactive authentication will work
     with the -b flag;
     based on a diff from john l. scarfone;
     ok djm
   - 2005/12/31 01:38:45
     document -MM; ok djm@
 - (djm) [openbsd-compat/port-tun.c openbsd-compat/port-tun.h]
   [serverloop.c ssh.c openbsd-compat/]
   [openbsd-compat/openbsd-compat.h] Implement tun(4) forwarding 
   compatability support for Linux, diff from reyk@
 - (djm) [] Disable Linux tun(4) compat code if linux/tun.h does
   not exist
 - (djm) [] oops, make that linux/if_tun.h

 - (tim) [] grep for $SSHDUID instead of $SSHDGID on /etc/passwd

 - (djm) OpenBSD CVS Sync
   - 2005/12/20 21:59:43
     merge the sections on protocols 1 and 2 into one section on
     feedback djm dtucker
     ok deraadt markus dtucker
   - 2005/12/20 22:02:50
     .Ss -> .Sh: subsections have not made this page more readable
   - 2005/12/20 22:09:41
     move info on ssh return values and config files up into the main
   - 2005/12/21 11:48:16
     -L and -R descriptions are now above, not below, ~C description;
   - 2005/12/21 11:57:25
     options now described `above', rather than `later';
   - 2005/12/21 12:53:31
     -Y does X11 forwarding too;
     ok markus
   - 2005/12/21 22:44:26
     clarify precedence of -p, Port, ListenAddress; ok and help jmc@
   - 2005/12/22 10:31:40
     put the description of "UsePrivilegedPort" in the correct place;
   - 2005/12/22 11:23:42
     expand the description of -w somewhat;
     help/ok reyk
   - 2005/12/23 14:55:53
     - sync the description of -e w/ synopsis
     - simplify the description of -I
     - note that -I is only available if support compiled in, and that it
     isn't by default
     feedback/ok djm@
   - 2005/12/23 23:46:23
     less mark up for -c;
   - 2005/12/24 02:27:41
     [session.c sshd.c]
     eliminate some code duplicated in privsep and non-privsep paths, and
     explicitly clear SIGALRM handler; "groovy" deraadt@

 - (dtucker) OpenBSD CVS Sync
   - 2005/12/13 15:03:02
     if forced_tun_device is not set, it is -1 and not SSH_TUNID_ANY
   - 2005/12/16 18:07:08
     move the option descriptions up the page: start of a restructure;
     ok markus deraadt
   - 2005/12/16 18:08:53
     simplify a sentence;
   - 2005/12/16 18:12:22
     make the description of -c a little nicer;
   - 2005/12/16 18:14:40
     signpost the protocol sections;
   - 2005/12/17 21:13:05
     [ssh_config.5 session.c]
     spelling: fowarding, fowarded
   - 2005/12/17 21:36:42
     spelling: intented -> intended
   - 2005/12/20 04:41:07
     exit(255) on error to match description in ssh(1); bz #1137; ok deraadt@

 - (dtucker) [cipher-aes.c cipher-ctr.c cipher.c
   openbsd-compat/openssl-compat.h] Check for and work around broken AES
   ciphers >128bit on (some) Solaris 10 systems.  ok djm@

 - (dtucker) [defines.h] HP-UX system headers define "YES" and "NO" which
   scp.c also uses, so undef them here.
 - (dtucker) [ openbsd-compat/bsd-snprintf.c] Bug #1133: Our
   snprintf replacement can have a conflicting declaration in HP-UX's system
   headers (const vs. no const) so we now check for and work around it.  Patch
   from the dynamic duo of David Leonard and Ted Percival.

 - (dtucker) OpenBSD CVS Sync (regress/)
   - 2005/12/30 04:36:39
     Fix assumption about how many args scp will pass; ok djm@

 - (djm) OpenBSD CVS Sync
   - 2005/11/30 11:18:27
     timezone -> time zone
   - 2005/11/30 11:45:20
     avoid ambiguities in describing TZ;
     ok djm@
   - 2005/12/06 22:38:28
     [auth-options.c auth-options.h channels.c channels.h clientloop.c]
     [misc.c misc.h readconf.c readconf.h scp.c servconf.c servconf.h]
     [serverloop.c sftp.c ssh.1 ssh.c ssh_config ssh_config.5 sshconnect.c]
     [sshconnect.h sshd.8 sshd_config sshd_config.5]
     Add support for tun(4) forwarding over OpenSSH, based on an idea and
     initial channel code bits by markus@. This is a simple and easy way to
     use OpenSSH for ad hoc virtual private network connections, e.g.
     administrative tunnels or secure wireless access. It's based on a new
     ssh channel and works similar to the existing TCP forwarding support,
     except that it depends on the tun(4) network interface on both ends of
     the connection for layer 2 or layer 3 tunneling. This diff also adds
     support for LocalCommand in the ssh(1) client.
     ok djm@, markus@, jmc@ (manpages), tested and discussed with others
   - 2005/12/07 03:52:22
     reyk forgot to compile with -Werror (missing header)
   - 2005/12/07 10:52:13
     - avoid line split in SYNOPSIS
     - add args to -w
     - kill trailing whitespace
   - 2005/12/08 14:59:44
     [ssh.1 ssh_config.5]
     make `!command' a little clearer;
     ok reyk
   - 2005/12/08 15:06:29
     keep options in order;
   - 2005/12/08 18:34:11
     [auth-options.c includes.h misc.c misc.h readconf.c servconf.c]
     [serverloop.c ssh.c ssh_config.5 sshd_config.5]
     two changes to the new ssh tunnel support. this breaks compatibility
     with the initial commit but is required for a portable approach.
     - make the tunnel id u_int and platform friendly, use predefined types.
     - support configuration of layer 2 (ethernet) or layer 3
     (point-to-point, default) modes. configuration is done using the
     Tunnel (yes|point-to-point|ethernet|no) option is ssh_config(5) and
     restricted by the PermitTunnel (yes|point-to-point|ethernet|no) option
     in sshd_config(5).
     ok djm@, man page bits by jmc@
   - 2005/12/08 21:37:50
     new sentence, new line;
   - 2005/12/12 13:46:18
     [channels.c channels.h session.c]
     make sure protocol messages for internal channels are ignored.
     allow adjust messages for non-open channels; with and ok djm@
 - (djm) [misc.c] Disable tunnel code for non-OpenBSD (for now), enable
   again by providing a sys_tun_open() function for your platform and 
   setting the CUSTOM_SYS_TUN_OPEN define. More work is required to match 
   OpenBSD's tunnel protocol, which prepends the address family to the 

 - (djm) [] Remove regress script that was accidentally committed 
   in top level directory and not noticed for over a year :)

 - (tim) [ssh-keygen.c] Move DSA length test after setting default when
   bits == 0.
 - (dtucker) OpenBSD CVS Sync
   - 2005/11/29 02:04:55
     Populate default key sizes before checking them; from & ok tim@
 - (tim) [ sshd.8] Enable locked account check (a "*LK*" string)
   for UnixWare.

 - (dtucker) [regress/] Work around breakage caused by some
   versions of GNU head.  Based on patch from zappaman at
 - (dtucker) [includes.h] Bug #1122: __USE_GNU is a glibc internal macro, use
   _GNU_SOURCE instead.  Patch from t8m at
 - (dtucker) OpenBSD CVS Sync
   - 2005/11/28 05:16:53
     [ssh-keygen.1 ssh-keygen.c]
     Enforce DSA key length of exactly 1024 bits to comply with FIPS-186-2,
     increase minumum RSA key size to 768 bits and update man page to reflect
     these.  Patch originally bz#1119 (senthilkumar_sen at,
     ok djm@, grudging ok deraadt@.
   - 2005/11/28 06:02:56
     Update agent socket path templates to reflect reality, correct xref for
     time formats.  bz#1121, patch from openssh at, ok djm@

 - (dtucker) [] Bug #1126: AIX 5.2 and 5.3 (and presumably newer,
   when they're available) need the real UID set otherwise pam_chauthtok will
   set ADMCHG after changing the password, forcing the user to change it
   again immediately.

 - (dtucker) [] Apply tim's fix for older systems where the
   resolver state in resolv.h is "state" not "__res_state".  With slight
   modification by me to also work on old AIXes.  ok djm@
 - (dtucker) [progressmeter.c scp.c sftp-server.c] Use correct casts for
   snprintf formats, fixes warnings on some 64 bit platforms.  Patch from
   shaw at, ok djm@

 - (djm) [ openbsd-compat/ openbsd-compat/bsd-asprintf.c 
   openbsd-compat/bsd-snprintf.c openbsd-compat/openbsd-compat.h] Add an 
   asprintf() implementation, after syncing our {v,}snprintf() implementation
   with some extra fixes from Samba's version. With help and debugging from 
   dtucker and tim; ok dtucker@
 - (dtucker) [] Fix typos in comments and AC_SEARCH_LIB argument
   order in Reliant Unix block.  Patch from johane at
 - (dtucker) [regress/] Use 1024 bit keys since we generate so
   many and use them only once.  Speeds up testing on older/slower hardware.

 - (dtucker) OpenBSD CVS Sync
   - 2005/11/12 18:37:59
   - 2005/11/12 18:38:15
     avoid close(-1), as in rcp; ok cloder
   - 2005/11/15 11:59:54
     Include sys/queue.h explicitly instead of assuming some other header
     will pull it in.  At the moment it gets pulled in by sys/select.h
     (which ssh has no business including) via event.h.  OK markus@
     (ID sync only in -portable)
   - 2005/11/21 09:42:10
     Perform Kerberos calls even for invalid users to prevent leaking
     information about account validity.  bz #975, patch originally from
     Senthil Kumar, sanity checked by Simon Wilkinson, tested by djm@, biorn@,
     ok markus@
   - 2005/11/22 03:36:03
     Correct format/arguments to debug call; spotted by shaw at
     ok djm@
 - (dtucker) [loginrec.c] Add casts to prevent compiler warnings, patch
   from shaw at

 - (dtucker) [openbsd-compat/openssl-compat.h] Add comment explaining what
   is going on.

 - (dtucker) [openbsd-compat/getrrsetbyname.c] Restore Portable-specific
   ifdef lost during sync.  Spotted by tim@.
 - (dtucker) [openbsd-compat/{realpath.c,stroll.c,rresvport.c}] $OpenBSD tag.
 - (dtucker) [] Use "$AWK" instead of "awk" in gcc version test.
 - (dtucker) [] Remove duplicate utimes() check.  ok djm@
 - (dtucker) [regress/] Fix potential race in the reconfigure
   test: if sshd takes too long to reconfigure the subsequent connection will
   fail.  Zap pidfile before HUPing sshd which will rewrite it when it's ready.

 - (dtucker) [openbsd-compat/setenv.c] Merge changes for __findenv from
   OpenBSD getenv.c revs 1.4 - 1.8 (ANSIfication of arguments, removal of
 - (dtucker) [openbsd-compat/setenv.c] Make __findenv static, remove
   unnecessary prototype.
 - (dtucker) [openbsd-compat/setenv.c] Sync changes from OpenBSD setenv.c
   revs 1.7 - 1.9.
 - (dtucker) [auth-krb5.c] Fix -Wsign-compare warning in non-Heimdal path.
   Patch from djm@.
 - (dtucker) [] Disable pointer-sign warnings on gcc 4.0+
   since they're not useful right now.  Patch from djm@.
 - (dtucker) [openbsd-compat/getgrouplist.c] Sync OpenBSD revs 1.10 - 1.2 (ANSI
   prototypes, removal of "register").
 - (dtucker) [openbsd-compat/strlcat.c] Sync OpenBSD revs 1.11 - 1.12 (removal
   of "register").
 - (dtucker) [openbsd-compat/{LOTS}] Move the "OPENBSD ORIGINAL" markers to
   after the copyright notices.  Having them at the top next to the CVSIDs
   guarantees a conflict for each and every sync.
 - (dtucker) [openbsd-compat/strlcpy.c] Update from OpenBSD 1.8 -> 1.10.
 - (dtucker) [openbsd-compat/sigact.h] Add "OPENBSD ORIGINAL" marker.
 - (dtucker) [openbsd-compat/strmode.c] Update from OpenBSD 1.5 -> 1.7.
   Removal of rcsid, "whiteout" inode type.
 - (dtucker) [openbsd-compat/basename.c] Update from OpenBSD 1.11 -> 1.14.
   Removal of rcsid, will no longer strlcpy parts of the string.
 - (dtucker) [openbsd-compat/strtoll.c] Update from OpenBSD 1.4 -> 1.5.
 - (dtucker) [openbsd-compat/strtoul.c] Update from OpenBSD 1.5 -> 1.7.
 - (dtucker) [openbsd-compat/readpassphrase.c] Update from OpenBSD 1.16 -> 1.18.
 - (dtucker) [openbsd-compat/readpassphrase.h] Update from OpenBSD 1.3 -> 1.5.
 - (dtucker) [openbsd-compat/glob.c] Update from OpenBSD 1.22 -> 1.25.
 - (dtucker) [openbsd-compat/glob.h] Update from OpenBSD 1.8 -> 1.9.
 - (dtucker) [openbsd-compat/getcwd.c] Update from OpenBSD 1.9 -> 1.14.
 - (dtucker) [openbsd-compat/getcwd.c] Replace lstat with fstat to match up
   with OpenBSD code since we don't support platforms without fstat any more.
 - (dtucker) [openbsd-compat/inet_aton.c] Update from OpenBSD 1.7 -> 1.9.
 - (dtucker) [openbsd-compat/inet_ntoa.c] Update from OpenBSD 1.4 -> 1.6.
 - (dtucker) [openbsd-compat/inet_ntop.c] Update from OpenBSD 1.5 -> 1.7.
 - (dtucker) [openbsd-compat/daemon.c] Update from OpenBSD 1.5 -> 1.6.
 - (dtucker) [openbsd-compat/strsep.c] Update from OpenBSD 1.5 -> 1.6.
 - (dtucker) [openbsd-compat/daemon.c] Update from OpenBSD 1.10 -> 1.13.
 - (dtucker) [openbsd-compat/mktemp.c] Update from OpenBSD 1.17 -> 1.19.
 - (dtucker) [openbsd-compat/rresvport.c] Update from OpenBSD 1.6 -> 1.8.
 - (dtucker) [openbsd-compat/bindresvport.c] Add "OPENBSD ORIGINAL" marker.
 - (dtucker) [openbsd-compat/bindresvport.c] Update from OpenBSD 1.16 -> 1.17.
 - (dtucker) [openbsd-compat/sigact.c] Update from OpenBSD 1.3 -> 1.4.
   Id and copyright sync only, there were no substantial changes we need.
 - (dtucker) [openbsd-compat/bsd-closefrom.c openbsd-compat/base64.c]
   -Wsign-compare fixes from djm.
 - (dtucker) [openbsd-compat/sigact.h] Update from OpenBSD 1.2 -> 1.3.
   Id and copyright sync only, there were no substantial changes we need.
 - (dtucker) [] Try to get the gcc version number in a way that
   doesn't change between versions, and use a safer default.

 - (djm) OpenBSD CVS Sync
   - 2005/10/07 11:13:57
     change DSA default back to 1024, as it's defined for 1024 bits only
     and this causes interop problems with other clients.  moreover,
     in order to improve the security of DSA you need to change more
     components of DSA key generation (e.g. the internal SHA1 hash);
     ok deraadt
   - 2005/10/10 10:23:08
     [channels.c channels.h clientloop.c serverloop.c session.c]
     fix regression I introduced in 4.2: X11 forwardings initiated after
     a session has exited (e.g. "(sleep 5; xterm) &") would not start.
     bz #1086 reported by t8m AT; ok markus@ dtucker@
   - 2005/10/11 23:37:37
     bz #1076 set SO_REUSEADDR on X11 forwarding listner sockets, preventing
     bind() failure when a previous connection's listeners are in TIME_WAIT,
     reported by plattner AT; ok dtucker@
   - 2005/10/13 14:03:01
     [auth2-gss.c gss-genr.c gss-serv.c]
     remove unneeded #includes; ok markus@
   - 2005/10/13 14:20:37
     spelling in comments
   - 2005/10/13 19:08:08
     [gss-serv-krb5.c gss-serv.c]
     unused declarations; ok deraadt@
     (id sync only for gss-serv-krb5.c)
   - 2005/10/13 19:13:41
     unneeded #include, unused declaration, little knf; ok deraadt@
   - 2005/10/13 22:24:31
     [auth2-gss.c gss-genr.c gss-serv.c monitor.c]
     KNF; ok djm@
   - 2005/10/14 02:17:59
     [ssh-keygen.c ssh.c sshconnect2.c]
     no trailing "\n" for log functions; ok djm@
   - 2005/10/14 02:29:37
     [channels.c clientloop.c]
     free()->xfree(); ok djm@
   - 2005/10/15 15:28:12
     make external definition static; ok deraadt@
   - 2005/10/17 13:45:05
     fix memory leaks from 2 sources:
         1) key_fingerprint_raw()
         2) malloc in dns_read_rdata()
     ok jakob@
   - 2005/10/17 14:01:28
     remove #ifdef LWRES; ok jakob@
   - 2005/10/17 14:13:35
     [dns.c dns.h]
     more cleanups; ok jakob@
   - 2005/10/30 01:23:19
     mention control socket fallback behaviour, reported by 
     tryponraj AT
   - 2005/10/30 04:01:03
     make ssh-keygen discard junk from server before SSH- ident, spotted by
     dave AT; ok dtucker@
   - 2005/10/30 04:03:24
     fix misleading debug message; ok dtucker@
   - 2005/10/30 08:29:29
     [canohost.c sshd.c]
     Check for connections with IP options earlier and drop silently.  ok djm@
   - 2005/10/30 08:43:47
     remove trailing whitespace;
   - 2005/10/30 08:52:18
     [clientloop.c packet.c serverloop.c session.c ssh-agent.c ssh-keygen.c]
     [ssh.c sshconnect.c sshconnect1.c sshd.c]
     no need to escape single quotes in comments, no binary change
   - 2005/10/31 06:15:04
     Fix sorting with "ls -1" command. From Robert Tsai, "looks right" deraadt@
   - 2005/10/31 11:12:49
     [ssh-keygen.1 ssh-keygen.c]
     generate a protocol 2 RSA key by default
   - 2005/10/31 11:48:29
     make sure we clean up wtmp, etc. file when we receive a SIGTERM,
     SIGINT or SIGQUIT when running without privilege separation (the
     normal privsep case is already OK). Patch mainly by dtucker@ and
     senthilkumar_sen AT; ok dtucker@
   - 2005/10/31 19:55:25
   - 2005/11/03 13:38:29
     Cache reverse lookups with and without DNS separately; ok markus@
   - 2005/11/04 05:15:59
     [kex.c kex.h kexdh.c kexdhc.c kexdhs.c kexgex.c kexgexc.c kexgexs.c]
     remove hardcoded hash lengths in key exchange code, allowing
     implementation of KEX methods with different hashes (e.g. SHA-256);
     ok markus@ dtucker@ stevesk@
   - 2005/11/05 05:01:15
     Fix leaks in error paths, bz #1109 and #1110 reported by kremenek AT; ok dtucker@
 - (dtucker) [README.platform] Add PAM section.
 - (djm) [openbsd-compat/getrrsetbyname.c] Sync to latest OpenBSD version,
   resolving memory leak bz#1111 reported by kremenek AT;
   ok dtucker@

 - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup().
   Reported by olavi at and antoine.brodin at
   via FreeBSD.

 - (djm) [contrib/suse/openssh.spec contrib/suse/rc.
   sshd contrib/suse/sysconfig.ssh] Bug #1106: Updated SuSE spec and init 
   files from imorgan AT
 - (dtucker) [session.c] Bug #1045do not check /etc/nologin when PAM is
   enabled, instead allow PAM to handle it.  Note that on platforms using PAM,
   the pam_nologin module should be added to sshd's session stack in order to
   maintain exising behaviour.  Based on patch and discussion from t8m at, ok djm@

 - (dtucker) [] Relocate LLONG_MAX calculation to after the
   sizeof(long long) checks, to make fixing bug #1104 easier (no changes
 - (dtucker) [] Bug #1104: Tru64's printf family doesn't
   understand "%lld", even though the compiler has "long long", so handle
   it as a special case.  Patch tested by mcaskill.scott at
 - (dtucker) [contrib/cygwin/ssh-user-config] Remove duplicate yes/no
   prompt.  Patch from vinschen at

 - (dtucker) [] Bug #1097: Fix configure for cross-compiling.
   /etc/default/login report and testing from aabaker at, corrections
   from tim@.

 - (dtucker) [ defines.h openbsd-compat/vis.{c,h}] Sync current
   versions from OpenBSD.  ok djm@

 - (dtucker) [] Bug #1098: define $MAIL for HP-UX; report from
   brian.smith at agilent com.
 - (djm) [] missing 'test' call for -with-Werror test

 - (dtucker) [ sshd.8] Enable locked account check (a prepended
   "*LOCKED*" string) for FreeBSD.  Patch jeremie at and
   senthilkumar_sen at

 - (dtucker) OpenBSD CVS Sync
   - 2005/09/07 08:53:53
     enforce chanid != NULL; ok djm
   - 2005/09/09 19:18:05
     typo; from mark at, bug #1082
   - 2005/09/13 23:40:07
     [sshd.c ssh.c misc.h sftp.c ssh-keygen.c ssh-keysign.c sftp-server.c
     scp.c misc.c ssh-keyscan.c ssh-add.c ssh-agent.c]
     ensure that stdio fds are attached; ok deraadt@
   - 2005/09/19 11:37:34
     [ssh_config.5 ssh.1]
     mention ability to specify bind_address for DynamicForward and -D options;
     bz#1077 spotted by Haruyama Seigo
   - 2005/09/19 11:47:09
     stop connection abort on rekey with delayed compression enabled when
     post-auth privsep is disabled (e.g. when root is logged in); ok dtucker@
   - 2005/09/19 11:48:10
   - 2005/09/19 15:38:27
     some more .Bk/.Ek to avoid ugly line split;
   - 2005/09/19 15:42:44
     update -D usage here too;
   - 2005/09/19 23:31:31
     spelling nit from stevesk@
   - 2005/09/21 23:36:54
     aquire -> acquire, from stevesk@
   - 2005/09/21 23:37:11
     change label at markus@'s request
   - 2005/09/30 20:34:26
     deploy .An -nosplit; ok jmc
   - 2005/10/03 07:44:42
     Relocate check_ip_options call to prevent logging of garbage for
     connections with IP options set.  bz#1092 from David Leonard,
     "looks good" deraadt@
 - (dtucker) [regress/README.regress] Bug #989: Document limitation that scp
   is required in the system path for the multiplex test to work.

 - (dtucker) [openbsd-compat/openbsd-compat.h] Bug #1096: Add prototype
   for strtoll.  Patch from o.flebbe at
 - (dtucker) [monitor.c] Bug #1087: Send loginmsg to preauth privsep
   child during PAM account check without clearing it.  This restores the
   post-login warnings such as LDAP password expiry.  Patch from Tomas Mraz
   with help from several others.

 - (dtucker) [monitor_wrap.c] Remove duplicate definition of loginmsg
   introduced during sync.

 - (dtucker) [entropy.c] Use u_char for receiving RNG seed for consistency.
 - (dtucker) [auth-pam.c] Bug #1028: send final non-query messages from
   PAM via keyboard-interactive.  Patch tested by the folks at Vintela.

 - (dtucker) [entropy.c] Remove unnecessary tests for getuid and geteuid
   calls, since they can't possibly fail.  ok djm@
 - (dtucker) [entropy.c entropy.h sshd.c] Pass RNG seed to the reexec'ed
   process when sshd relies on ssh-random-helper.  Should result in faster
   logins on systems without a real random device or prngd.  ok djm@

 - (dtucker) [auth2.c] Move start_pam() calls out of if-else block to remove
   duplicate call.  ok djm@

 - (dtucker) [] Use -R linker flag for libedit too; patch from
   skeleten at
 - (dtucker) [] Fix help for --with-opensc; patch from skeleten at

 - (tim) [aclocal.m4] Delete acconfig.h and add templates to
   AC_DEFINE and AC_DEFINE_UNQUOTED to quiet autoconf 2.59 warning messages.
   ok dtucker@

 - (tim) [] Bug 1078. Fix --without-kerberos5. Reported by
   Mike Frysinger.

 - (tim) [defines.h openbsd-compat/port-uw.c] Add long password support to
   OpenServer 6 and add osr5bigcrypt support so when someone migrates
   passwords between UnixWare and OpenServer they will still work. OK dtucker@

$Id: ChangeLog,v 1.5095 2008/07/21 08:22:25 djm Exp $