From 393a59785899f71a438db5311136a4ffa55d688f Mon Sep 17 00:00:00 2001
From: Asanka Herath <asanka@secure-endpoints.com>
Date: Thu, 26 Nov 2009 01:42:57 -0500
Subject: [PATCH] SOCK_INIT/SOCK_EXIT -> rk_SOCK_INIT/rk_SOCK_EXIT and
 net_write_s() -> net_write()

---
 lib/krb5/context.c     | 4 ++--
 lib/krb5/send_to_kdc.c | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/krb5/context.c b/lib/krb5/context.c
index d3dcb3064..3cc02f561 100644
--- a/lib/krb5/context.c
+++ b/lib/krb5/context.c
@@ -363,7 +363,7 @@ krb5_init_context(krb5_context *context)
     if (ret)
 	goto out;
 #endif	
-    if (SOCK_INIT())
+    if (rk_SOCK_INIT())
 	p->flags |= KRB5_CTX_F_SOCKETS_INITIALIZED;
 
 out:
@@ -534,7 +534,7 @@ krb5_free_context(krb5_context context)
     HEIMDAL_MUTEX_destroy(context->mutex);
     free(context->mutex);
     if (context->flags & KRB5_CTX_F_SOCKETS_INITIALIZED) {
- 	SOCK_EXIT();
+ 	rk_SOCK_EXIT();
     }
 
     memset(context, 0, sizeof(*context));
diff --git a/lib/krb5/send_to_kdc.c b/lib/krb5/send_to_kdc.c
index c539babb8..83f27ac36 100644
--- a/lib/krb5/send_to_kdc.c
+++ b/lib/krb5/send_to_kdc.c
@@ -80,7 +80,7 @@ recv_loop (krb5_socket_t fd,
 	 } else {
 	     void *tmp;
 
-	     if (SOCK_IOCTL (fd, FIONREAD, &nbytes) < 0) {
+	     if (rk_SOCK_IOCTL (fd, FIONREAD, &nbytes) < 0) {
 		 krb5_data_free (rep);
 		 return -1;
 	     }
@@ -142,9 +142,9 @@ send_and_recv_tcp(krb5_socket_t fd,
     krb5_data len_data;
 
     _krb5_put_int(len, req->length, 4);
-    if(net_write_s(fd, len, sizeof(len)) < 0)
+    if(net_write(fd, len, sizeof(len)) < 0)
 	return -1;
-    if(net_write_s(fd, req->data, req->length) < 0)
+    if(net_write(fd, req->data, req->length) < 0)
 	return -1;
     if (recv_loop (fd, tmout, 0, 4, &len_data) < 0)
 	return -1;
@@ -194,7 +194,7 @@ send_and_recv_http(krb5_socket_t fd,
     free(str);
     if (request == NULL)
 	return -1;
-    ret = net_write_s (fd, request, strlen(request));
+    ret = net_write (fd, request, strlen(request));
     free (request);
     if (ret < 0)
 	return ret;