From 4634af90783b76110e900d1d92e9ee71b612f1d5 Mon Sep 17 00:00:00 2001
From: Asanka Herath <asanka@secure-endpoints.com>
Date: Mon, 14 Sep 2009 13:50:10 -0400
Subject: [PATCH] Consistent use of SOCKET data type in lib/krb5

---
 lib/krb5/auth_context.c | 12 ++++++------
 lib/krb5/changepw.c     |  4 +++-
 lib/krb5/send_to_kdc.c  |  2 ++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/krb5/auth_context.c b/lib/krb5/auth_context.c
index 38f3e3224..610a424b2 100644
--- a/lib/krb5/auth_context.c
+++ b/lib/krb5/auth_context.c
@@ -157,7 +157,7 @@ krb5_auth_con_setaddrs(krb5_context context,
 KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_auth_con_genaddrs(krb5_context context,
 		       krb5_auth_context auth_context,
-		       int fd, int flags)
+		       SOCKET fd, int flags)
 {
     krb5_error_code ret;
     krb5_address local_k_address, remote_k_address;
@@ -170,9 +170,9 @@ krb5_auth_con_genaddrs(krb5_context context,
     if(flags & KRB5_AUTH_CONTEXT_GENERATE_LOCAL_ADDR) {
 	if (auth_context->local_address == NULL) {
 	    len = sizeof(ss_local);
-	    if(getsockname(fd, local, &len) < 0) {
+	    if(IS_SOCKET_ERROR(getsockname(fd, local, &len))) {
 		char buf[128];
-		ret = errno;
+		ret = SOCK_ERRNO;
 		strerror_r(ret, buf, sizeof(buf));
 		krb5_set_error_message(context, ret, "getsockname: %s", buf);
 		goto out;
@@ -188,9 +188,9 @@ krb5_auth_con_genaddrs(krb5_context context,
     }
     if(flags & KRB5_AUTH_CONTEXT_GENERATE_REMOTE_ADDR) {
 	len = sizeof(ss_remote);
-	if(getpeername(fd, remote, &len) < 0) {
+	if(IS_SOCKET_ERROR(getpeername(fd, remote, &len))) {
 	    char buf[128];
-	    ret = errno;
+	    ret = SOCK_ERRNO;
 	    strerror_r(ret, buf, sizeof(buf));
 	    krb5_set_error_message(context, ret, "getpeername: %s", buf);
 	    goto out;
@@ -221,7 +221,7 @@ krb5_auth_con_setaddrs_from_fd (krb5_context context,
 				krb5_auth_context auth_context,
 				void *p_fd)
 {
-    int fd = *(int*)p_fd;
+    SOCKET fd = *(SOCKET*)p_fd;
     int flags = 0;
     if(auth_context->local_address == NULL)
 	flags |= KRB5_AUTH_CONTEXT_GENERATE_LOCAL_FULL_ADDR;
diff --git a/lib/krb5/changepw.c b/lib/krb5/changepw.c
index 5b7868ff2..7d51c5c1b 100644
--- a/lib/krb5/changepw.c
+++ b/lib/krb5/changepw.c
@@ -602,7 +602,8 @@ change_password_loop (krb5_context	context,
 			goto out;
 		    }
 		}
-	
+
+#ifndef NO_LIMIT_FD_SETSIZE	
 		if (sock >= FD_SETSIZE) {
 		    ret = ERANGE;
 		    krb5_set_error_message(context, ret,
@@ -610,6 +611,7 @@ change_password_loop (krb5_context	context,
 		    close (sock);
 		    goto out;
 		}
+#endif
 
 		FD_ZERO(&fdset);
 		FD_SET(sock, &fdset);
diff --git a/lib/krb5/send_to_kdc.c b/lib/krb5/send_to_kdc.c
index 54dec6c34..e184db460 100644
--- a/lib/krb5/send_to_kdc.c
+++ b/lib/krb5/send_to_kdc.c
@@ -58,9 +58,11 @@ recv_loop (SOCKET fd,
      int ret;
      int nbytes;
 
+#ifndef NO_LIMIT_FD_SETSIZE
      if (fd >= FD_SETSIZE) {
 	 return -1;
      }
+#endif
 
      krb5_data_zero(rep);
      do {
-- 
2.11.4.GIT