evin/ms-nfs41-client
3
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixing memory leaks in rpc client

Browse source
This commit is contained in:
unknown 2010-12-09 18:36:05 -05:00
parent 0d0b00a93b
commit a645f7030c
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
daemon/nfs41_rpc.c
View file

@ -143,20 +143,20 @@ int nfs41_rpc_clnt_create(
&server_name, &client, &addr_index); &server_name, &client, &addr_index);
if (status) { if (status) {
clnt_pcreateerror("connecting failed"); clnt_pcreateerror("connecting failed");
goto out_free_rpc_clnt; goto out_free_rpc_cond;
} }
if (send_null(client) != RPC_SUCCESS) { if (send_null(client) != RPC_SUCCESS) {
// XXX Do what here? // XXX Do what here?
eprintf("nfs41_rpc_clnt_create: send_null failed\n"); eprintf("nfs41_rpc_clnt_create: send_null failed\n");
status = ERROR_NETWORK_UNREACHABLE; status = ERROR_NETWORK_UNREACHABLE;
goto out_err_auth; goto out_err_client;
} }
switch (sec_flavor) { switch (sec_flavor) {
case RPCSEC_AUTH_SYS: case RPCSEC_AUTH_SYS:
if (gethostname(machname, sizeof(machname)) == -1) { if (gethostname(machname, sizeof(machname)) == -1) {
eprintf("nfs41_rpc_clnt_create: gethostname failed\n"); eprintf("nfs41_rpc_clnt_create: gethostname failed\n");
goto out_free_rpc_clnt; goto out_err_client;
} }
machname[sizeof(machname) - 1] = '\0'; machname[sizeof(machname) - 1] = '\0';
client->cl_auth = authsys_create(machname, uid, gid, 0, gids); client->cl_auth = authsys_create(machname, uid, gid, 0, gids);
@ -207,11 +207,11 @@ int nfs41_rpc_clnt_create(
*rpc_out = rpc; *rpc_out = rpc;
out: out:
return status; return status;
out_err_auth:
auth_destroy(client->cl_auth);
out_err_client: out_err_client:
CloseHandle(rpc->cond);
clnt_destroy(client); clnt_destroy(client);
out_free_rpc_cond:
CloseHandle(rpc->cond);
free(server_name);
out_free_rpc_clnt: out_free_rpc_clnt:
free(rpc); free(rpc);
goto out; goto out;
@ -269,6 +269,7 @@ static int rpc_reconnect(
if (status) if (status)
goto out_unlock; goto out_unlock;
free(server_name);
client->cl_auth = rpc->rpc->cl_auth; client->cl_auth = rpc->rpc->cl_auth;
if (send_null(client) != RPC_SUCCESS) if (send_null(client) != RPC_SUCCESS)
goto out_err_client; goto out_err_client;