summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-09-02 15:32:40 +1000
committerDarren Tucker <dtucker@zip.com.au>2006-09-02 15:32:40 +1000
commit46aa3e0ce1d2f341bb3e4d46035faae3bb5ee69c (patch)
tree92daa5a80c3709fc6448da32abf5d6065380bb87
parent25fa0ee693fc99377e395bf47d74960ffda20883 (diff)
downloadopenssh-git-46aa3e0ce1d2f341bb3e4d46035faae3bb5ee69c.tar.gz
- (dtucker) [ssh-keyscan.c ssh-rand-helper.c ssh.c sshconnect.c
openbsd-compat/bindresvport.c openbsd-compat/getrrsetbyname.c openbsd-compat/port-tun.c openbsd-compat/rresvport.c] Include <arpa/inet.h> for hton* and ntoh* macros. Required on (at least) HP-UX since we define _XOPEN_SOURCE_EXTENDED. Found by santhi.amirta at gmail com.
-rw-r--r--ChangeLog7
-rw-r--r--openbsd-compat/bindresvport.c1
-rw-r--r--openbsd-compat/getrrsetbyname.c3
-rw-r--r--openbsd-compat/port-tun.c2
-rw-r--r--openbsd-compat/rresvport.c1
-rw-r--r--ssh-keyscan.c3
-rw-r--r--ssh-rand-helper.c1
-rw-r--r--ssh.c3
-rw-r--r--sshconnect.c1
9 files changed, 21 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f1732345..56b4af7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
20060902
- (dtucker) [openbsd-compat/port-irix.c] Add errno.h, found by Iain Morgan.
+ - (dtucker) [ssh-keyscan.c ssh-rand-helper.c ssh.c sshconnect.c
+ openbsd-compat/bindresvport.c openbsd-compat/getrrsetbyname.c
+ openbsd-compat/port-tun.c openbsd-compat/rresvport.c] Include <arpa/inet.h>
+ for hton* and ntoh* macros. Required on (at least) HP-UX since we define
+ _XOPEN_SOURCE_EXTENDED. Found by santhi.amirta at gmail com.
20060901
- (djm) [audit-bsm.c audit.c auth-bsdauth.c auth-chall.c auth-pam.c]
@@ -5380,4 +5385,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.4526 2006/09/02 02:38:56 dtucker Exp $
+$Id: ChangeLog,v 1.4527 2006/09/02 05:32:40 dtucker Exp $
diff --git a/openbsd-compat/bindresvport.c b/openbsd-compat/bindresvport.c
index e8fb83f2..65afed1e 100644
--- a/openbsd-compat/bindresvport.c
+++ b/openbsd-compat/bindresvport.c
@@ -37,6 +37,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#include <errno.h>
#include <string.h>
diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
index 40155d5a..6c86e02c 100644
--- a/openbsd-compat/getrrsetbyname.c
+++ b/openbsd-compat/getrrsetbyname.c
@@ -52,6 +52,9 @@
#include <stdlib.h>
#include <string.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
#include "getrrsetbyname.h"
#if defined(HAVE_DECL_H_ERRNO) && !HAVE_DECL_H_ERRNO
diff --git a/openbsd-compat/port-tun.c b/openbsd-compat/port-tun.c
index cadc331e..276474db 100644
--- a/openbsd-compat/port-tun.c
+++ b/openbsd-compat/port-tun.c
@@ -18,7 +18,9 @@
#include <sys/types.h>
#include <sys/ioctl.h>
+
#include <netinet/in.h>
+#include <arpa/inet.h>
#include <netinet/ip.h>
#include <errno.h>
diff --git a/openbsd-compat/rresvport.c b/openbsd-compat/rresvport.c
index 17e66ca5..5b0275ce 100644
--- a/openbsd-compat/rresvport.c
+++ b/openbsd-compat/rresvport.c
@@ -39,6 +39,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 64d4d087..416d3f5c 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -15,6 +15,9 @@
# include <sys/time.h>
#endif
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
#include <openssl/bn.h>
#include <netdb.h>
diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c
index 10c9905b..8520c3a6 100644
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -34,6 +34,7 @@
#include <stddef.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#ifdef HAVE_SYS_UN_H
# include <sys/un.h>
diff --git a/ssh.c b/ssh.c
index a34990b5..efc4af6d 100644
--- a/ssh.c
+++ b/ssh.c
@@ -67,6 +67,9 @@
#include <string.h>
#include <unistd.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
#include <openssl/evp.h>
#include <openssl/err.h>
diff --git a/sshconnect.c b/sshconnect.c
index 823def6a..a7a4e8a9 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -24,6 +24,7 @@
#endif
#include <netinet/in.h>
+#include <arpa/inet.h>
#include <ctype.h>
#include <errno.h>