Shim <sys/queue.h> and <sys/tree.h>.

This significantly reduces the diff vs upstream making future syncs
less painful.  ok djm@

auth-options.c

@@ -18,6 +18,7 @@
 #include "includes.h"
 
 #include <sys/types.h>
+#include <sys/queue.h>
 
 #include <stdlib.h>
 #include <netdb.h>
@@ -29,8 +30,6 @@
 #include <ctype.h>
 #include <limits.h>
 
-#include "openbsd-compat/sys-queue.h"
-
 #include "xmalloc.h"
 #include "ssherr.h"
 #include "log.h"

channels.c

@@ -47,6 +47,7 @@
 #include <sys/un.h>
 #include <sys/socket.h>
 #include <sys/time.h>
+#include <sys/queue.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -64,7 +65,6 @@
 #include <termios.h>
 #include <unistd.h>
 
-#include "openbsd-compat/sys-queue.h"
 #include "xmalloc.h"
 #include "ssh.h"
 #include "ssh2.h"

clientloop.c

@@ -66,6 +66,7 @@
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/time.h>
+#include <sys/queue.h>
 
 #include <ctype.h>
 #include <errno.h>
@@ -81,7 +82,6 @@
 #include <unistd.h>
 #include <limits.h>
 
-#include "openbsd-compat/sys-queue.h"
 #include "xmalloc.h"
 #include "ssh.h"
 #include "ssh2.h"

configure.ac

@@ -553,6 +553,22 @@ AC_CHECK_HEADERS([ \
 	esac >"$header"
 ])
 
