From 62da44f0644f5d1cc7fa3b6b967482b5d2f15aa2 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Mon, 24 Jul 2006 15:08:35 +1000
Subject: [PATCH]  - (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]    [openbsd-compat/rresvport.c]    These look to
 need string.h and/or unistd.h (based on a grep for function    names)

---
 ChangeLog                      | 11 +++++++++--
 openbsd-compat/basename.c      |  1 +
 openbsd-compat/bsd-closefrom.c |  2 ++
 openbsd-compat/bsd-cray.c      |  4 +++-
 openbsd-compat/bsd-openpty.c   |  2 ++
 openbsd-compat/bsd-snprintf.c  |  2 ++
 openbsd-compat/fake-rfc2553.c  |  1 +
 openbsd-compat/port-aix.c      |  2 ++
 openbsd-compat/port-irix.c     |  3 +++
 openbsd-compat/rresvport.c     |  1 +
 10 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aa3d0ae9b..9e9ecfa6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -122,7 +122,14 @@
  - (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]
+   [openbsd-compat/rresvport.c]
+   These look to need string.h and/or unistd.h (based on a grep for function
+   names)
+
 20060713
  - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h
 
@@ -5040,4 +5047,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4433 2006/07/24 05:03:06 djm Exp $
+$Id: ChangeLog,v 1.4434 2006/07/24 05:08:35 djm Exp $
diff --git a/openbsd-compat/basename.c b/openbsd-compat/basename.c
index ad040e139..4b10cb84b 100644
--- a/openbsd-compat/basename.c
+++ b/openbsd-compat/basename.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #ifndef HAVE_BASENAME
+#include <string.h>
 
 char *
 basename(const char *path)
diff --git a/openbsd-compat/bsd-closefrom.c b/openbsd-compat/bsd-closefrom.c
index 7509d2835..3f17302d1 100644
--- a/openbsd-compat/bsd-closefrom.c
+++ b/openbsd-compat/bsd-closefrom.c
@@ -25,6 +25,8 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <stddef.h>
+#include <string.h>
+#include <unistd.h>
 #ifdef HAVE_DIRENT_H
 # include <dirent.h>
 # define NAMLEN(dirent) strlen((dirent)->d_name)
diff --git a/openbsd-compat/bsd-cray.c b/openbsd-compat/bsd-cray.c
index d1f1c059c..8093f6d54 100644
--- a/openbsd-compat/bsd-cray.c
+++ b/openbsd-compat/bsd-cray.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: bsd-cray.c,v 1.14 2005/02/02 06:10:11 dtucker Exp $
+ * $Id: bsd-cray.c,v 1.15 2006/07/24 05:08:36 djm Exp $
  *
  * bsd-cray.c
  *
@@ -53,6 +53,8 @@
 #include <sys/stat.h>
 #include <sys/session.h>
 #include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 #include <pwd.h>
 #include <fcntl.h>
 #include <errno.h>
diff --git a/openbsd-compat/bsd-openpty.c b/openbsd-compat/bsd-openpty.c
index 0b77a1da9..a2f2fda60 100644
--- a/openbsd-compat/bsd-openpty.c
+++ b/openbsd-compat/bsd-openpty.c
@@ -57,6 +57,8 @@
 #endif
 
 #include <signal.h>
+#include <string.h>
+#include <unistd.h>
 
 #ifndef O_NOCTTY
 #define O_NOCTTY 0
diff --git a/openbsd-compat/bsd-snprintf.c b/openbsd-compat/bsd-snprintf.c
index c30cd1223..9fdf4d3f0 100644
--- a/openbsd-compat/bsd-snprintf.c
+++ b/openbsd-compat/bsd-snprintf.c
@@ -108,6 +108,8 @@
 
 #if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF)
 
+#include <string.h>
+
 #ifdef HAVE_LONG_DOUBLE
 # define LDOUBLE long double
 #else
diff --git a/openbsd-compat/fake-rfc2553.c b/openbsd-compat/fake-rfc2553.c
index aae016bf7..08a7cb66c 100644
--- a/openbsd-compat/fake-rfc2553.c
+++ b/openbsd-compat/fake-rfc2553.c
@@ -36,6 +36,7 @@
  */
 
 #include "includes.h"
+#include <string.h>
 
 #ifndef HAVE_GETNAMEINFO
 int getnameinfo(const struct sockaddr *sa, size_t salen, char *host, 
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index 6fd593aad..2d56e7e4a 100644
--- a/openbsd-compat/port-aix.c
+++ b/openbsd-compat/port-aix.c
@@ -38,6 +38,8 @@
 # include <netdb.h>
 #endif
 #include <uinfo.h>
+#include <string.h>
+#include <unistd.h>
 #include <sys/socket.h>
 #include "port-aix.h"
 
diff --git a/openbsd-compat/port-irix.c b/openbsd-compat/port-irix.c
index aa6db1cf8..eaa91a4b5 100644
--- a/openbsd-compat/port-irix.c
+++ b/openbsd-compat/port-irix.c
@@ -29,6 +29,9 @@
     defined(WITH_IRIX_JOBS) || \
     defined(WITH_IRIX_ARRAY)
 
+#include <unistd.h>
+#include <string.h>
+
 #ifdef WITH_IRIX_PROJECT
 # include <proj.h>
 #endif /* WITH_IRIX_PROJECT */
diff --git a/openbsd-compat/rresvport.c b/openbsd-compat/rresvport.c
index fc029f46f..c10391872 100644
--- a/openbsd-compat/rresvport.c
+++ b/openbsd-compat/rresvport.c
@@ -36,6 +36,7 @@
 #ifndef HAVE_RRESVPORT_AF
 
 #include <errno.h>
+#include <string.h>
 
 #if 0
 int