diff options
| author | Jeffrey Altman <jaltman@secure-endpoints.com> | 2008-07-23 20:55:56 +0000 |
|---|---|---|
| committer | Jeffrey Altman <jaltman@secure-endpoints.com> | 2008-07-23 20:55:56 +0000 |
| commit | 4b6f2fd2ea29a84fec63b328846bfb31bb85268e (patch) | |
| tree | 4bbaf4d65bd8675864cf9fc63b1d8d178108a84f /src/lib/rpc/clnt_tcp.c | |
| parent | 98c76f65487d15d730ff184ef949519ff04e0554 (diff) | |
| download | krb5-4b6f2fd2ea29a84fec63b328846bfb31bb85268e.tar.gz krb5-4b6f2fd2ea29a84fec63b328846bfb31bb85268e.tar.xz krb5-4b6f2fd2ea29a84fec63b328846bfb31bb85268e.zip | |
In the gss rpc package, replace the type used for a
socket on Windows with SOCKET (instead of int) and
replace all calls to close() that are used to close
sockets with closesocket().
src/include/port-sockets.h includes the definitions
of SOCKET and closesocket() for non-Windows systems.
ticket: 6041
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20578 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/rpc/clnt_tcp.c')
| -rw-r--r-- | src/lib/rpc/clnt_tcp.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/lib/rpc/clnt_tcp.c b/src/lib/rpc/clnt_tcp.c index 1f8de8276..dc7e2ff50 100644 --- a/src/lib/rpc/clnt_tcp.c +++ b/src/lib/rpc/clnt_tcp.c @@ -60,6 +60,7 @@ static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro"; #include <gssrpc/pmap_clnt.h> /* FD_ZERO may need memset declaration (e.g., Solaris 9) */ #include <string.h> +#include <port-sockets.h> #define MCALL_MSG_SIZE 24 @@ -118,7 +119,7 @@ clnttcp_create( struct sockaddr_in *raddr, rpcprog_t prog, rpcvers_t vers, - register int *sockp, + SOCKET *sockp, u_int sendsz, u_int recvsz) { @@ -166,7 +167,7 @@ clnttcp_create( sizeof(*raddr)) < 0)) { rpc_createerr.cf_stat = RPC_SYSTEMERROR; rpc_createerr.cf_error.re_errno = errno; - (void)close(*sockp); + (void)closesocket(*sockp); goto fooy; } ct->ct_closeit = TRUE; @@ -198,9 +199,8 @@ clnttcp_create( xdrmem_create(&(ct->ct_xdrs), ct->ct_u.ct_mcall, MCALL_MSG_SIZE, XDR_ENCODE); if (! xdr_callhdr(&(ct->ct_xdrs), &call_msg)) { - if (ct->ct_closeit) { - (void)close(*sockp); - } + if (ct->ct_closeit) + (void)closesocket(*sockp); goto fooy; } ct->ct_mpos = XDR_GETPOS(&(ct->ct_xdrs)); @@ -404,9 +404,8 @@ clnttcp_destroy(CLIENT *h) register struct ct_data *ct = (struct ct_data *) h->cl_private; - if (ct->ct_closeit) { - (void)close(ct->ct_sock); - } + if (ct->ct_closeit) + (void)closesocket(ct->ct_sock); XDR_DESTROY(&(ct->ct_xdrs)); mem_free((caddr_t)ct, sizeof(struct ct_data)); mem_free((caddr_t)h, sizeof(CLIENT)); |