+dnl Now create replacement headers for those that we always want to shim.
+for include in sys/queue.h sys/tree.h; do
+	COMPATINCLUDES="openbsd-compat/include"
+	header="$COMPATINCLUDES/$include"
+	dir=`dirname "$header"`
+	mkdir -p "$dir"
+	case "$include" in
+	sys/queue.h)
+		echo '#include "openbsd-compat/sys-queue.h"'
+		;;
+	sys/tree.h)
+		echo '#include "openbsd-compat/sys-tree.h"'
+		;;
+	esac >"$header"
+done
+
 AC_CHECK_DECLS([le32toh, le64toh, htole64], [], [], [
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>

gss-serv.c

@@ -37,7 +37,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "openbsd-compat/sys-queue.h"
 #include "xmalloc.h"
 #include "sshkey.h"
 #include "hostfile.h"

krl.c

@@ -18,8 +18,8 @@
 #include "includes.h"
 
 #include <sys/types.h>
-#include <openbsd-compat/sys-tree.h>
-#include <openbsd-compat/sys-queue.h>
+#include <sys/tree.h>
+#include <sys/queue.h>
 
 #include <errno.h>
 #include <fcntl.h>

monitor.c

@@ -28,8 +28,10 @@
 #include "includes.h"
 
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <sys/wait.h>
+#include <sys/socket.h>
+#include <sys/tree.h>
+#include <sys/queue.h>
 
 #include <errno.h>
 #include <fcntl.h>
@@ -49,8 +51,6 @@
 #include <openssl/dh.h>
 #endif
 
-#include "openbsd-compat/sys-tree.h"
-#include "openbsd-compat/sys-queue.h"
 #include "openbsd-compat/openssl-compat.h"
 
 #include "atomicio.h"

monitor_wrap.c

@@ -29,6 +29,7 @@
 
 #include <sys/types.h>
 #include <sys/uio.h>
+#include <sys/queue.h>
 #include <sys/wait.h>
 
 #include <errno.h>
@@ -45,7 +46,6 @@
 #include <openssl/evp.h>
 #endif
 
-#include "openbsd-compat/sys-queue.h"
 #include "xmalloc.h"
 #include "ssh.h"
 #ifdef WITH_OPENSSL

mux.c

@@ -20,6 +20,7 @@
 #include "includes.h"
 
 #include <sys/types.h>
+#include <sys/queue.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -38,8 +39,6 @@
 #include <util.h>
 #include <paths.h>
 
-#include "openbsd-compat/sys-queue.h"
-
 #include "atomicio.h"
 #include "xmalloc.h"
 #include "log.h"

nchan.c

@@ -27,12 +27,12 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/queue.h>
 
 #include <errno.h>
 #include <string.h>
 #include <stdarg.h>
 
-#include "openbsd-compat/sys-queue.h"
 #include "ssh2.h"
 #include "sshbuf.h"
 #include "ssherr.h"

packet.c

@@ -40,7 +40,7 @@
 #include "includes.h"
 
 #include <sys/types.h>
-#include "openbsd-compat/sys-queue.h"
+#include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 

packet.h

@@ -16,6 +16,9 @@
 #ifndef PACKET_H
 #define PACKET_H
 
+#include <sys/queue.h>
+
+#include <signal.h>
 #include <termios.h>
 
 #ifdef WITH_OPENSSL
@@ -36,9 +39,6 @@
 # define EVP_PKEY	void
 #endif /* WITH_OPENSSL */
 
-#include <signal.h>
-#include "openbsd-compat/sys-queue.h"
-
 struct kex;
 struct sshkey;
 struct sshbuf;

servconf.c

@@ -14,6 +14,7 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/queue.h>
 #include <sys/stat.h>
 #ifdef __OpenBSD__
 #include <sys/sysctl.h>
@@ -39,7 +40,6 @@
 #include <errno.h>
 #include <util.h>
 
-#include "openbsd-compat/sys-queue.h"
 #include "xmalloc.h"
 #include "ssh.h"
 #include "log.h"

servconf.h

@@ -16,7 +16,7 @@
 #ifndef SERVCONF_H
 #define SERVCONF_H
 
-#include <openbsd-compat/sys-queue.h>
+#include <sys/queue.h>
 
 #define MAX_PORTS		256	/* Max # ports. */
 

serverloop.c

@@ -41,6 +41,7 @@
 #include <sys/wait.h>
 #include <sys/socket.h>
 #include <sys/time.h>
+#include <sys/queue.h>
 
 #include <netinet/in.h>
 
@@ -55,7 +56,6 @@
 #include <unistd.h>
 #include <stdarg.h>
 
-#include "openbsd-compat/sys-queue.h"
 #include "xmalloc.h"
 #include "packet.h"
 #include "sshbuf.h"

session.c

@@ -36,10 +36,11 @@
 #include "includes.h"
 
 #include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/un.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/wait.h>
+#include <sys/queue.h>
 
 #include <arpa/inet.h>
 
@@ -58,7 +59,6 @@
 #include <unistd.h>
 #include <limits.h>
 
-#include "openbsd-compat/sys-queue.h"
 #include "xmalloc.h"
 #include "ssh.h"
 #include "ssh2.h"

sftp-client.c

@@ -23,10 +23,10 @@
 #include "includes.h"
 
 #include <sys/types.h>
+#include <sys/queue.h>
 #ifdef HAVE_SYS_STATVFS_H
 #include <sys/statvfs.h>
 #endif
-#include "openbsd-compat/sys-queue.h"
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/uio.h>

sftp-usergroup.c

@@ -19,7 +19,7 @@
 #include "includes.h"
 
 #include <sys/types.h>
-#include <openbsd-compat/sys-tree.h>
+#include <sys/tree.h>
 
 #include <glob.h>
 #include <stdlib.h>

srclimit.c

@@ -19,7 +19,7 @@
 
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <openbsd-compat/sys-tree.h>
+#include <sys/tree.h>
 
 #include <limits.h>
 #include <netdb.h>

ssh-agent.c

@@ -37,13 +37,14 @@
 #include "includes.h"
 
 #include <sys/types.h>
+#include <sys/time.h>
+#include <sys/queue.h>
 #include <sys/resource.h>
+#include <sys/socket.h>
 #include <sys/stat.h>
+#include <sys/un.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
-#include <sys/time.h>
-#include <sys/un.h>
-#include "openbsd-compat/sys-queue.h"
 
 #ifdef WITH_OPENSSL
 #include <openssl/evp.h>

ssh-keyscan.c

@@ -10,9 +10,10 @@
 #include "includes.h"
  
 #include <sys/types.h>
-#include "openbsd-compat/sys-queue.h"
-#include <sys/resource.h>
+#include <sys/socket.h>
+#include <sys/queue.h>
 #include <sys/time.h>
+#include <sys/resource.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>

ssh-pkcs11.c

@@ -23,6 +23,7 @@
 #include <sys/time.h>
 
 #include <sys/types.h>
+#include <sys/queue.h>
 #include <stdarg.h>
 #include <stdio.h>
 
@@ -30,9 +31,6 @@
 #include <string.h>
 #include <dlfcn.h>
 
-#include "openbsd-compat/sys-queue.h"
-#include "openbsd-compat/openssl-compat.h"
-
 #ifdef WITH_OPENSSL
 #include "openbsd-compat/openssl-compat.h"
 #include <openssl/bn.h>

ssh.c

@@ -43,10 +43,12 @@
 #include "includes.h"
 
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/resource.h>
 #include <sys/ioctl.h>
+#include <sys/queue.h>
+#include <sys/resource.h>
 #include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/time.h>
 #include <sys/wait.h>
 #include <sys/utsname.h>
 
@@ -75,7 +77,6 @@
 #include <openssl/err.h>
 #endif
 #include "openbsd-compat/openssl-compat.h"
-#include "openbsd-compat/sys-queue.h"
 
 #include "xmalloc.h"
 #include "ssh.h"

ssh_api.h

@@ -18,11 +18,10 @@
 #ifndef API_H
 #define API_H
 
+#include <sys/queue.h>
 #include <sys/types.h>
 #include <signal.h>
 
-#include "openbsd-compat/sys-queue.h"
-
 #include "cipher.h"
 #include "sshkey.h"
 #include "kex.h"

sshconnect2.c

@@ -29,6 +29,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
+#include <sys/queue.h>
 #include <sys/stat.h>
 
 #include <errno.h>
@@ -45,8 +46,6 @@
 #include <vis.h>
 #endif
 
-#include "openbsd-compat/sys-queue.h"
-
 #include "xmalloc.h"
 #include "ssh.h"
 #include "ssh2.h"

sshd-auth.c

@@ -32,12 +32,11 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/wait.h>
+#include <sys/tree.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/time.h>
-
-#include "openbsd-compat/sys-tree.h"
-#include "openbsd-compat/sys-queue.h"
+#include <sys/queue.h>
 
 #include <errno.h>
 #include <fcntl.h>

sshd-session.c

@@ -31,12 +31,12 @@
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include "openbsd-compat/sys-tree.h"
-#include "openbsd-compat/sys-queue.h"
 #include <sys/wait.h>
+#include <sys/tree.h>
+#include <sys/stat.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <sys/queue.h>
 
 #include <errno.h>
 #include <fcntl.h>

sshd.c

@@ -31,8 +31,7 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include "openbsd-compat/sys-tree.h"
-#include "openbsd-compat/sys-queue.h"
+#include <sys/queue.h>
 #include <sys/wait.h>
 #include <sys/utsname.h>