From be73fa468784d22e3d7c3ee23401d083cda8dfe5 Mon Sep 17 00:00:00 2001
From: Love Hornquist Astrand <lha@h5l.org>
Date: Wed, 23 Dec 2009 14:12:38 +0100
Subject: [PATCH] use krb5_socket_t

---
 kadmin/kadm_conn.c          | 8 ++++----
 kadmin/kadmind.c            | 2 +-
 kadmin/rpc.c                | 2 +-
 kadmin/server.c             | 6 +++---
 lib/roken/test-mini_inetd.c | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/kadmin/kadm_conn.c b/kadmin/kadm_conn.c
index f2124b9d3..f7f765935 100644
--- a/kadmin/kadm_conn.c
+++ b/kadmin/kadm_conn.c
@@ -124,7 +124,7 @@ spawn_child(krb5_context context, int *socks,
     struct sockaddr_storage __ss;
     struct sockaddr *sa = (struct sockaddr *)&__ss;
     socklen_t sa_size = sizeof(__ss);
-    SOCKET s;
+    krb5_socket_t s;
     pid_t pid;
     krb5_address addr;
     char buf[128];
@@ -165,7 +165,7 @@ spawn_child(krb5_context context, int *socks,
 
 static int
 wait_for_connection(krb5_context context,
-		    SOCKET *socks, unsigned int num_socks)
+		    krb5_socket_t *socks, unsigned int num_socks)
 {
     unsigned int i;
     int e;
@@ -226,7 +226,7 @@ start_server(krb5_context context)
     int e;
     struct kadm_port *p;
 
-    SOCKET *socks = NULL, *tmp;
+    krb5_socket_t *socks = NULL, *tmp;
     unsigned int num_socks = 0;
     int i;
 
@@ -259,7 +259,7 @@ start_server(krb5_context context)
 	}
 	socks = tmp;
 	for(ap = ai; ap; ap = ap->ai_next) {
-	    SOCKET s = socket(ap->ai_family, ap->ai_socktype, ap->ai_protocol);
+	    krb5_socket_t s = socket(ap->ai_family, ap->ai_socktype, ap->ai_protocol);
 	    if(rk_IS_BAD_SOCKET(s)) {
 		krb5_warn(context, rk_SOCK_ERRNO, "socket");
 		continue;
diff --git a/kadmin/kadmind.c b/kadmin/kadmind.c
index c74ab1661..c3711b170 100644
--- a/kadmin/kadmind.c
+++ b/kadmin/kadmind.c
@@ -95,7 +95,7 @@ main(int argc, char **argv)
     int i;
     krb5_log_facility *logfacility;
     krb5_keytab keytab;
-    SOCKET sfd = INVALID_SOCKET;
+    krb5_socket_t sfd = rk_INVALID_SOCKET;
 
     setprogname(argv[0]);
 
diff --git a/kadmin/rpc.c b/kadmin/rpc.c
index de818c0a5..ced88d66d 100644
--- a/kadmin/rpc.c
+++ b/kadmin/rpc.c
@@ -1091,7 +1091,7 @@ process_stream(krb5_context context,
 
 
 int
-handle_mit(krb5_context context, void *buf, size_t len, SOCKET sock)
+handle_mit(krb5_context context, void *buf, size_t len, krb5_socket_t sock)
 {
     krb5_storage *sp;
 
diff --git a/kadmin/server.c b/kadmin/server.c
index 5068b36b6..79bab5edf 100644
--- a/kadmin/server.c
+++ b/kadmin/server.c
@@ -440,7 +440,7 @@ v5_loop (krb5_context context,
 	 krb5_auth_context ac,
 	 krb5_boolean initial,
 	 void *kadm_handle,
-	 SOCKET fd)
+	 krb5_socket_t fd)
 {
     krb5_error_code ret;
     krb5_data in, out;
@@ -476,7 +476,7 @@ match_appl_version(const void *data, const char *appl_version)
 static void
 handle_v5(krb5_context context,
 	  krb5_keytab keytab,
-	  SOCKET fd)
+	  krb5_socket_t fd)
 {
     krb5_error_code ret;
     krb5_ticket *ticket;
@@ -539,7 +539,7 @@ handle_v5(krb5_context context,
 krb5_error_code
 kadmind_loop(krb5_context context,
 	     krb5_keytab keytab,
-	     SOCKET sock)
+	     krb5_socket_t sock)
 {
     u_char buf[sizeof(KRB5_SENDAUTH_VERSION) + 4];
     ssize_t n;
diff --git a/lib/roken/test-mini_inetd.c b/lib/roken/test-mini_inetd.c
index 0e58fdbfd..89571cd5b 100644
--- a/lib/roken/test-mini_inetd.c
+++ b/lib/roken/test-mini_inetd.c
@@ -82,7 +82,7 @@ get_connected_socket(rk_socket_t * s_ret)
 	goto done;
 
     *s_ret = s;
-    s = INVALID_SOCKET;
+    s = rk_INVALID_SOCKET;
     rv = 0;
 
  done:
@@ -105,7 +105,7 @@ const char * test_strings[] = {
 static int
 test_simple_echo_client(void)
 {
-    rk_socket_t s = INVALID_SOCKET;
+    rk_socket_t s = rk_INVALID_SOCKET;
     int rv;
     char buf[81];
     int i;
@@ -165,7 +165,7 @@ test_simple_echo_socket(void)
 	return test_simple_echo_client();
     } else {
 
-	rk_socket_t s = INVALID_SOCKET;
+	rk_socket_t s = rk_INVALID_SOCKET;
 
 	fprintf (stderr, "[%s] Listening for connections...\n", prog);
 	mini_inetd(htons(PORT), &s);