* New upstream release (closes: #474301). Important changes not previously

  backported to 4.7p1:
  - 4.9/4.9p1 (http://www.openssh.com/txt/release-4.9):
    + Added chroot(2) support for sshd(8), controlled by a new option
      "ChrootDirectory" (closes: #139047, LP: #24777).
    + Linked sftp-server(8) into sshd(8). The internal sftp server is used
      when the command "internal-sftp" is specified in a Subsystem or
      ForceCommand declaration. When used with ChrootDirectory, the
      internal sftp server requires no special configuration of files
      inside the chroot environment.
    + Added a protocol extension method "posix-rename@openssh.com" for
      sftp-server(8) to perform POSIX atomic rename() operations; sftp(1)
      prefers this if available (closes: #308561).
    + Removed the fixed limit of 100 file handles in sftp-server(8).
    + ssh(8) will now skip generation of SSH protocol 1 ephemeral server
      keys when in inetd mode and protocol 2 connections are negotiated.
      This speeds up protocol 2 connections to inetd-mode servers that
      also allow Protocol 1.
    + Accept the PermitRootLogin directive in a sshd_config(5) Match
      block. Allows for, e.g. permitting root only from the local network.
    + Reworked sftp(1) argument splitting and escaping to be more
      internally consistent (i.e. between sftp commands) and more
      consistent with sh(1). Please note that this will change the
      interpretation of some quoted strings, especially those with
      embedded backslash escape sequences.
    + Support "Banner=none" in sshd_config(5) to disable sending of a
      pre-login banner (e.g. in a Match block).
    + ssh(1) ProxyCommands are now executed with $SHELL rather than
      /bin/sh.
    + ssh(1)'s ConnectTimeout option is now applied to both the TCP
      connection and the 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.
    + scp(1) incorrectly reported "stalled" on slow copies (closes:
      #140828).
    + scp(1) date underflow for timestamps before epoch.
    + ssh(1) used the obsolete SIG DNS RRtype for host keys in DNS,
      instead of the current standard RRSIG.
    + Correctly drain ACKs when a sftp(1) upload write fails midway,
      avoids a fatal() exit from what should be a recoverable condition.
    + Fixed ssh-keygen(1) selective host key hashing (i.e. "ssh-keygen -HF
      hostname") to not include any IP address in the data to be hashed.
    + Make ssh(1) skip listening on the IPv6 wildcard address when a
      binding address of 0.0.0.0 is used against an old SSH server that
      does not support the RFC4254 syntax for wildcard bind addresses.
    + Enable IPV6_V6ONLY socket option on sshd(8) listen socket, as is
      already done for X11/TCP forwarding sockets (closes: #439661).
    + Fix FD leak that could hang a ssh(1) connection multiplexing master.
    + Make ssh(1) -q option documentation consistent with reality.
    + Fixed sshd(8) PAM support not calling pam_session_close(), or
      failing to call it with root privileges (closes: #372680).
    + Fix activation of OpenSSL engine support when requested in configure
      (LP: #119295).
  - 5.1/5.1p1 (http://www.openssh.com/txt/release-5.1):
    + Introduce experimental SSH Fingerprint ASCII Visualisation to ssh(1)
      and ssh-keygen(1). Visual fingerprint display is controlled by a new
      ssh_config(5) option "VisualHostKey". The intent is to render SSH
      host keys in a visual form that is amenable to easy recall and
      rejection of changed host keys.
    + sshd_config(5) now supports CIDR address/masklen matching in "Match
      address" blocks, with a fallback to classic wildcard matching.
    + sshd(8) now supports CIDR matching in ~/.ssh/authorized_keys
      from="..." restrictions, also with a fallback to classic wildcard
      matching.
    + Added an extended test mode (-T) to sshd(8) to request that it write
      its effective configuration to stdout and exit. Extended test mode
      also supports the specification of connection parameters (username,
      source address and hostname) to test the application of
      sshd_config(5) Match rules.
    + ssh(1) now prints the number of bytes transferred and the overall
      connection throughput for SSH protocol 2 sessions when in verbose
      mode (previously these statistics were displayed for protocol 1
      connections only).
    + sftp-server(8) now supports extension methods statvfs@openssh.com
      and fstatvfs@openssh.com that implement statvfs(2)-like operations.
    + sftp(1) now has a "df" command to the sftp client that uses the
      statvfs@openssh.com to produce a df(1)-like display of filesystem
      space and inode utilisation (requires statvfs@openssh.com support on
      the server).
    + Added a MaxSessions option to sshd_config(5) to allow control of the
      number of multiplexed sessions supported over a single TCP
      connection. This allows increasing the number of allowed sessions
      above the previous default of 10, disabling connection multiplexing
      (MaxSessions=1) or disallowing login/shell/subsystem sessions
      entirely (MaxSessions=0).
    + Added a no-more-sessions@openssh.com global request extension that
      is sent from ssh(1) to sshd(8) when the client 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 in cases where the client has been
      hijacked.
    + ssh-keygen(1) now supports the use of the -l option in combination
      with -F to search for a host in ~/.ssh/known_hosts and display its
      fingerprint.
    + ssh-keyscan(1) now defaults to "rsa" (protocol 2) keys, instead of
      "rsa1".
    + Added an AllowAgentForwarding option to sshd_config(8) to control
      whether authentication agent forwarding is permitted. Note that this
      is a loose control, as a client may install their own unofficial
      forwarder.
    + ssh(1) and sshd(8): avoid unnecessary malloc/copy/free when
      receiving network data, resulting in a ~10% speedup.
    + ssh(1) and sshd(8) will now 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 only first
      address and give up if that failed.
    + ssh(1) and sshd(8) now support signalling that channels are
      half-closed for writing, through a channel protocol extension
      notification "eow@openssh.com". This allows propagation of closed
      file descriptors, so that commands such as "ssh -2 localhost od
      /bin/ls | true" do not send unnecessary data over the wire.
    + sshd(8): increased the default size of ssh protocol 1 ephemeral keys
      from 768 to 1024 bits.
    + When ssh(1) has been requested to fork 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.
    + "Match group" blocks in sshd_config(5) now support negation of
      groups. E.g. "Match group staff,!guests".
    + sftp(1) and sftp-server(8) now allow chmod-like operations to set
      set[ug]id/sticky bits.
    + The MaxAuthTries option is now permitted in sshd_config(5) match
      blocks.
    + Multiplexed ssh(1) sessions now support a subset of the ~ escapes
      that are available to a primary connection.
    + ssh(1) connection multiplexing will now fall back to creating a new
      connection in most error cases (closes: #352830).
    + Make ssh(1) deal more gracefully with channel requests that fail.
      Previously it would optimistically assume that requests would always
      succeed, which could cause hangs if they did not (e.g. when the
      server runs out of file descriptors).
    + ssh(1) now reports multiplexing errors via the multiplex slave's
      stderr where possible (subject to LogLevel in the mux master).
    + Prevent sshd(8) from erroneously applying public key restrictions
      leaned from ~/.ssh/authorized_keys to other authentication methods
      when public key authentication subsequently fails (LP: #161047).
    + Fixed an UMAC alignment problem that manifested on Itanium
      platforms.

32 files changed, 681 insertions, 129 deletions

diff --git a/openbsd-compat/Makefile.in b/openbsd-compat/Makefile.in
index b44a7851e..a60e5a68d 100644
--- a/openbsd-compat/Makefile.in
+++ b/openbsd-compat/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.41 2007/06/25 12:15:13 dtucker Exp $
+# $Id: Makefile.in,v 1.43 2008/06/08 17:32:29 dtucker Exp $
 
 sysconfdir=@sysconfdir@
 piddir=@piddir@
@@ -16,9 +16,9 @@ RANLIB=@RANLIB@
 INSTALL=@INSTALL@
 LDFLAGS=-L. @LDFLAGS@
 
-OPENBSD=base64.o basename.o bindresvport.o daemon.o dirname.o getcwd.o getgrouplist.o getopt.o getrrsetbyname.o glob.o inet_aton.o inet_ntoa.o inet_ntop.o mktemp.o readpassphrase.o realpath.o rresvport.o setenv.o setproctitle.o sha2.o sigact.o strlcat.o strlcpy.o strmode.o strsep.o strtonum.o strtoll.o strtoul.o vis.o
+OPENBSD=base64.o basename.o bindresvport.o daemon.o dirname.o fmt_scaled.o getcwd.o getgrouplist.o getopt.o getrrsetbyname.o glob.o inet_aton.o inet_ntoa.o inet_ntop.o mktemp.o readpassphrase.o realpath.o rresvport.o setenv.o setproctitle.o sha2.o sigact.o strlcat.o strlcpy.o strmode.o strsep.o strtonum.o strtoll.o strtoul.o vis.o
 
-COMPAT=bsd-arc4random.o bsd-asprintf.o bsd-closefrom.o bsd-cray.o bsd-cygwin_util.o bsd-getpeereid.o bsd-misc.o bsd-nextstep.o bsd-openpty.o bsd-poll.o bsd-snprintf.o bsd-waitpid.o fake-rfc2553.o openssl-compat.o xmmap.o xcrypt.o
+COMPAT=bsd-arc4random.o bsd-asprintf.o bsd-closefrom.o bsd-cray.o bsd-cygwin_util.o bsd-getpeereid.o bsd-misc.o bsd-nextstep.o bsd-openpty.o bsd-poll.o bsd-snprintf.o bsd-statvfs.o bsd-waitpid.o fake-rfc2553.o openssl-compat.o xmmap.o xcrypt.o
 
 PORTS=port-aix.o port-irix.o port-linux.o port-solaris.o port-tun.o port-uw.o
 
diff --git a/openbsd-compat/base64.c b/openbsd-compat/base64.c
index 9a60f583b..9e7466716 100644
--- a/openbsd-compat/base64.c
+++ b/openbsd-compat/base64.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: base64.c,v 1.4 2002/01/02 23:00:10 deraadt Exp $      */
+/*      $OpenBSD: base64.c,v 1.5 2006/10/21 09:55:03 otto Exp $ */
 
 /*
  * Copyright (c) 1996 by Internet Software Consortium.
@@ -62,9 +62,6 @@
 
 #include "base64.h"
 
-/* XXX abort illegal in library */
-#define Assert(Cond) if (!(Cond)) abort()
-
 static const char Base64[] =
         "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 static const char Pad64 = '=';
@@ -151,10 +148,6 @@ b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize)
                 output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
                 output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
                 output[3] = input[2] & 0x3f;
-                Assert(output[0] < 64);
-                Assert(output[1] < 64);
-                Assert(output[2] < 64);
-                Assert(output[3] < 64);
 
                 if (datalength + 4 > targsize)
                         return (-1);
@@ -174,9 +167,6 @@ b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize)
                 output[0] = input[0] >> 2;
                 output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
                 output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-                Assert(output[0] < 64);
-                Assert(output[1] < 64);
-                Assert(output[2] < 64);
 
                 if (datalength + 4 > targsize)
                         return (-1);
diff --git a/openbsd-compat/bindresvport.c b/openbsd-compat/bindresvport.c
index 65afed1e3..c0d5bdb5c 100644
--- a/openbsd-compat/bindresvport.c
+++ b/openbsd-compat/bindresvport.c
@@ -1,6 +1,6 @@
 /* This file has be substantially modified from the original OpenBSD source */
 
-/*      $OpenBSD: bindresvport.c,v 1.16 2005/04/01 07:44:03 otto Exp $  */
+/*      $OpenBSD: bindresvport.c,v 1.17 2005/12/21 01:40:22 millert Exp $       */
 
 /*
  * Copyright 1996, Jason Downs.  All rights reserved.
@@ -54,8 +54,8 @@ bindresvport_sa(int sd, struct sockaddr *sa)
 {
         int error, af;
         struct sockaddr_storage myaddr;
-        struct sockaddr_in *sin;
-        struct sockaddr_in6 *sin6;
+        struct sockaddr_in *in;
+        struct sockaddr_in6 *in6;
         u_int16_t *portp;
         u_int16_t port;
         socklen_t salen;
@@ -74,13 +74,13 @@ bindresvport_sa(int sd, struct sockaddr *sa)
                 af = sa->sa_family;
 
         if (af == AF_INET) {
-                sin = (struct sockaddr_in *)sa;
+                in = (struct sockaddr_in *)sa;
                 salen = sizeof(struct sockaddr_in);
-                portp = &sin->sin_port;
+                portp = &in->sin_port;
         } else if (af == AF_INET6) {
-                sin6 = (struct sockaddr_in6 *)sa;
+                in6 = (struct sockaddr_in6 *)sa;
                 salen = sizeof(struct sockaddr_in6);
-                portp = &sin6->sin6_port;
+                portp = &in6->sin6_port;
         } else {
                 errno = EPFNOSUPPORT;
                 return (-1);
diff --git a/openbsd-compat/bsd-arc4random.c b/openbsd-compat/bsd-arc4random.c
index d45fb182a..9d4c8690e 100644
--- a/openbsd-compat/bsd-arc4random.c
+++ b/openbsd-compat/bsd-arc4random.c
@@ -19,6 +19,7 @@
 #include <sys/types.h>
 
 #include <string.h>
+#include <stdlib.h>
 #include <stdarg.h>
 
 #include "log.h"
@@ -82,3 +83,68 @@ arc4random_stir(void)
         rc4_ready = REKEY_BYTES;
 }
 #endif /* !HAVE_ARC4RANDOM */
+
+#ifndef ARC4RANDOM_BUF
+void
+arc4random_buf(void *_buf, size_t n)
+{
+        size_t i;
+        u_int32_t r = 0;
+        char *buf = (char *)_buf;
+
+        for (i = 0; i < n; i++) {
+                if (i % 4 == 0)
+                        r = arc4random();
+                buf[i] = r & 0xff;
+                r >>= 8;
+        }
+        i = r = 0;
+}
+#endif /* !HAVE_ARC4RANDOM_BUF */
+
+#ifndef ARC4RANDOM_UNIFORM
+/*
+ * Calculate a uniformly distributed random number less than upper_bound
+ * avoiding "modulo bias".
+ *
+ * Uniformity is achieved by generating new random numbers until the one
+ * returned is outside the range [0, 2**32 % upper_bound).  This
+ * guarantees the selected random number will be inside
+ * [2**32 % upper_bound, 2**32) which maps back to [0, upper_bound)
+ * after reduction modulo upper_bound.
+ */
+u_int32_t
+arc4random_uniform(u_int32_t upper_bound)
+{
+        u_int32_t r, min;
+
+        if (upper_bound < 2)
+                return 0;
+
+#if (ULONG_MAX > 0xffffffffUL)
+        min = 0x100000000UL % upper_bound;
+#else
+        /* Calculate (2**32 % upper_bound) avoiding 64-bit math */
+        if (upper_bound > 0x80000000)
+                min = 1 + ~upper_bound;         /* 2**32 - upper_bound */
+        else {
+                /* (2**32 - (x * 2)) % x == 2**32 % x when x <= 2**31 */
+                min = ((0xffffffff - (upper_bound * 2)) + 1) % upper_bound;
+        }
+#endif
+
+        /*
+         * This could theoretically loop forever but each retry has
+         * p > 0.5 (worst case, usually far better) of selecting a
+         * number inside the range we need, so it should rarely need
+         * to re-roll.
+         */
+        for (;;) {
+                r = arc4random();
+                if (r >= min)
+                        break;
+        }
+
+        return r % upper_bound;
+}
+#endif /* !HAVE_ARC4RANDOM_UNIFORM */
diff --git a/openbsd-compat/bsd-asprintf.c b/openbsd-compat/bsd-asprintf.c
index 00fa0dfd8..3368195d4 100644
--- a/openbsd-compat/bsd-asprintf.c
+++ b/openbsd-compat/bsd-asprintf.c
@@ -55,6 +55,7 @@ vasprintf(char **str, const char *fmt, va_list ap)
         if (ret >= 0 && ret < INIT_SZ) { /* succeeded with initial alloc */
                 *str = string;
         } else if (ret == INT_MAX || ret < 0) { /* Bad length */
+                free(string);
                 goto fail;
         } else {        /* bigger than initial, realloc allowing for nul */
                 len = (size_t)ret + 1;
diff --git a/openbsd-compat/bsd-cygwin_util.c b/openbsd-compat/bsd-cygwin_util.c
index dbf8176b6..38be7e350 100644
--- a/openbsd-compat/bsd-cygwin_util.c
+++ b/openbsd-compat/bsd-cygwin_util.c
@@ -175,45 +175,7 @@ check_nt_auth(int pwd_authenticated, struct passwd *pw)
 int
 check_ntsec(const char *filename)
 {
-        char *cygwin;
-        int allow_ntea = 0, allow_ntsec = 0;
-        struct statfs fsstat;
-
-        /* Windows 95/98/ME don't support file system security at all. */
-        if (!is_winnt)
-                return (0);
-
-        /* Evaluate current CYGWIN settings. */
-        cygwin = getenv("CYGWIN");
-        allow_ntea = ntea_on(cygwin);
-        allow_ntsec = ntsec_on(cygwin) ||
-            (has_capability(HAS_NTSEC_BY_DEFAULT) && !ntsec_off(cygwin));
-
-        /*
-         * `ntea' is an emulation of POSIX attributes. It doesn't support
-         * real file level security as ntsec on NTFS file systems does
-         * but it supports FAT filesystems. `ntea' is minimum requirement
-         * for security checks.
-         */
-        if (allow_ntea)
-                return (1);
-
-        /*
-         * Retrieve file system flags. In Cygwin, file system flags are
-         * copied to f_type which has no meaning in Win32 itself.
-         */
-        if (statfs(filename, &fsstat))
-                return (1);
-
-        /*
-         * Only file systems supporting ACLs are able to set permissions.
-         * `ntsec' is the setting in Cygwin which switches using of NTFS
-         * ACLs to support POSIX permissions on files.
-         */
-        if (fsstat.f_type & FS_PERSISTENT_ACLS)
-                return (allow_ntsec);
-
-        return (0);
+        return (pathconf(filename, _PC_POSIX_PERMISSIONS));
 }
 
 void
diff --git a/openbsd-compat/bsd-poll.c b/openbsd-compat/bsd-poll.c
index 836882eea..284db3a1f 100644
--- a/openbsd-compat/bsd-poll.c
+++ b/openbsd-compat/bsd-poll.c
@@ -1,4 +1,4 @@
-/* $Id: bsd-poll.c,v 1.1 2007/06/25 12:15:13 dtucker Exp $ */
+/* $Id: bsd-poll.c,v 1.3 2008/04/04 05:16:36 djm Exp $ */
 
 /*
  * Copyright (c) 2004, 2005, 2007 Darren Tucker (dtucker at zip com au).
@@ -17,12 +17,13 @@
  */
 
 #include "includes.h"
-#if !defined(HAVE_POLL) && defined(HAVE_SELECT)
+#if !defined(HAVE_POLL)
 
 #ifdef HAVE_SYS_SELECT_H
 # include <sys/select.h>
 #endif
 
+#include <stdlib.h>
 #include <errno.h>
 #include "bsd-poll.h"
 
diff --git a/openbsd-compat/bsd-statvfs.c b/openbsd-compat/bsd-statvfs.c
new file mode 100644
index 000000000..844d5b464
--- /dev/null
+++ b/openbsd-compat/bsd-statvfs.c
@@ -0,0 +1,37 @@
+/* $Id: bsd-statvfs.c,v 1.1 2008/06/08 17:32:29 dtucker Exp $ */
+
+/*
+ * Copyright (c) 2008 Darren Tucker <dtucker@zip.com.au>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "includes.h"
+
+#include <errno.h>
+
+#ifndef HAVE_STATVFS
+int statvfs(const char *path, struct statvfs *buf)
+{
+        errno = ENOSYS;
+        return -1;
+}
+#endif
+
+#ifndef HAVE_FSTATVFS
+int fstatvfs(int fd, struct statvfs *buf)
+{
+        errno = ENOSYS;
+        return -1;
+}
+#endif
diff --git a/openbsd-compat/bsd-statvfs.h b/openbsd-compat/bsd-statvfs.h
new file mode 100644
index 000000000..da215ffc6
--- /dev/null
+++ b/openbsd-compat/bsd-statvfs.h
@@ -0,0 +1,68 @@
+/* $Id: bsd-statvfs.h,v 1.1 2008/06/08 17:32:29 dtucker Exp $ */
+
+/*
+ * Copyright (c) 2008 Darren Tucker <dtucker@zip.com.au>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "includes.h"
+
+#include <sys/types.h>
+
+#ifdef HAVE_SYS_STATFS_H
+#include <sys/statfs.h>
+#endif
+
+#ifndef HAVE_STATVFS
+
+#ifndef HAVE_FSBLKCNT_T
+typedef unsigned long fsblkcnt_t;
+#endif
+#ifndef HAVE_FSFILCNT_T
+typedef unsigned long fsfilcnt_t;
+#endif
+
+#ifndef ST_RDONLY
+#define ST_RDONLY       1
+#endif
+#ifndef ST_NOSUID
+#define ST_NOSUID       2
+#endif
+
+        /* as defined in IEEE Std 1003.1, 2004 Edition */
+struct statvfs {
+        unsigned long f_bsize;  /* File system block size. */
+        unsigned long f_frsize; /* Fundamental file system block size. */
+        fsblkcnt_t f_blocks;    /* Total number of blocks on file system in */
+                                /* units of f_frsize. */
+        fsblkcnt_t    f_bfree;  /* Total number of free blocks. */
+        fsblkcnt_t    f_bavail; /* Number of free blocks available to  */
+                                /* non-privileged process.  */
+        fsfilcnt_t    f_files;  /* Total number of file serial numbers. */
+        fsfilcnt_t    f_ffree;  /* Total number of free file serial numbers. */
+        fsfilcnt_t    f_favail; /* Number of file serial numbers available to */
+                                /* non-privileged process. */
+        unsigned long f_fsid;   /* File system ID. */
+        unsigned long f_flag;   /* BBit mask of f_flag values. */
+        unsigned long f_namemax;/*  Maximum filename length. */
+};
+#endif
+
+#ifndef HAVE_STATVFS
+int statvfs(const char *, struct statvfs *);
+#endif
+
+#ifndef HAVE_FSTATVFS
+int fstatvfs(int, struct statvfs *);
+#endif
diff --git a/openbsd-compat/fake-rfc2553.c b/openbsd-compat/fake-rfc2553.c
index b6ea3d21e..096d9e092 100644
--- a/openbsd-compat/fake-rfc2553.c
+++ b/openbsd-compat/fake-rfc2553.c
@@ -51,6 +51,8 @@ int getnameinfo(const struct sockaddr *sa, size_t salen, char *host,
         struct hostent *hp;
         char tmpserv[16];
 
+        if (sa->sa_family != AF_UNSPEC && sa->sa_family != AF_INET)
+                return (EAI_FAMILY);
         if (serv != NULL) {
                 snprintf(tmpserv, sizeof(tmpserv), "%d", ntohs(sin->sin_port));
                 if (strlcpy(serv, tmpserv, servlen) >= servlen)
@@ -95,6 +97,8 @@ gai_strerror(int err)
                 return ("memory allocation failure.");
         case EAI_NONAME:
                 return ("nodename nor servname provided, or not known");
+        case EAI_FAMILY:
+                return ("ai_family not supported");
         default:
                 return ("unknown/invalid error.");
         }
@@ -159,6 +163,9 @@ getaddrinfo(const char *hostname, const char *servname,
         u_long addr;
 
         port = 0;
+        if (hints && hints->ai_family != AF_UNSPEC &&
+            hints->ai_family != AF_INET)
+                return (EAI_FAMILY);
         if (servname != NULL) {
                 char *cp;
 
diff --git a/openbsd-compat/fake-rfc2553.h b/openbsd-compat/fake-rfc2553.h
index 5c2ce5b1b..3e9090fc8 100644
--- a/openbsd-compat/fake-rfc2553.h
+++ b/openbsd-compat/fake-rfc2553.h
@@ -1,4 +1,4 @@
-/* $Id: fake-rfc2553.h,v 1.13 2006/07/24 03:51:52 djm Exp $ */
+/* $Id: fake-rfc2553.h,v 1.16 2008/07/14 11:37:37 djm Exp $ */
 
 /*
  * Copyright (C) 2000-2003 Damien Miller.  All rights reserved.
@@ -77,6 +77,7 @@ struct sockaddr_in6 {
         u_int16_t       sin6_port;
         u_int32_t       sin6_flowinfo;
         struct in6_addr sin6_addr;
+        u_int32_t       sin6_scope_id;
 };
 #endif /* !HAVE_STRUCT_SOCKADDR_IN6 */
 
@@ -128,6 +129,9 @@ struct sockaddr_in6 {
 #ifndef EAI_SYSTEM
 # define EAI_SYSTEM     (INT_MAX - 4)
 #endif
+#ifndef EAI_FAMILY
+# define EAI_FAMILY     (INT_MAX - 5)
+#endif
 
 #ifndef HAVE_STRUCT_ADDRINFO
 struct addrinfo {
@@ -152,7 +156,7 @@ int getaddrinfo(const char *, const char *,
 #endif /* !HAVE_GETADDRINFO */
 
 #if !defined(HAVE_GAI_STRERROR) && !defined(HAVE_CONST_GAI_STRERROR_PROTO)
-#define gai_strerror(a)         (ssh_gai_strerror(a))
+#define gai_strerror(a)         (_ssh_compat_gai_strerror(a))
 char *gai_strerror(int);
 #endif /* !HAVE_GAI_STRERROR */
 
diff --git a/openbsd-compat/fmt_scaled.c b/openbsd-compat/fmt_scaled.c
new file mode 100644
index 000000000..edd682a49
--- /dev/null
+++ b/openbsd-compat/fmt_scaled.c
@@ -0,0 +1,274 @@
+/*      $OpenBSD: fmt_scaled.c,v 1.9 2007/03/20 03:42:52 tedu Exp $     */
+
+/*
+ * Copyright (c) 2001, 2002, 2003 Ian F. Darwin.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* OPENBSD ORIGINAL: lib/libutil/fmt_scaled.c */
+
+/*
+ * fmt_scaled: Format numbers scaled for human comprehension
+ * scan_scaled: Scan numbers in this format.
+ *
+ * "Human-readable" output uses 4 digits max, and puts a unit suffix at
+ * the end.  Makes output compact and easy-to-read esp. on huge disks.
+ * Formatting code was originally in OpenBSD "df", converted to library routine.
+ * Scanning code written for OpenBSD libutil.
+ */
+
+#include "includes.h"
+
+#ifndef HAVE_FMT_SCALED
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <ctype.h>
+#include <limits.h>
+
+typedef enum {
+        NONE = 0, KILO = 1, MEGA = 2, GIGA = 3, TERA = 4, PETA = 5, EXA = 6
+} unit_type;
+
+/* These three arrays MUST be in sync!  XXX make a struct */
+static unit_type units[] = { NONE, KILO, MEGA, GIGA, TERA, PETA, EXA };
+static char scale_chars[] = "BKMGTPE";
+static long long scale_factors[] = {
+        1LL,
+        1024LL,
+        1024LL*1024,
+        1024LL*1024*1024,
+        1024LL*1024*1024*1024,
+        1024LL*1024*1024*1024*1024,
+        1024LL*1024*1024*1024*1024*1024,
+};
+#define SCALE_LENGTH (sizeof(units)/sizeof(units[0]))
+
+#define MAX_DIGITS (SCALE_LENGTH * 3)   /* XXX strlen(sprintf("%lld", -1)? */
+
+/** Convert the given input string "scaled" into numeric in "result".
+ * Return 0 on success, -1 and errno set on error.
+ */
+int
+scan_scaled(char *scaled, long long *result)
+{
+        char *p = scaled;
+        int sign = 0;
+        unsigned int i, ndigits = 0, fract_digits = 0;
+        long long scale_fact = 1, whole = 0, fpart = 0;
+
+        /* Skip leading whitespace */
+        while (isascii(*p) && isspace(*p))
+                ++p;
+
+        /* Then at most one leading + or - */
+        while (*p == '-' || *p == '+') {
+                if (*p == '-') {
+                        if (sign) {
+                                errno = EINVAL;
+                                return -1;
+                        }
+                        sign = -1;
+                        ++p;
+                } else if (*p == '+') {
+                        if (sign) {
+                                errno = EINVAL;
+                                return -1;
+                        }
+                        sign = +1;
+                        ++p;
+                }
+        }
+
+        /* Main loop: Scan digits, find decimal point, if present.
+         * We don't allow exponentials, so no scientific notation
+         * (but note that E for Exa might look like e to some!).
+         * Advance 'p' to end, to get scale factor.
+         */
+        for (; isascii(*p) && (isdigit(*p) || *p=='.'); ++p) {
+                if (*p == '.') {
+                        if (fract_digits > 0) { /* oops, more than one '.' */
+                                errno = EINVAL;
+                                return -1;
+                        }
+                        fract_digits = 1;
+                        continue;
+                }
+
+                i = (*p) - '0';                 /* whew! finally a digit we can use */
+                if (fract_digits > 0) {
+                        if (fract_digits >= MAX_DIGITS-1)
+                                /* ignore extra fractional digits */
+                                continue;
+                        fract_digits++;         /* for later scaling */
+                        fpart *= 10;
+                        fpart += i;
+                } else {                                /* normal digit */
+                        if (++ndigits >= MAX_DIGITS) {
+                                errno = ERANGE;
+                                return -1;
+                        }
+                        whole *= 10;
+                        whole += i;
+                }
+        }
+
+        if (sign) {
+                whole *= sign;
+                fpart *= sign;
+        }
+
+        /* If no scale factor given, we're done. fraction is discarded. */
+        if (!*p) {
+                *result = whole;
+                return 0;
+        }
+
+        /* Validate scale factor, and scale whole and fraction by it. */
+        for (i = 0; i < SCALE_LENGTH; i++) {
+
+                /** Are we there yet? */
+                if (*p == scale_chars[i] ||
+                        *p == tolower(scale_chars[i])) {
+
+                        /* If it ends with alphanumerics after the scale char, bad. */
+                        if (isalnum(*(p+1))) {
+                                errno = EINVAL;
+                                return -1;
+                        }
+                        scale_fact = scale_factors[i];
+
+                        /* scale whole part */
+                        whole *= scale_fact;
+
+                        /* truncate fpart so it does't overflow.
+                         * then scale fractional part.
+                         */
+                        while (fpart >= LLONG_MAX / scale_fact) {
+                                fpart /= 10;
+                                fract_digits--;
+                        }
+                        fpart *= scale_fact;
+                        if (fract_digits > 0) {
+                                for (i = 0; i < fract_digits -1; i++)
+                                        fpart /= 10;
+                        }
+                        whole += fpart;
+                        *result = whole;
+                        return 0;
+                }
+        }
+        errno = ERANGE;
+        return -1;
+}
+
+/* Format the given "number" into human-readable form in "result".
+ * Result must point to an allocated buffer of length FMT_SCALED_STRSIZE.
+ * Return 0 on success, -1 and errno set if error.
+ */
+int
+fmt_scaled(long long number, char *result)
+{
+        long long abval, fract = 0;
+        unsigned int i;
+        unit_type unit = NONE;
+
+        abval = (number < 0LL) ? -number : number;      /* no long long_abs yet */
+
+        /* Not every negative long long has a positive representation.
+         * Also check for numbers that are just too darned big to format
+         */
+        if (abval < 0 || abval / 1024 >= scale_factors[SCALE_LENGTH-1]) {
+                errno = ERANGE;
+                return -1;
+        }
+
+        /* scale whole part; get unscaled fraction */
+        for (i = 0; i < SCALE_LENGTH; i++) {
+                if (abval/1024 < scale_factors[i]) {
+                        unit = units[i];
+                        fract = (i == 0) ? 0 : abval % scale_factors[i];
+                        number /= scale_factors[i];
+                        if (i > 0)
+                                fract /= scale_factors[i - 1];
+                        break;
+                }
+        }
+
+        fract = (10 * fract + 512) / 1024;
+        /* if the result would be >= 10, round main number */
+        if (fract == 10) {
+                if (number >= 0)
+                        number++;
+                else
+                        number--;
+                fract = 0;
+        }
+
+        if (number == 0)
+                strlcpy(result, "0B", FMT_SCALED_STRSIZE);
+        else if (unit == NONE || number >= 100 || number <= -100) {
+                if (fract >= 5) {
+                        if (number >= 0)
+                                number++;
+                        else
+                                number--;
+                }
+                (void)snprintf(result, FMT_SCALED_STRSIZE, "%lld%c",
+                        number, scale_chars[unit]);
+        } else
+                (void)snprintf(result, FMT_SCALED_STRSIZE, "%lld.%1lld%c",
+                        number, fract, scale_chars[unit]);
+
+        return 0;
+}
+
+#ifdef  MAIN
+/*
+ * This is the original version of the program in the man page.
+ * Copy-and-paste whatever you need from it.
+ */
+int
+main(int argc, char **argv)
+{
+        char *cinput = "1.5K", buf[FMT_SCALED_STRSIZE];
+        long long ninput = 10483892, result;
+
+        if (scan_scaled(cinput, &result) == 0)
+                printf("\"%s\" -> %lld\n", cinput, result);
+        else
+                perror(cinput);
+
+        if (fmt_scaled(ninput, buf) == 0)
+                printf("%lld -> \"%s\"\n", ninput, buf);
+        else
+                fprintf(stderr, "%lld invalid (%s)\n", ninput, strerror(errno));
+
+        return 0;
+}
+#endif
+
+#endif /* HAVE_FMT_SCALED */
diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
index 80af3f542..785b22569 100644
--- a/openbsd-compat/getrrsetbyname.c
+++ b/openbsd-compat/getrrsetbyname.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getrrsetbyname.c,v 1.10 2005/03/30 02:58:28 tedu Exp $ */
+/* $OpenBSD: getrrsetbyname.c,v 1.11 2007/10/11 18:36:41 jakob Exp $ */
 
 /*
  * Copyright (c) 2001 Jakob Schlyter. All rights reserved.
@@ -288,7 +288,7 @@ getrrsetbyname(const char *hostname, unsigned int rdclass,
         rrset->rri_nrdatas = count_dns_rr(response->answer, rrset->rri_rdclass,
             rrset->rri_rdtype);
         rrset->rri_nsigs = count_dns_rr(response->answer, rrset->rri_rdclass,
-            T_SIG);
+            T_RRSIG);
 
         /* allocate memory for answers */
         rrset->rri_rdatas = calloc(rrset->rri_nrdatas,
@@ -318,7 +318,7 @@ getrrsetbyname(const char *hostname, unsigned int rdclass,
                         rdata = &rrset->rri_rdatas[index_ans++];
 
                 if (rr->class == rrset->rri_rdclass &&
-                    rr->type  == T_SIG)
+                    rr->type  == T_RRSIG)
                         rdata = &rrset->rri_sigs[index_sig++];
 
                 if (rdata) {
diff --git a/openbsd-compat/getrrsetbyname.h b/openbsd-compat/getrrsetbyname.h
index 39995b63f..1283f5506 100644
--- a/openbsd-compat/getrrsetbyname.h
+++ b/openbsd-compat/getrrsetbyname.h
@@ -62,8 +62,8 @@
 #define HFIXEDSZ 12
 #endif
 
-#ifndef T_SIG
-#define T_SIG 24
+#ifndef T_RRSIG
+#define T_RRSIG 46
 #endif
 
 /*
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c
index b3dd2b171..74b506403 100644
--- a/openbsd-compat/glob.c
+++ b/openbsd-compat/glob.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: glob.c,v 1.25 2005/08/08 08:05:34 espie Exp $ */
+/*      $OpenBSD: glob.c,v 1.26 2005/11/28 17:50:12 deraadt Exp $ */
 /*
  * Copyright (c) 1989, 1993
  *      The Regents of the University of California.  All rights reserved.
@@ -48,7 +48,8 @@
 
 #if !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) || \
     !defined(GLOB_HAS_GL_MATCHC) || \
-    !defined(HAVE_DECL_GLOB_NOMATCH) || HAVE_DECL_GLOB_NOMATCH == 0
+    !defined(HAVE_DECL_GLOB_NOMATCH) || HAVE_DECL_GLOB_NOMATCH == 0 || \
+    defined(BROKEN_GLOB)
 
 static long
 get_arg_max(void)
@@ -149,7 +150,7 @@ static int	 glob0(const Char *, glob_t *);
 static int       glob1(Char *, Char *, glob_t *, size_t *);
 static int       glob2(Char *, Char *, Char *, Char *, Char *, Char *,
                     glob_t *, size_t *);
-static int       glob3(Char *, Char *, Char *, Char *, Char *, Char *,
+static int       glob3(Char *, Char *, Char *, Char *, Char *,
                     Char *, Char *, glob_t *, size_t *);
 static int       globextend(const Char *, glob_t *, size_t *);
 static const Char *
@@ -571,16 +572,16 @@ glob2(Char *pathbuf, Char *pathbuf_last, Char *pathend, Char *pathend_last,
                 } else
                         /* Need expansion, recurse. */
                         return(glob3(pathbuf, pathbuf_last, pathend,
-                            pathend_last, pattern, pattern_last,
-                            p, pattern_last, pglob, limitp));
+                            pathend_last, pattern, p, pattern_last,
+                            pglob, limitp));
         }
         /* NOTREACHED */
 }
 
 static int
 glob3(Char *pathbuf, Char *pathbuf_last, Char *pathend, Char *pathend_last,
-    Char *pattern, Char *pattern_last, Char *restpattern,
-    Char *restpattern_last, glob_t *pglob, size_t *limitp)
+    Char *pattern, Char *restpattern, Char *restpattern_last, glob_t *pglob,
+    size_t *limitp)
 {
         struct dirent *dp;
         DIR *dirp;
diff --git a/openbsd-compat/glob.h b/openbsd-compat/glob.h
index 9ba07f76e..a2b36f974 100644
--- a/openbsd-compat/glob.h
+++ b/openbsd-compat/glob.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: glob.h,v 1.9 2004/10/07 16:56:11 millert Exp $        */
+/*      $OpenBSD: glob.h,v 1.10 2005/12/13 00:35:22 millert Exp $       */
 /*      $NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $     */
 
 /*
@@ -39,7 +39,8 @@
 
 #if !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC) || \
     !defined(GLOB_HAS_GL_MATCHC) || \
-    !defined(HAVE_DECL_GLOB_NOMATCH) || HAVE_DECL_GLOB_NOMATCH == 0
+    !defined(HAVE_DECL_GLOB_NOMATCH) || HAVE_DECL_GLOB_NOMATCH == 0 || \
+    defined(BROKEN_GLOB)
 
 #ifndef _GLOB_H_
 #define _GLOB_H_
@@ -66,7 +67,6 @@ typedef struct {
         int (*gl_stat)(const char *, struct stat *);
 } glob_t;
 
-/* Flags */
 #define GLOB_APPEND     0x0001  /* Append to output from previous call. */
 #define GLOB_DOOFFS     0x0002  /* Use gl_offs. */
 #define GLOB_ERR        0x0004  /* Return on error. */
@@ -75,6 +75,13 @@ typedef struct {
 #define GLOB_NOSORT     0x0020  /* Don't sort. */
 #define GLOB_NOESCAPE   0x1000  /* Disable backslash escaping. */
 
+/* Error values returned by glob(3) */
+#define GLOB_NOSPACE    (-1)    /* Malloc call failed. */
+#define GLOB_ABORTED    (-2)    /* Unignored error. */
+#define GLOB_NOMATCH    (-3)    /* No match and GLOB_NOCHECK not set. */
+#define GLOB_NOSYS      (-4)    /* Function not supported. */
+#define GLOB_ABEND      GLOB_ABORTED
+
 #define GLOB_ALTDIRFUNC 0x0040  /* Use alternately specified directory funcs. */
 #define GLOB_BRACE      0x0080  /* Expand braces ala csh. */
 #define GLOB_MAGCHAR    0x0100  /* Pattern had globbing characters. */
@@ -83,13 +90,6 @@ typedef struct {
 #define GLOB_TILDE      0x0800  /* Expand tilde names from the passwd file. */
 #define GLOB_LIMIT      0x2000  /* Limit pattern match output to ARG_MAX */
 
-/* Error values returned by glob(3) */
-#define GLOB_NOSPACE    (-1)    /* Malloc call failed. */
-#define GLOB_ABORTED    (-2)    /* Unignored error. */
-#define GLOB_NOMATCH    (-3)    /* No match and GLOB_NOCHECK not set. */
-#define GLOB_NOSYS      (-4)    /* Function not supported. */
-#define GLOB_ABEND      GLOB_ABORTED
-
 int     glob(const char *, int, int (*)(const char *, int), glob_t *);
 void    globfree(glob_t *);
 
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index 6406af19d..50c6d990b 100644
--- a/openbsd-compat/openbsd-compat.h
+++ b/openbsd-compat/openbsd-compat.h
@@ -1,4 +1,4 @@
-/* $Id: openbsd-compat.h,v 1.43 2007/06/25 12:15:13 dtucker Exp $ */
+/* $Id: openbsd-compat.h,v 1.46 2008/06/08 17:32:29 dtucker Exp $ */
 
 /*
  * Copyright (c) 1999-2003 Damien Miller.  All rights reserved.
@@ -101,6 +101,11 @@ int daemon(int nochdir, int noclose);
 char *dirname(const char *path);
 #endif
 
+#ifndef HAVE_FMT_SCALED
+#define FMT_SCALED_STRSIZE      7
+int     fmt_scaled(long long number, char *result);
+#endif
+
 #if defined(BROKEN_INET_NTOA) || !defined(HAVE_INET_NTOA)
 char *inet_ntoa(struct in_addr in);
 #endif
@@ -139,6 +144,7 @@ int writev(int, struct iovec *, int);
 
 /* Home grown routines */
 #include "bsd-misc.h"
+#include "bsd-statvfs.h"
 #include "bsd-waitpid.h"
 #include "bsd-poll.h"
 
@@ -151,6 +157,14 @@ unsigned int arc4random(void);
 void arc4random_stir(void);
 #endif /* !HAVE_ARC4RANDOM */
 
+#ifndef HAVE_ARC4RANDOM_BUF
+void arc4random_buf(void *, size_t);
+#endif
+
+#ifndef HAVE_ARC4RANDOM_UNIFORM
+u_int32_t arc4random_uniform(u_int32_t);
+#endif
+
 #ifndef HAVE_ASPRINTF
 int asprintf(char **, const char *, ...);
 #endif 
diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c
index 45ebd3f66..49238ba80 100644
--- a/openbsd-compat/openssl-compat.c
+++ b/openbsd-compat/openssl-compat.c
@@ -1,4 +1,4 @@
-/* $Id: openssl-compat.c,v 1.4 2006/02/22 11:24:47 dtucker Exp $ */
+/* $Id: openssl-compat.c,v 1.6 2008/02/28 08:13:52 dtucker Exp $ */
 
 /*
  * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au>
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h
index f1d2f19fc..6a1bed5b2 100644
--- a/openbsd-compat/openssl-compat.h
+++ b/openbsd-compat/openssl-compat.h
@@ -1,4 +1,4 @@
-/* $Id: openssl-compat.h,v 1.10 2007/06/14 13:47:31 dtucker Exp $ */
+/* $Id: openssl-compat.h,v 1.12 2008/02/28 08:22:04 dtucker Exp $ */
 
 /*
  * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au>
@@ -19,6 +19,11 @@
 #include "includes.h"
 #include <openssl/evp.h>
 
+/* OPENSSL_free() is Free() in versions before OpenSSL 0.9.6 */
+#if !defined(OPENSSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x0090600f)
+# define OPENSSL_free(x) Free(x)
+#endif
+
 #if OPENSSL_VERSION_NUMBER < 0x00906000L
 # define SSH_OLD_EVP
 # define EVP_CIPHER_CTX_get_app_data(e)         ((e)->app_data)
@@ -79,8 +84,8 @@ extern const EVP_CIPHER *evp_acss(void);
 #  ifdef SSLeay_add_all_algorithms
 #   undef SSLeay_add_all_algorithms
 #  endif
-#  define SSLeay_add_all_algorithms()   ssh_SSLeay_add_all_algorithms()
-#endif
+#  define SSLeay_add_all_algorithms()  ssh_SSLeay_add_all_algorithms()
+# endif
 
 int ssh_EVP_CipherInit(EVP_CIPHER_CTX *, const EVP_CIPHER *, unsigned char *,
     unsigned char *, int);
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index 94faec670..5b1cb7387 100644
--- a/openbsd-compat/port-aix.c
+++ b/openbsd-compat/port-aix.c
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2001 Gert Doering.  All rights reserved.
- * Copyright (c) 2003,2004,2005 Darren Tucker.  All rights reserved.
+ * Copyright (c) 2003,2004,2005,2006 Darren Tucker.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -394,4 +394,47 @@ sshaix_getnameinfo(const struct sockaddr *sa, size_t salen, char *host,
 }
 # endif /* AIX_GETNAMEINFO_HACK */
 
+# if defined(USE_GETGRSET)
+#  include <stdlib.h>
+int
+getgrouplist(const char *user, gid_t pgid, gid_t *groups, int *grpcnt)
+{
+        char *cp, *grplist, *grp;
+        gid_t gid;
+        int ret = 0, ngroups = 0, maxgroups;
+        long l;
+
+        maxgroups = *grpcnt;
+
+        if ((cp = grplist = getgrset(user)) == NULL)
+                return -1;
+
+        /* handle zero-length case */
+        if (maxgroups <= 0) {
+                *grpcnt = 0;
+                return -1;
+        }
+
+        /* copy primary group */
+        groups[ngroups++] = pgid;
+
+        /* copy each entry from getgrset into group list */
+        while ((grp = strsep(&grplist, ",")) != NULL) {
+                l = strtol(grp, NULL, 10);
+                if (ngroups >= maxgroups || l == LONG_MIN || l == LONG_MAX) {
+                        ret = -1;
+                        goto out;
+                }
+                gid = (gid_t)l;
+                if (gid == pgid)
+                        continue;       /* we have already added primary gid */
+                groups[ngroups++] = gid;
+        }
+out:
+        free(cp);
+        *grpcnt = ngroups;
+        return ret;
+}
+# endif /* USE_GETGRSET */
+
 #endif /* _AIX */
diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h
index 5a04bedad..ecb9feae8 100644
--- a/openbsd-compat/port-aix.h
+++ b/openbsd-compat/port-aix.h
@@ -1,9 +1,9 @@
-/* $Id: port-aix.h,v 1.27 2006/09/18 13:54:33 dtucker Exp $ */
+/* $Id: port-aix.h,v 1.29 2008/03/09 05:36:55 dtucker Exp $ */
 
 /*
  *
  * Copyright (c) 2001 Gert Doering.  All rights reserved.
- * Copyright (c) 2004, 2005 Darren Tucker.  All rights reserved.
+ * Copyright (c) 2004,2005,2006 Darren Tucker.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -103,4 +103,14 @@ int sshaix_getnameinfo(const struct sockaddr *, size_t, char *, size_t,
 # define getnameinfo(a,b,c,d,e,f,g) (sshaix_getnameinfo(a,b,c,d,e,f,g))
 #endif
 
+/*
+ * We use getgrset in preference to multiple getgrent calls for efficiency
+ * plus it supports NIS and LDAP groups.
+ */
+#if !defined(HAVE_GETGROUPLIST) && defined(HAVE_GETGRSET)
+# define HAVE_GETGROUPLIST
+# define USE_GETGRSET
+int getgrouplist(const char *, gid_t, gid_t *, int *);
+#endif
+
 #endif /* _AIX */
diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c
index a9aa773ef..bc4924727 100644
--- a/openbsd-compat/port-linux.c
+++ b/openbsd-compat/port-linux.c
@@ -1,4 +1,4 @@
-/* $Id: port-linux.c,v 1.4 2007/06/27 22:48:03 djm Exp $ */
+/* $Id: port-linux.c,v 1.5 2008/03/26 20:27:21 dtucker Exp $ */
 
 /*
  * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com>
@@ -52,7 +52,7 @@
 extern Authctxt *the_authctxt;
 
 /* Wrapper around is_selinux_enabled() to log its return value once only */
-static int
+int
 ssh_selinux_enabled(void)
 {
         static int enabled = -1;
diff --git a/openbsd-compat/port-linux.h b/openbsd-compat/port-linux.h
index cb8a253c4..2a3271a93 100644
--- a/openbsd-compat/port-linux.h
+++ b/openbsd-compat/port-linux.h
@@ -1,4 +1,4 @@
-/* $Id: port-linux.h,v 1.1 2006/04/22 11:26:08 djm Exp $ */
+/* $Id: port-linux.h,v 1.2 2008/03/26 20:27:21 dtucker Exp $ */
 
 /*
  * Copyright (c) 2006 Damien Miller <djm@openbsd.org>
@@ -20,6 +20,7 @@
 #define _PORT_LINUX_H
 
 #ifdef WITH_SELINUX
+int ssh_selinux_enabled(void);
 void ssh_selinux_setup_pty(char *, const char *);
 void ssh_selinux_setup_exec_context(char *);
 #endif
diff --git a/openbsd-compat/port-tun.c b/openbsd-compat/port-tun.c
index 276474db8..ddc92d0f3 100644
--- a/openbsd-compat/port-tun.c
+++ b/openbsd-compat/port-tun.c
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "openbsd-compat/sys-queue.h"
 #include "log.h"
 #include "misc.h"
 #include "buffer.h"
diff --git a/openbsd-compat/regress/closefromtest.c b/openbsd-compat/regress/closefromtest.c
index bb129fa16..145b09d7b 100644
--- a/openbsd-compat/regress/closefromtest.c
+++ b/openbsd-compat/regress/closefromtest.c
@@ -57,4 +57,5 @@ main(void)
         for (i = 0; i < NUM_OPENS; i++)
                 if (close(fds[i]) != -1)
                         fail("failed to close from lowest fd");
+        return 0;
 }
diff --git a/openbsd-compat/regress/strtonumtest.c b/openbsd-compat/regress/strtonumtest.c
index cb8585129..50ca5bd22 100644
--- a/openbsd-compat/regress/strtonumtest.c
+++ b/openbsd-compat/regress/strtonumtest.c
@@ -21,6 +21,20 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+/* LLONG_MAX is known as LONGLONG_MAX on AIX */
+#if defined(LONGLONG_MAX) && !defined(LLONG_MAX)
+# define LLONG_MAX LONGLONG_MAX
+# define LLONG_MIN LONGLONG_MIN
+#endif
+
+/* LLONG_MAX is known as LONG_LONG_MAX on HP-UX */
+#if defined(LONG_LONG_MAX) && !defined(LLONG_MAX)
+# define LLONG_MAX LONG_LONG_MAX
+# define LLONG_MIN LONG_LONG_MIN
+#endif
+
+long long strtonum(const char *, long long, long long, const char **);
+
 int fail;
 
 void
diff --git a/openbsd-compat/rresvport.c b/openbsd-compat/rresvport.c
index 5b0275ce0..1cd61e58d 100644
--- a/openbsd-compat/rresvport.c
+++ b/openbsd-compat/rresvport.c
@@ -44,6 +44,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #if 0
 int
diff --git a/openbsd-compat/setenv.c b/openbsd-compat/setenv.c
index b52a99c2c..e2a8b6dd3 100644
--- a/openbsd-compat/setenv.c
+++ b/openbsd-compat/setenv.c
@@ -47,7 +47,7 @@ extern char **environ;
  *      Explicitly removes '=' in argument name.
  */
 static char *
-__findenv(const char *name, int *offset)
+__findenv(const char *name, size_t *offset)
 {
         extern char **environ;
         int len, i;
@@ -82,7 +82,7 @@ setenv(const char *name, const char *value, int rewrite)
 {
         static char **lastenv;                  /* last value of environ */
         char *C;
-        int l_value, offset;
+        size_t l_value, offset;
 
         if (*value == '=')                      /* no `=' in value */
                 ++value;
@@ -133,7 +133,7 @@ void
 unsetenv(const char *name)
 {
         char **P;
-        int offset;
+        size_t offset;
 
         while (__findenv(name, &offset))        /* if set multiple times */
                 for (P = &environ[offset];; ++P)
diff --git a/openbsd-compat/setproctitle.c b/openbsd-compat/setproctitle.c
index b511f6649..2965f689e 100644
--- a/openbsd-compat/setproctitle.c
+++ b/openbsd-compat/setproctitle.c
@@ -43,6 +43,8 @@
 #endif
 #include <string.h>
 
+#include <vis.h>
+
 #define SPT_NONE        0       /* don't use it at all */
 #define SPT_PSTAT       1       /* use pstat(PSTAT_SETCMD, ...) */
 #define SPT_REUSEARGV   2       /* cover argv with title information */
@@ -121,7 +123,7 @@ setproctitle(const char *fmt, ...)
 {
 #if SPT_TYPE != SPT_NONE
         va_list ap;
-        char buf[1024];
+        char buf[1024], ptitle[1024];
         size_t len;
         extern char *__progname;
 #if SPT_TYPE == SPT_PSTAT
@@ -142,14 +144,16 @@ setproctitle(const char *fmt, ...)
                         vsnprintf(buf + len, sizeof(buf) - len , fmt, ap);
         }
         va_end(ap);
+        strnvis(ptitle, buf, sizeof(ptitle),
+            VIS_CSTYLE|VIS_NL|VIS_TAB|VIS_OCTAL);
 
 #if SPT_TYPE == SPT_PSTAT
-        pst.pst_command = buf;
-        pstat(PSTAT_SETCMD, pst, strlen(buf), 0, 0);
+        pst.pst_command = ptitle;
+        pstat(PSTAT_SETCMD, pst, strlen(ptitle), 0, 0);
 #elif SPT_TYPE == SPT_REUSEARGV
 /*      debug("setproctitle: copy \"%s\" into len %d", 
             buf, argv_env_len); */
-        len = strlcpy(argv_start, buf, argv_env_len);
+        len = strlcpy(argv_start, ptitle, argv_env_len);
         for(; len < argv_env_len; len++)
                 argv_start[len] = SPT_PADCHAR;
 #endif
diff --git a/openbsd-compat/sigact.c b/openbsd-compat/sigact.c
index 8b8e4dd2c..d67845cf1 100644
--- a/openbsd-compat/sigact.c
+++ b/openbsd-compat/sigact.c
@@ -36,6 +36,7 @@
 /* OPENBSD ORIGINAL: lib/libcurses/base/sigaction.c */
 
 #include "includes.h"
+#include <errno.h>
 #include <signal.h>
 #include "sigact.h"
 
@@ -47,28 +48,39 @@
 int
 sigaction(int sig, struct sigaction *sigact, struct sigaction *osigact)
 {
-        return sigvec(sig, &(sigact->sv), &(osigact->sv));
+        return sigvec(sig, sigact ? &sigact->sv : NULL,
+            osigact ? &osigact->sv : NULL);
 }
 
 int
-sigemptyset (sigset_t * mask)
+sigemptyset (sigset_t *mask)
 {
+        if (!mask) {
+                errno = EINVAL;
+                return -1;
+        }
         *mask = 0;
         return 0;
 }
 
 int
-sigprocmask (int mode, sigset_t * mask, sigset_t * omask)
+sigprocmask (int mode, sigset_t *mask, sigset_t *omask)
 {
         sigset_t current = sigsetmask(0);
 
-        if (omask) *omask = current;
+        if (!mask) {
+                errno = EINVAL;
+                return -1;
+        }
 
-        if (mode==SIG_BLOCK)
+        if (omask)
+                *omask = current;
+
+        if (mode == SIG_BLOCK)
                 current |= *mask;
-        else if (mode==SIG_UNBLOCK)
+        else if (mode == SIG_UNBLOCK)
                 current &= ~*mask;
-        else if (mode==SIG_SETMASK)
+        else if (mode == SIG_SETMASK)
         current = *mask;
 
         sigsetmask(current);
@@ -76,28 +88,44 @@ sigprocmask (int mode, sigset_t * mask, sigset_t * omask)
 }
 
 int
-sigsuspend (sigset_t * mask)
+sigsuspend (sigset_t *mask)
 {
+        if (!mask) {
+                errno = EINVAL;
+                return -1;
+        }
         return sigpause(*mask);
 }
 
 int
-sigdelset (sigset_t * mask, int sig)
+sigdelset (sigset_t *mask, int sig)
 {
+        if (!mask) {
+                errno = EINVAL;
+                return -1;
+        }
         *mask &= ~sigmask(sig);
         return 0;
 }
 
 int
-sigaddset (sigset_t * mask, int sig)
+sigaddset (sigset_t *mask, int sig)
 {
+        if (!mask) {
+                errno = EINVAL;
+                return -1;
+        }
         *mask |= sigmask(sig);
         return 0;
 }
 
 int
-sigismember (sigset_t * mask, int sig)
+sigismember (sigset_t *mask, int sig)
 {
+        if (!mask) {
+                errno = EINVAL;
+                return -1;
+        }
         return (*mask & sigmask(sig)) != 0;
 }
 
diff --git a/openbsd-compat/sys-queue.h b/openbsd-compat/sys-queue.h
index 402343324..5cf0587bd 100644
--- a/openbsd-compat/sys-queue.h
+++ b/openbsd-compat/sys-queue.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: queue.h,v 1.25 2004/04/08 16:08:21 henning Exp $      */
+/*      $OpenBSD: queue.h,v 1.32 2007/04/30 18:42:34 pedro Exp $        */
 /*      $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $       */
 
 /*
@@ -167,6 +167,12 @@
  * For details on the use of these macros, see the queue(3) manual page.
  */
 
+#if defined(QUEUE_MACRO_DEBUG) || (defined(_KERNEL) && defined(DIAGNOSTIC))
+#define _Q_INVALIDATE(a) (a) = ((void *)-1)
+#else
+#define _Q_INVALIDATE(a)
+#endif
+
 /*
  * Singly-linked List definitions.
  */
@@ -229,13 +235,14 @@ struct {								\
 #define SLIST_REMOVE(head, elm, type, field) do {                       \
         if ((head)->slh_first == (elm)) {                               \
                 SLIST_REMOVE_HEAD((head), field);                       \
-        }                                                               \
-        else {                                                          \
+        } else {                                                        \
                 struct type *curelm = (head)->slh_first;                \
-                while( curelm->field.sle_next != (elm) )                \
+                                                                        \
+                while (curelm->field.sle_next != (elm))                 \
                         curelm = curelm->field.sle_next;                \
                 curelm->field.sle_next =                                \
                     curelm->field.sle_next->field.sle_next;             \
+                _Q_INVALIDATE((elm)->field.sle_next);                   \
         }                                                               \
 } while (0)
 
@@ -303,6 +310,8 @@ struct {								\
                 (elm)->field.le_next->field.le_prev =                   \
                     (elm)->field.le_prev;                               \
         *(elm)->field.le_prev = (elm)->field.le_next;                   \
+        _Q_INVALIDATE((elm)->field.le_prev);                            \
+        _Q_INVALIDATE((elm)->field.le_next);                            \
 } while (0)
 
 #define LIST_REPLACE(elm, elm2, field) do {                             \
@@ -311,6 +320,8 @@ struct {								\
                     &(elm2)->field.le_next;                             \
         (elm2)->field.le_prev = (elm)->field.le_prev;                   \
         *(elm2)->field.le_prev = (elm2);                                \
+        _Q_INVALIDATE((elm)->field.le_prev);                            \
+        _Q_INVALIDATE((elm)->field.le_next);                            \
 } while (0)
 
 /*
@@ -369,8 +380,8 @@ struct {								\
         (listelm)->field.sqe_next = (elm);                              \
 } while (0)
 
-#define SIMPLEQ_REMOVE_HEAD(head, elm, field) do {                      \
-        if (((head)->sqh_first = (elm)->field.sqe_next) == NULL)        \
+#define SIMPLEQ_REMOVE_HEAD(head, field) do {                   \
+        if (((head)->sqh_first = (head)->sqh_first->field.sqe_next) == NULL) \
                 (head)->sqh_last = &(head)->sqh_first;                  \
 } while (0)
 
@@ -465,6 +476,8 @@ struct {								\
         else                                                            \
                 (head)->tqh_last = (elm)->field.tqe_prev;               \
         *(elm)->field.tqe_prev = (elm)->field.tqe_next;                 \
+        _Q_INVALIDATE((elm)->field.tqe_prev);                           \
+        _Q_INVALIDATE((elm)->field.tqe_next);                           \
 } while (0)
 
 #define TAILQ_REPLACE(head, elm, elm2, field) do {                      \
@@ -475,6 +488,8 @@ struct {								\
                 (head)->tqh_last = &(elm2)->field.tqe_next;             \
         (elm2)->field.tqe_prev = (elm)->field.tqe_prev;                 \
         *(elm2)->field.tqe_prev = (elm2);                               \
+        _Q_INVALIDATE((elm)->field.tqe_prev);                           \
+        _Q_INVALIDATE((elm)->field.tqe_next);                           \
 } while (0)
 
 /*
@@ -575,6 +590,8 @@ struct {								\
         else                                                            \
                 (elm)->field.cqe_prev->field.cqe_next =                 \
                     (elm)->field.cqe_next;                              \
+        _Q_INVALIDATE((elm)->field.cqe_prev);                           \
+        _Q_INVALIDATE((elm)->field.cqe_next);                           \
 } while (0)
 
 #define CIRCLEQ_REPLACE(head, elm, elm2, field) do {                    \
@@ -588,6 +605,8 @@ struct {								\
                 (head).cqh_first = (elm2);                              \
         else                                                            \
                 (elm2)->field.cqe_prev->field.cqe_next = (elm2);        \
+        _Q_INVALIDATE((elm)->field.cqe_prev);                           \
+        _Q_INVALIDATE((elm)->field.cqe_next);                           \
 } while (0)
 
 #endif  /* !_FAKE_QUEUE_H_ */
diff --git a/openbsd-compat/sys-tree.h b/openbsd-compat/sys-tree.h
index c80b90b21..d4949b5e7 100644
--- a/openbsd-compat/sys-tree.h
+++ b/openbsd-compat/sys-tree.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $    */
+/*      $OpenBSD: tree.h,v 1.10 2007/10/29 23:49:41 djm Exp $   */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * All rights reserved.
@@ -289,7 +289,7 @@ void name##_SPLAY_MINMAX(struct name *head, int __comp) \
              (x) != NULL;                                               \
              (x) = SPLAY_NEXT(name, head, x))
 
-/* Macros that define a red-back tree */
+/* Macros that define a red-black tree */
 #define RB_HEAD(name, type)                                             \
 struct name {                                                           \
         struct type *rbh_root; /* root of the tree */                   \
@@ -381,9 +381,9 @@ void name##_RB_REMOVE_COLOR(struct name *, struct type *, struct type *);\
 struct type *name##_RB_REMOVE(struct name *, struct type *);            \
 struct type *name##_RB_INSERT(struct name *, struct type *);            \
 struct type *name##_RB_FIND(struct name *, struct type *);              \
-struct type *name##_RB_NEXT(struct name *, struct type *);              \
-struct type *name##_RB_MINMAX(struct name *, int);                      \
-                                                                        \
+struct type *name##_RB_NEXT(struct type *);                             \
+struct type *name##_RB_MINMAX(struct name *, int);                      
+
 
 /* Main rb operation.
  * Moves node close to the key of elm to top
@@ -626,7 +626,7 @@ name##_RB_FIND(struct name *head, struct type *elm)			\
 }                                                                       \
                                                                         \
 struct type *                                                           \
-name##_RB_NEXT(struct name *head, struct type *elm)                     \
+name##_RB_NEXT(struct type *elm)                                        \
 {                                                                       \
         if (RB_RIGHT(elm, field)) {                                     \
                 elm = RB_RIGHT(elm, field);                             \
@@ -667,13 +667,13 @@ name##_RB_MINMAX(struct name *head, int val)				\
 #define RB_INSERT(name, x, y)   name##_RB_INSERT(x, y)
 #define RB_REMOVE(name, x, y)   name##_RB_REMOVE(x, y)
 #define RB_FIND(name, x, y)     name##_RB_FIND(x, y)
-#define RB_NEXT(name, x, y)     name##_RB_NEXT(x, y)
+#define RB_NEXT(name, x, y)     name##_RB_NEXT(y)
 #define RB_MIN(name, x)         name##_RB_MINMAX(x, RB_NEGINF)
 #define RB_MAX(name, x)         name##_RB_MINMAX(x, RB_INF)
 
 #define RB_FOREACH(x, name, head)                                       \
         for ((x) = RB_MIN(name, head);                                  \
              (x) != NULL;                                               \
-             (x) = name##_RB_NEXT(head, x))
+             (x) = name##_RB_NEXT(x))
 
 #endif  /* _SYS_TREE_H_ */