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

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

diff --git a/auth-options.c b/auth-options.c
index 90be7b02d49da736214fbe5bc9b7a3ca1c5cc66d..e15f600abbf68490df53d6108c7786ed1695aac8 100644 (file)
--- a/auth-options.c
+++ b/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"

diff --git a/channels.c b/channels.c
index 83ff8bb8e23761d8d4978d77539456b6f776ef46..c7e75418f9e1cd61416890be58556097848d3d74 100644 (file)
--- a/channels.c
+++ b/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"

diff --git a/clientloop.c b/clientloop.c
index d91d5de5524de3b1c1dc66ef99af53db1207e155..05d82e1599b3757b8c4d5c3dc8127c763b19bef1 100644 (file)
--- a/clientloop.c
+++ b/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"

diff --git a/configure.ac b/configure.ac
index 962c43540bfe2d2257088a37db3a5df17f4d66c0..c6245305dabf6f39b53409c27ad69fa1edf16081 100644 (file)
--- a/configure.ac
+++ b/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>

diff --git a/gss-serv.c b/gss-serv.c
index 82f4cacddda95ff95b018b0ef0376de7ddff0ed5..ae3465c3ba89089bb284dda48eefd22a08103644 100644 (file)
--- a/gss-serv.c
+++ b/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"

diff --git a/krl.c b/krl.c
index bea5b1b98c4355ae3697c0ecbdc112ab565c6d71..eb4b7c2499963371441ecd8a9c44f2b7fc33f290 100644 (file)
--- a/krl.c
+++ b/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>

diff --git a/monitor.c b/monitor.c
index fa66b60cbd5cb388d612642753b01dc6b9cfebc0..55c4a47baed263749e9302c94eaa3c8ee9976b88 100644 (file)
--- a/monitor.c
+++ b/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"

diff --git a/monitor_wrap.c b/monitor_wrap.c
index c56f46768aa33ad6f0375fdcc0f2d7c6bea9f11d..383bae4b027147ea10264b52e3d349da425eeb5e 100644 (file)
--- a/monitor_wrap.c
+++ b/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

diff --git a/mux.c b/mux.c
index 629cc0f73af7432a45bfa69c98778a8f81c002fe..be3263c50797d948e039351febac7db4f9c942a7 100644 (file)
--- a/mux.c
+++ b/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"

diff --git a/nchan.c b/nchan.c
index bd4758ac120e8e34088ceabd60f785bc81cd7578..4bf5e8bb1e336d634d94ee5b4cbff3b3d8210a4a 100644 (file)
--- a/nchan.c
+++ b/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"

diff --git a/packet.c b/packet.c
index 8785db9d8314c4b3b3a74474d58875953a6432cf..2551c2a4e8fbb1c7371bc433d03357a712db564f 100644 (file)
--- a/packet.c
+++ b/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>
 

diff --git a/packet.h b/packet.h
index b63b7709d1519f66e4630d337c4f65ae92a5bcc9..6d6a064bdf416be1a1e4fe6f163384e6c3596bbc 100644 (file)
--- a/packet.h
+++ b/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;

diff --git a/servconf.c b/servconf.c
index be9cc827b8d2bdb89087aa7b6f2dcdf7a16954bb..252e49ccb7952f963ba7b66db1b94a1dc880d859 100644 (file)
--- a/servconf.c
+++ b/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"

diff --git a/servconf.h b/servconf.h
index e1ccc04314a1edf5f54b6043e3e4ccad64ceeb1f..f588f02e9991c21c526047e6c6c1a430b42ebbd0 100644 (file)
--- a/servconf.h
+++ b/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. */
 

diff --git a/serverloop.c b/serverloop.c
index dba2fc3053e90a106f001fa2f21d6fc7c282004b..53842f7d3864135be778b693033b0c5b557c4565 100644 (file)
--- a/serverloop.c
+++ b/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"

diff --git a/session.c b/session.c
index 926cc2b81c2d4c676440be154cf5fb61e45115fc..227881ec94ffeb457188ef826407c01d160b6209 100644 (file)
--- a/session.c
+++ b/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"

diff --git a/sftp-client.c b/sftp-client.c
index 02bd6ac3e8d73b93729abfedbcd71426c0f2483d..d8b3645810232d1f7004bee2244dffb3c3ce642c 100644 (file)
--- a/sftp-client.c
+++ b/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>

diff --git a/sftp-usergroup.c b/sftp-usergroup.c
index 3cfcefea580e07f5ba0817daefa0d581b3c535ef..d931b29113b33742032736ff2891b24fc635a2bb 100644 (file)
--- a/sftp-usergroup.c
+++ b/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>

diff --git a/srclimit.c b/srclimit.c
index dacc570aa4061d1879119de2f5e073d163f22aa2..05f22ee136ce83253cf37011c851e18351e79a3a 100644 (file)
--- a/srclimit.c
+++ b/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>

diff --git a/ssh-agent.c b/ssh-agent.c
index 848b0f9a518cb217c1c3209a77a7f8968d5ff978..f86749353e3f2e16911ca83ac2413d5c36a830cd 100644 (file)
--- a/ssh-agent.c
+++ b/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>

diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index f9788114df8da89cb66acee30cccc47ebb3fc939..9bd3e78ebbd3dc0e7fb1018837f47fa18ae2253a 100644 (file)
--- a/ssh-keyscan.c
+++ b/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>

diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c
index c490974d8cfaa87bd4f59652cdf93306f36b5fd7..c147ef2a702a7e64709b09d465c5db8e49fa7e58 100644 (file)
--- a/ssh-pkcs11.c
+++ b/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>

diff --git a/ssh.c b/ssh.c
index 0b1a6e158fac50ca9c27c796ce541f4310f11a1b..e15cb44c242fc5dbc9240b32cb8c676278472c65 100644 (file)
--- a/ssh.c
+++ b/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"

diff --git a/ssh_api.h b/ssh_api.h
index 584f896a78c4f36d6aa5119faebe874d72a888d6..d5ba574802b3e8d835b7574200c4d73affd6d528 100644 (file)
--- a/ssh_api.h
+++ b/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"

diff --git a/sshconnect2.c b/sshconnect2.c
index 5e99d293fd5e59a6c5f1844464e7cdcbe0b81301..efef5cd6f3201762db07bbc498612bb54da23c34 100644 (file)
--- a/sshconnect2.c
+++ b/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"

diff --git a/sshd-auth.c b/sshd-auth.c
index 0f238e1b37434b3aa24d823dc1234ce3cc658d15..9f19ead2aeddb314bdc6507157a304a6f146c6a5 100644 (file)
--- a/sshd-auth.c
+++ b/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>

diff --git a/sshd-session.c b/sshd-session.c
index a3ad3a2bcb92d55b330f2f44ea1b356e96604452..fdaa401b91f21388beb4e240ca10b6d329e768da 100644 (file)
--- a/sshd-session.c
+++ b/sshd-session.c
@@ -31,12 +31,12 @@
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
-#include <sys/socket.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/wait.h>
+#include <sys/queue.h>
 
 #include <errno.h>
 #include <fcntl.h>

diff --git a/sshd.c b/sshd.c
index 2d5634057945dcf8c4abcadf1b646b439be660b3..e296ed7897ed4b9b871701b762c4f094d20e2cab 100644 (file)
--- a/sshd.c
+++ b/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>