From 160ddd0e43df5e2e7dedf10f0d9b6757aa974f25 Mon Sep 17 00:00:00 2001
From: Love Hornquist Astrand <lha@h5l.org>
Date: Wed, 23 Dec 2009 14:06:37 +0100
Subject: [PATCH] use rk_closesocket

---
 kadmin/kadm_conn.c        | 10 +++++-----
 lib/kadm5/destroy_s.c     |  2 +-
 lib/kadm5/ipropd_master.c |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kadmin/kadm_conn.c b/kadmin/kadm_conn.c
index c7a93346c..f2124b9d3 100644
--- a/kadmin/kadm_conn.c
+++ b/kadmin/kadm_conn.c
@@ -151,14 +151,14 @@ spawn_child(krb5_context context, int *socks,
     pid = fork();
     if(pid == 0) {
 	for(i = 0; i < num_socks; i++)
-	    closesocket(socks[i]);
+	    rk_closesocket(socks[i]);
 	dup2(s, STDIN_FILENO);
 	dup2(s, STDOUT_FILENO);
 	if(s != STDIN_FILENO && s != STDOUT_FILENO)
-	    closesocket(s);
+	    rk_closesocket(s);
 	return 0;
     } else {
-	closesocket(s);
+	rk_closesocket(s);
     }
     return 1;
 }
@@ -270,12 +270,12 @@ start_server(krb5_context context)
 
 	    if (rk_IS_SOCKET_ERROR(bind (s, ap->ai_addr, ap->ai_addrlen))) {
 		krb5_warn(context, rk_SOCK_ERRNO, "bind");
-		closesocket(s);
+		rk_closesocket(s);
 		continue;
 	    }
 	    if (rk_IS_SOCKET_ERROR(listen (s, SOMAXCONN))) {
 		krb5_warn(context, rk_SOCK_ERRNO, "listen");
-		closesocket(s);
+		rk_closesocket(s);
 		continue;
 	    }
 	    socks[num_socks++] = s;
diff --git a/lib/kadm5/destroy_s.c b/lib/kadm5/destroy_s.c
index 393ffb914..cacbec752 100644
--- a/lib/kadm5/destroy_s.c
+++ b/lib/kadm5/destroy_s.c
@@ -56,7 +56,7 @@ static void
 destroy_kadm5_log_context (kadm5_log_context *c)
 {
     free (c->log_file);
-    closesocket (c->socket_fd);
+    rk_closesocket (c->socket_fd);
 #ifndef NO_UNIX_SOCKETS
     if (c->socket_info) {
 	freeaddrinfo(c->socket_info);
diff --git a/lib/kadm5/ipropd_master.c b/lib/kadm5/ipropd_master.c
index 17d19a8f5..490574003 100644
--- a/lib/kadm5/ipropd_master.c
+++ b/lib/kadm5/ipropd_master.c
@@ -196,7 +196,7 @@ slave_dead(krb5_context context, slave *s)
     krb5_warnx(context, "slave %s dead", s->name);
 
     if (!rk_IS_BAD_SOCKET(s->fd)) {
-	closesocket (s->fd);
+	rk_closesocket (s->fd);
 	s->fd = rk_INVALID_SOCKET;
     }
     s->flags |= SLAVE_F_DEAD;
@@ -209,7 +209,7 @@ remove_slave (krb5_context context, slave *s, slave **root)
     slave **p;
 
     if (!rk_IS_BAD_SOCKET(s->fd))
-	closesocket (s->fd);
+	rk_closesocket (s->fd);
     if (s->name)
 	free (s->name);
     if (s->ac)