diff options
author | Alexandra Ellwood <lxs@mit.edu> | 2008-09-29 05:21:46 +0000 |
---|---|---|
committer | Alexandra Ellwood <lxs@mit.edu> | 2008-09-29 05:21:46 +0000 |
commit | 24a254f9e8d3c12f606f22ec7809cfce9da8088b (patch) | |
tree | 6062409b0a0200ce2fce442115fca546793d5c31 /src/util/mac/k5_mig_client.c | |
parent | d8376090e786f0c6357fb238ea5cbcc412c1bad5 (diff) | |
download | krb5-24a254f9e8d3c12f606f22ec7809cfce9da8088b.tar.gz krb5-24a254f9e8d3c12f606f22ec7809cfce9da8088b.tar.xz krb5-24a254f9e8d3c12f606f22ec7809cfce9da8088b.zip |
Removed useless init and cleanup functions.
Fixed request port list handling.
ticket: 6055
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20778 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/util/mac/k5_mig_client.c')
-rw-r--r-- | src/util/mac/k5_mig_client.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/util/mac/k5_mig_client.c b/src/util/mac/k5_mig_client.c index d0556fa842..166704204f 100644 --- a/src/util/mac/k5_mig_client.c +++ b/src/util/mac/k5_mig_client.c @@ -52,7 +52,7 @@ static int k5_cli_ipc_thread_init (void) { int err = 0; - err = k5_key_register (K5_KEY_IPC_REQUEST_PORT, free); + err = k5_key_register (K5_KEY_IPC_REQUEST_PORTS, free); if (!err) { err = k5_key_register (K5_KEY_IPC_REPLY_STREAM, NULL); @@ -69,7 +69,7 @@ static int k5_cli_ipc_thread_init (void) static void k5_cli_ipc_thread_fini (void) { - k5_key_delete (K5_KEY_IPC_REQUEST_PORT); + k5_key_delete (K5_KEY_IPC_REQUEST_PORTS); k5_key_delete (K5_KEY_IPC_REPLY_STREAM); k5_key_delete (K5_KEY_IPC_SERVER_DIED); } @@ -191,25 +191,25 @@ int32_t k5_ipc_send_request (const char *in_service_id, } if (!err) { - k5_ipc_request_port *request_ports = NULL; + k5_ipc_request_port *port_list = NULL; - request_ports = k5_getspecific (K5_KEY_IPC_REQUEST_PORT); + port_list = k5_getspecific (K5_KEY_IPC_REQUEST_PORTS); - if (!request_ports) { - int size = sizeof (*request_ports) * KIPC_SERVICE_COUNT; + if (!port_list) { + int size = sizeof (*port_list) * KIPC_SERVICE_COUNT; - request_ports = malloc (size); - if (!request_port) { err = ENOMEM; } + port_list = malloc (size); + if (!port_list) { err = ENOMEM; } if (!err) { int i; for (i = 0; i < KIPC_SERVICE_COUNT; i++) { - request_ports[i].service_id = k5_ipc_known_ports [i].service_id; - request_ports[i].port = k5_ipc_known_ports [i].port; + port_list[i].service_id = k5_ipc_known_ports[i].service_id; + port_list[i].port = k5_ipc_known_ports[i].port; } - err = k5_setspecific (K5_KEY_IPC_REQUEST_PORT, request_ports); + err = k5_setspecific (K5_KEY_IPC_REQUEST_PORTS, port_list); } } @@ -217,9 +217,10 @@ int32_t k5_ipc_send_request (const char *in_service_id, int i, found = 0; for (i = 0; i < KIPC_SERVICE_COUNT; i++) { - if (!strcmp (in_service_id, request_ports[i].service_id)) { + if (!strcmp (in_service_id, port_list[i].service_id)) { found = 1; - request_port = &request_ports[i].port; + request_port = &port_list[i].port; + break; } } |