summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--includes.h6
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index fb542ae8f..37cbe9cf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120030629
2 - (dtucker) Bug #602: move #include of netdb.h to after in.h (fixes compiler
3 warnings on Solaris 2.5.1).
4
120030628 520030628
2 - (djm) Bug #591: use PKCS#15 private key label as a comment in case 6 - (djm) Bug #591: use PKCS#15 private key label as a comment in case
3 of OpenSC. Report and patch from larsch@trustcenter.de 7 of OpenSC. Report and patch from larsch@trustcenter.de
@@ -607,4 +611,4 @@
607 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 611 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
608 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 612 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
609 613
610$Id: ChangeLog,v 1.2832 2003/06/29 11:20:04 dtucker Exp $ 614$Id: ChangeLog,v 1.2833 2003/06/29 11:23:37 dtucker Exp $
diff --git a/includes.h b/includes.h
index c30c31577..033cd91fa 100644
--- a/includes.h
+++ b/includes.h
@@ -50,9 +50,6 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
50#ifdef HAVE_NETGROUP_H 50#ifdef HAVE_NETGROUP_H
51# include <netgroup.h> 51# include <netgroup.h>
52#endif 52#endif
53#if defined(HAVE_NETDB_H)
54# include <netdb.h>
55#endif
56#ifdef HAVE_ENDIAN_H 53#ifdef HAVE_ENDIAN_H
57# include <endian.h> 54# include <endian.h>
58#endif 55#endif
@@ -143,6 +140,9 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
143#include <netinet/ip.h> /* For IPTOS macros */ 140#include <netinet/ip.h> /* For IPTOS macros */
144#include <netinet/tcp.h> 141#include <netinet/tcp.h>
145#include <arpa/inet.h> 142#include <arpa/inet.h>
143#if defined(HAVE_NETDB_H)
144# include <netdb.h>
145#endif
146#ifdef HAVE_RPC_TYPES_H 146#ifdef HAVE_RPC_TYPES_H
147# include <rpc/types.h> /* For INADDR_LOOPBACK */ 147# include <rpc/types.h> /* For INADDR_LOOPBACK */
148#endif 148#endif