Changed errno to SOCKET_ERRNO/SOCKET_SET_ERRNO for Mac OT SocketsLib

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

7 files changed, 47 insertions, 37 deletions

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 0b12d76a3..d230bc635 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,23 @@
+Tue Jun  8 15:26:21 1999  Alexandra Ellwood  <lxs@mit.edu>
+
+	* changepw.c: Changed errno to SOCKET_ERRNO/SOCKET_SET_ERRNO
+	    after socket operations to work with new Mac OT SocketsLib.
+	
+	* hst_realm.c: Changed errno to SOCKET_ERRNO/SOCKET_SET_ERRNO
+	    after socket operations to work with new Mac OT SocketsLib.
+	
+	* localaddr.c: Changed errno to SOCKET_ERRNO/SOCKET_SET_ERRNO
+	    after socket operations to work with new Mac OT SocketsLib.
+	
+	* net_read.c: Changed errno to SOCKET_ERRNO/SOCKET_SET_ERRNO
+	    after socket operations to work with new Mac OT SocketsLib.
+	
+	* net_write.c: Changed errno to SOCKET_ERRNO/SOCKET_SET_ERRNO
+	    after socket operations to work with new Mac OT SocketsLib.
+	
+	* sn2princ.c: Changed errno to SOCKET_ERRNO/SOCKET_SET_ERRNO
+	    after socket operations to work with new Mac OT SocketsLib.
+
 Mon May 10 15:26:20 1999  Danilo Almeida  <dalmeida@mit.edu>
 
 	* Makefile.in: Do win32 build in subdir.
diff --git a/src/lib/krb5/os/changepw.c b/src/lib/krb5/os/changepw.c
index 41cad5fa9..e159f2090 100644
--- a/src/lib/krb5/os/changepw.c
+++ b/src/lib/krb5/os/changepw.c
@@ -207,39 +207,35 @@ krb5_change_password(context, creds, newpw, result_code,
 
     if ((s1 = socket(AF_INET, SOCK_DGRAM, 0)) == INVALID_SOCKET) {
 	free(addr_p);
-	return(errno);
+	return(SOCKET_ERRNO);
     }
 
     if ((s2 = socket(AF_INET, SOCK_DGRAM, 0)) == INVALID_SOCKET) {
 	free(addr_p);
-	return(errno);
+	return(SOCKET_ERRNO);
     }
 
     for (i=0; i<out; i++) {
 	if (connect(s2, &addr_p[i], sizeof(addr_p[i])) == SOCKET_ERROR) {
-#ifndef HAVE_MACSOCK_H
-	    if ((cc < 0) && ((errno == ECONNREFUSED) ||
-			     (errno == EHOSTUNREACH)))
-#endif
+	    if ((cc < 0) && ((SOCKET_ERRNO == ECONNREFUSED) ||
+			     (SOCKET_ERRNO == EHOSTUNREACH)))
 		continue; /* try the next addr */
 	    free(addr_p);
 	    closesocket(s1);
 	    closesocket(s2);
-	    return(errno);
+	    return(SOCKET_ERRNO);
 	}
 
 	addrlen = sizeof(local_addr);
 
 	if (getsockname(s2, &local_addr, &addrlen) < 0) {
-#ifndef HAVE_MACSOCK_H
-	    if ((errno == ECONNREFUSED) ||
-		(errno == EHOSTUNREACH))
-#endif
+	    if ((SOCKET_ERRNO == ECONNREFUSED) ||
+		(SOCKET_ERRNO == EHOSTUNREACH))
 		continue; /* try the next addr */
 	    free(addr_p);
 	    closesocket(s1);
 	    closesocket(s2);
-	    return(errno);
+	    return(SOCKET_ERRNO);
 	}
 
 	/* some brain-dead OS's don't return useful information from
@@ -266,15 +262,13 @@ krb5_change_password(context, creds, newpw, result_code,
 
 	addrlen = sizeof(remote_addr);
 	if (getpeername(s2, &remote_addr, &addrlen) < 0) {
-#ifndef HAVE_MACSOCK_H
-	    if ((errno == ECONNREFUSED) ||
-		(errno == EHOSTUNREACH))
-#endif
+	    if ((SOCKET_ERRNO == ECONNREFUSED) ||
+		(SOCKET_ERRNO == EHOSTUNREACH))
 		continue; /* try the next addr */
 	    free(addr_p);
 	    closesocket(s1);
 	    closesocket(s2);
-	    return(errno);
+	    return(SOCKET_ERRNO);
 	}
 
 	remote_kaddr.addrtype = ADDRTYPE_INET;
@@ -317,15 +311,13 @@ krb5_change_password(context, creds, newpw, result_code,
 			 (struct sockaddr *) &addr_p[i],
 			 sizeof(addr_p[i]))) !=
 	    chpw_req.length) {
-#ifndef HAVE_MACSOCK_H
-	    if ((cc < 0) && ((errno == ECONNREFUSED) ||
-			     (errno == EHOSTUNREACH)))
-#endif
+	    if ((cc < 0) && ((SOCKET_ERRNO == ECONNREFUSED) ||
+			     (SOCKET_ERRNO == EHOSTUNREACH)))
 		continue; /* try the next addr */
 	    free(addr_p);
 	    closesocket(s1);
 	    closesocket(s2);
-	    return((cc < 0)?errno:ECONNABORTED);
+	    return((cc < 0)?SOCKET_ERRNO:ECONNABORTED);
 	}
 
 	krb5_xfree(chpw_req.data);
