* full_ipadr.c, gen_rname.c, port2ip.c, read_msg.c, write_msg.c:

Remove explicit includes of socket files.
* locate_kdc.c:  Remove <sys/types.h> and "os-proto.h".

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5276 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 97f67956aced4ed2d404747228e547bc958cf283..dfac63ea86da6f6b6971ae5298717462352a752c 100644 (file)
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,5 +1,9 @@
 Mon Mar 27 14:16:39 1995  John Gilmore  (gnu at toad.com)
 
+       * full_ipadr.c, gen_rname.c, port2ip.c, read_msg.c, write_msg.c:
+       Remove explicit includes of socket files.
+       * locate_kdc.c:  Remove <sys/types.h> and "os-proto.h".
+
        * macsock.c (connect, send, recv):  Add for K5 compatability.
        (getmyipaddr):  Add for use in K5.
 

diff --git a/src/lib/krb5/os/full_ipadr.c b/src/lib/krb5/os/full_ipadr.c
index 94d99f276516e2f500073fe10832687d70ac3f0e..7751064318ed3ddcc16c1bc46f4e8f8b470df8ec 100644 (file)
--- a/src/lib/krb5/os/full_ipadr.c
+++ b/src/lib/krb5/os/full_ipadr.c
@@ -30,9 +30,6 @@
 #ifdef KRB5_USE_INET
 
 #include "os-proto.h"
-#ifndef _WINSOCKAPI_
-#include <netinet/in.h>
-#endif
 
 krb5_error_code INTERFACE
 krb5_make_full_ipaddr(context, adr, port, outaddr)

diff --git a/src/lib/krb5/os/gen_rname.c b/src/lib/krb5/os/gen_rname.c
index d56bb9160adb2ef54ef7d07904e6b14460dda46c..d4b933de11a9183faeb1e8061cda02e2e7c5baad 100644 (file)
--- a/src/lib/krb5/os/gen_rname.c
+++ b/src/lib/krb5/os/gen_rname.c
@@ -28,13 +28,6 @@
 #define NEED_SOCKETS
 #include "k5-int.h"
 #include "os-proto.h"
-#ifdef KRB5_USE_INET
-#include <sys/types.h>
-#ifndef _WINSOCKAPI_
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#endif
-#endif
 
 krb5_error_code INTERFACE
 krb5_gen_replay_name(context, address, uniq, string)

diff --git a/src/lib/krb5/os/locate_kdc.c b/src/lib/krb5/os/locate_kdc.c
index f5f1aab7c4a97469e832a3c101409ae17733c917..e9ef69b099c4b7638f39460f6d2675fccb84ab19 100644 (file)
--- a/src/lib/krb5/os/locate_kdc.c
+++ b/src/lib/krb5/os/locate_kdc.c
@@ -27,8 +27,6 @@
 #define NEED_SOCKETS
 #include "k5-int.h"
 #include <stdio.h>
-#include <sys/types.h>
-#include "os-proto.h"
 
 #ifdef KRB5_USE_INET
 extern char *krb5_kdc_udp_portname;

diff --git a/src/lib/krb5/os/port2ip.c b/src/lib/krb5/os/port2ip.c
index d8c5b23c146b45ffeb8762e6e589240131c1c8e2..7491727a58d53eab0458ea7767f858d82b73758e 100644 (file)
--- a/src/lib/krb5/os/port2ip.c
+++ b/src/lib/krb5/os/port2ip.c
@@ -29,9 +29,6 @@
 
 #ifdef KRB5_USE_INET
 #include "os-proto.h"
-#ifndef _WINSOCKAPI_
-#include <netinet/in.h>
-#endif
 
 krb5_error_code INTERFACE
 krb5_unpack_full_ipaddr(context, inaddr, adr, port)

diff --git a/src/lib/krb5/os/read_msg.c b/src/lib/krb5/os/read_msg.c
index 749dae088a48f5c31b8c73342884953556253e77..bd9cb6ea64e27fa1dca5a0970bcf8a0aaa348948 100644 (file)
--- a/src/lib/krb5/os/read_msg.c
+++ b/src/lib/krb5/os/read_msg.c
@@ -27,9 +27,6 @@
 #define NEED_SOCKETS
 #include "k5-int.h"
 #include <errno.h>
-#ifndef _WINSOCKAPI_
-#include <netinet/in.h>
-#endif
 
 krb5_error_code INTERFACE
 krb5_read_message(context, fdp, inbuf)
@@ -65,4 +62,3 @@ krb5_read_message(context, fdp, inbuf)
        inbuf->data = buf;
        return(0);
 }
-

diff --git a/src/lib/krb5/os/write_msg.c b/src/lib/krb5/os/write_msg.c
index 659b79bbe7347d175dc1db4eaa423a115d9abaa3..85845c1da1bf441048bc8014d2e573d9b8671add 100644 (file)
--- a/src/lib/krb5/os/write_msg.c
+++ b/src/lib/krb5/os/write_msg.c
@@ -27,9 +27,6 @@
 #define NEED_SOCKETS
 #include "k5-int.h"
 #include <errno.h>
-#ifndef _WINSOCKAPI_
-#include <netinet/in.h>
-#endif
 
 krb5_error_code INTERFACE
 krb5_write_message(context, fdp, outbuf)
@@ -49,7 +46,3 @@ krb5_write_message(context, fdp, outbuf)
        }
        return(0);
 }
-
-
-
-