Create replacement util.h if needed.

Remove #ifdef HAVE_UTIL_H wrapper.  ok djm@

diff --git a/configure.ac b/configure.ac
index 44023c33091b4e4e4f11f0601796a4adb88b0407..4179857519f0100a4303b789932131987b29eaf5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -520,7 +520,6 @@ AC_CHECK_HEADERS([ \
        ucred.h \
        unistd.h \
        usersec.h \
-       util.h \
        utime.h \
        utmp.h \
        utmpx.h \
@@ -533,7 +532,7 @@ AC_CHECK_HEADERS([ \
 # the equivalent file.  This avoids having to wrap those includes in
 # '#ifdef HAVE_FOO_H'.  If we create any such headers, add the path to includes.
 compatincludes=no
-AC_CHECK_HEADERS([paths.h poll.h stdint.h], [], [
+AC_CHECK_HEADERS([paths.h poll.h stdint.h util.h], [], [
     compatincludes="`pwd`/openbsd-compat/include"
     mkdir -p "$compatincludes"
     case "$ac_header" in

diff --git a/loginrec.c b/loginrec.c
index fa829fdf4875ee564500d7333ea98bbe64f247ed..e50964de36011d2e2b7bb855291de8856a75000c 100644 (file)
--- a/loginrec.c
+++ b/loginrec.c
@@ -160,9 +160,7 @@
 #include "ssherr.h"
 #include "misc.h"
 
-#ifdef HAVE_UTIL_H
 # include <util.h>
-#endif
 
 #ifdef USE_WTMPDB
 # include <wtmpdb.h>

diff --git a/mux.c b/mux.c
index 8ff29ee2a2ef8b527e2e044d77300a9b1c3ddd3b..6b1d463afba077f286bd45b7074575804c7201bf 100644 (file)
--- a/mux.c
+++ b/mux.c
@@ -38,9 +38,7 @@
 
 #include <poll.h>
 
-#ifdef HAVE_UTIL_H
-# include <util.h>
-#endif
+#include <util.h>
 
 #include "openbsd-compat/sys-queue.h"
 #include "xmalloc.h"

diff --git a/openbsd-compat/bsd-openpty.c b/openbsd-compat/bsd-openpty.c
index f5507000a5cba984ff996672818fb107d74cd74d..3e58ace2604f75d5a6023f9aceefd06c46c06ee6 100644 (file)
--- a/openbsd-compat/bsd-openpty.c
+++ b/openbsd-compat/bsd-openpty.c
@@ -50,9 +50,7 @@
 # include <fcntl.h>
 #endif
 
-#ifdef HAVE_UTIL_H
-# include <util.h>
-#endif /* HAVE_UTIL_H */
+#include <util.h>
 
 #ifdef HAVE_PTY_H
 # include <pty.h>

diff --git a/readconf.c b/readconf.c
index bee3e21c4ba752c6033cc19243f91012702132ee..0acc08ca1d5bf74d6d3a04f30a86a35677b4cae3 100644 (file)
--- a/readconf.c
+++ b/readconf.c
@@ -46,9 +46,7 @@
 #else
 # include "openbsd-compat/glob.h"
 #endif
-#ifdef HAVE_UTIL_H
 #include <util.h>
-#endif
 #if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) && !defined(BROKEN_STRNVIS)
 # include <vis.h>
 #endif

diff --git a/scp.c b/scp.c
index 67bd9d28dcae73c5029fd9debe013ed52ec6d980..be0acc3f5bd7c99852d2b37ca4bb378a2886f759 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -100,9 +100,7 @@
 #include <libgen.h>
 #endif
 #include <limits.h>
-#ifdef HAVE_UTIL_H
-# include <util.h>
-#endif
+#include <util.h>
 #include <locale.h>
 #include <pwd.h>
 #include <signal.h>

diff --git a/servconf.c b/servconf.c
index bd04336e001b20350fdd80a90ba1cfbd441ff389..532c095536b5275ff7099b8ff3e3f5788148d1e3 100644 (file)
--- a/servconf.c
+++ b/servconf.c
@@ -37,9 +37,7 @@
 #include <limits.h>
 #include <stdarg.h>
 #include <errno.h>
-#ifdef HAVE_UTIL_H
 #include <util.h>
-#endif
 #ifdef USE_SYSTEM_GLOB
 # include <glob.h>
 #else

diff --git a/sftp-common.c b/sftp-common.c
index 5d72498256e8adb72f113771e376d50a23625a9b..4abd54a07a1a6a8c667ab18be24ad7b8271becf1 100644 (file)
--- a/sftp-common.c
+++ b/sftp-common.c
@@ -37,9 +37,7 @@
 #include <time.h>
 #include <stdarg.h>
 #include <unistd.h>
-#ifdef HAVE_UTIL_H
 #include <util.h>
-#endif
 
 #include "xmalloc.h"
 #include "ssherr.h"

diff --git a/sftp.c b/sftp.c
index 191b1e348a5d6f56703ec5b3e2767f6a4dd898fb..9cb654a0e194f6345a2298cc412bd33e639bec7b 100644 (file)
--- a/sftp.c
+++ b/sftp.c
@@ -51,9 +51,7 @@ typedef void EditLine;
 #include <string.h>
 #include <unistd.h>
 
-#ifdef HAVE_UTIL_H
-# include <util.h>
-#endif
+#include <util.h>
 
 #include "xmalloc.h"
 #include "log.h"

diff --git a/ssh-agent.c b/ssh-agent.c
index e17d8aa9ad2d10c37da76f6a75ade0af4385f88c..10b19296c20f076979d91cb5f220d37db641e594 100644 (file)
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -66,9 +66,7 @@
 #include <time.h>
 #include <string.h>
 #include <unistd.h>
-#ifdef HAVE_UTIL_H
-# include <util.h>
-#endif
+#include <util.h>
 
 #include "xmalloc.h"
 #include "ssh.h"

diff --git a/sshkey.c b/sshkey.c
index 3633c878ae68469912327992f1fa4f5e0b9703e3..ab69d474d08c90e24da6fe1c1c437d070676e7e3 100644 (file)
--- a/sshkey.c
+++ b/sshkey.c
@@ -46,9 +46,7 @@
 #include <string.h>
 #include <resolv.h>
 #include <time.h>
-#ifdef HAVE_UTIL_H
 #include <util.h>
-#endif /* HAVE_UTIL_H */
 
 #include "ssh2.h"
 #include "ssherr.h"

diff --git a/sshpty.c b/sshpty.c
index fe01f3b88ec6ba6cc0b993069a312fd0cfe1ae48..968df5a63a0b6cd2e152606eb35316255808ec6a 100644 (file)
--- a/sshpty.c
+++ b/sshpty.c
@@ -28,9 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <termios.h>
-#ifdef HAVE_UTIL_H
-# include <util.h>
-#endif
+#include <util.h>
 #include <unistd.h>
 
 #include "sshpty.h"