@@ -348,7 +340,7 @@ krb5_change_password(context, creds, newpw, result_code,
 	    free(addr_p);
 	    closesocket(s1);
 	    closesocket(s2);
-	    return(errno);
+	    return(SOCKET_ERRNO);
 	}
 
 	closesocket(s1);
@@ -395,5 +387,5 @@ krb5_change_password(context, creds, newpw, result_code,
     free(addr_p);
     closesocket(s1);
     closesocket(s2);
-    return(errno);
+    return(SOCKET_ERRNO);
 }
diff --git a/src/lib/krb5/os/hst_realm.c b/src/lib/krb5/os/hst_realm.c
index b782a0359..0143c343d 100644
--- a/src/lib/krb5/os/hst_realm.c
+++ b/src/lib/krb5/os/hst_realm.c
@@ -93,7 +93,7 @@ krb5_get_host_realm(context, host, realmsp)
 	strncpy(local_host, host, MAXHOSTNAMELEN);
     else {
 	if (gethostname(local_host, sizeof(local_host)-1) == -1)
-	    return errno;
+	    return SOCKET_ERRNO;
     }
     local_host[sizeof(local_host)-1] = '\0';
     for (cp = local_host; *cp; cp++) {
diff --git a/src/lib/krb5/os/localaddr.c b/src/lib/krb5/os/localaddr.c
index 8dd402e49..f55c35c78 100644
--- a/src/lib/krb5/os/localaddr.c
+++ b/src/lib/krb5/os/localaddr.c
@@ -123,7 +123,7 @@ krb5_os_localaddr(context, addr)
     
     s = socket (USE_AF, USE_TYPE, USE_PROTO);
     if (s < 0)
-	return errno;
+	return SOCKET_ERRNO;
 
     code = ioctl (s, SIOCGIFCONF, (char *)&ifc);
     if (code < 0) {
@@ -303,13 +303,13 @@ krb5_os_localaddr (krb5_context context, krb5_address ***addr) {
     err = 0;
     
     if (gethostname (host, sizeof(host))) {
-        err = WSAGetLastError();
+        err = SOCKET_ERRNO;
     }
 
     if (!err) {
 	    hostrec = gethostbyname (host);
 	    if (hostrec == NULL) {
-		    err = WSAGetLastError();
+		    err = SOCKET_ERRNO;
 	    }
     }
 
diff --git a/src/lib/krb5/os/net_read.c b/src/lib/krb5/os/net_read.c
index 9d3f52bdf..2b8a69241 100644
--- a/src/lib/krb5/os/net_read.c
+++ b/src/lib/krb5/os/net_read.c
@@ -50,10 +50,10 @@ krb5_net_read(context, fd, buf, len)
 	if (cc < 0) {
 	    if (SOCKET_ERRNO == SOCKET_EINTR)
 		continue;
-#if defined(_MSDOS) || (_WIN32)
-            /* XXX this interface sucks! */
-            errno = SOCKET_ERRNO;
-#endif            
+		
+		/* XXX this interface sucks! */
+        errno = SOCKET_ERRNO;    
+               
 	    return(cc);		 /* errno is already set */
 	}		
 	else if (cc == 0) {
diff --git a/src/lib/krb5/os/net_write.c b/src/lib/krb5/os/net_write.c
index bea342880..e959d68c9 100644
--- a/src/lib/krb5/os/net_write.c
+++ b/src/lib/krb5/os/net_write.c
@@ -49,10 +49,8 @@ krb5_net_write(context, fd, buf, len)
 	if (cc < 0) {
 	    if (SOCKET_ERRNO == SOCKET_EINTR)
 		continue;
-#if defined(_MSDOS) || (_WIN32)
-            /* XXX this interface sucks! */
-            errno = SOCKET_ERRNO;
-#endif            
+		/* XXX this interface sucks! */
+        errno = SOCKET_ERRNO;           
 	    return(cc);
 	}
 	else {
diff --git a/src/lib/krb5/os/sn2princ.c b/src/lib/krb5/os/sn2princ.c
index f21885929..766aa658e 100644
--- a/src/lib/krb5/os/sn2princ.c
+++ b/src/lib/krb5/os/sn2princ.c
@@ -53,7 +53,7 @@ krb5_sname_to_principal(context, hostname, sname, type, ret_princ)
 	/* if hostname is NULL, use local hostname */
 	if (! hostname) {
 	    if (gethostname(localname, MAXHOSTNAMELEN))
-		return errno;
+		return SOCKET_ERRNO;
 	    hostname = localname;
 	}