diff options
Diffstat (limited to 'src/lib/kadm5/misc_free.c')
-rw-r--r-- | src/lib/kadm5/misc_free.c | 85 |
1 files changed, 43 insertions, 42 deletions
diff --git a/src/lib/kadm5/misc_free.c b/src/lib/kadm5/misc_free.c index b0e3d24ee..17c8cccac 100644 --- a/src/lib/kadm5/misc_free.c +++ b/src/lib/kadm5/misc_free.c @@ -1,3 +1,4 @@ +/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ /* * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved * @@ -7,9 +8,9 @@ #if !defined(lint) && !defined(__CODECENTER__) static char *rcsid = "$Header$"; #endif -#include <kadm5/admin.h> -#include <stdlib.h> -#include "server_internal.h" +#include <kadm5/admin.h> +#include <stdlib.h> +#include "server_internal.h" kadm5_ret_t kadm5_free_policy_ent(void *server_handle, kadm5_policy_ent_t val) @@ -17,54 +18,54 @@ kadm5_free_policy_ent(void *server_handle, kadm5_policy_ent_t val) _KADM5_CHECK_HANDLE(server_handle); if (val) - free(val->policy); + free(val->policy); return KADM5_OK; } kadm5_ret_t - kadm5_free_name_list(void *server_handle, char **names, int count) +kadm5_free_name_list(void *server_handle, char **names, int count) { _KADM5_CHECK_HANDLE(server_handle); - + while (count--) - free(names[count]); - free(names); + free(names[count]); + free(names); return KADM5_OK; } /* XXX this ought to be in libkrb5.a, but isn't */ kadm5_ret_t krb5_free_key_data_contents(context, key) - krb5_context context; - krb5_key_data *key; + krb5_context context; + krb5_key_data *key; { - int i, idx; - - idx = (key->key_data_ver == 1 ? 1 : 2); - for (i = 0; i < idx; i++) { - if (key->key_data_contents[i]) { - memset(key->key_data_contents[i], 0, key->key_data_length[i]); - free(key->key_data_contents[i]); - } - } - return KADM5_OK; + int i, idx; + + idx = (key->key_data_ver == 1 ? 1 : 2); + for (i = 0; i < idx; i++) { + if (key->key_data_contents[i]) { + memset(key->key_data_contents[i], 0, key->key_data_length[i]); + free(key->key_data_contents[i]); + } + } + return KADM5_OK; } kadm5_ret_t kadm5_free_key_data(void *server_handle, - krb5_int16 *n_key_data, - krb5_key_data *key_data) + krb5_int16 *n_key_data, + krb5_key_data *key_data) { - kadm5_server_handle_t handle = server_handle; - int i, nkeys = (int) *n_key_data; - - _KADM5_CHECK_HANDLE(server_handle); - - if (key_data == NULL) - return KADM5_OK; - - for (i = 0; i < nkeys; i++) - krb5_free_key_data_contents(handle->context, &key_data[i]); - free(key_data); - return KADM5_OK; + kadm5_server_handle_t handle = server_handle; + int i, nkeys = (int) *n_key_data; + + _KADM5_CHECK_HANDLE(server_handle); + + if (key_data == NULL) + return KADM5_OK; + + for (i = 0; i < nkeys; i++) + krb5_free_key_data_contents(handle->context, &key_data[i]); + free(key_data); + return KADM5_OK; } kadm5_ret_t @@ -77,22 +78,22 @@ kadm5_free_principal_ent(void *server_handle, kadm5_principal_ent_t val) _KADM5_CHECK_HANDLE(server_handle); if (!val) - return KADM5_OK; + return KADM5_OK; krb5_free_principal(handle->context, val->principal); krb5_free_principal(handle->context, val->mod_name); free(val->policy); if (val->n_key_data) { - for (i = 0; i < val->n_key_data; i++) - krb5_free_key_data_contents(handle->context, &val->key_data[i]); - free(val->key_data); + for (i = 0; i < val->n_key_data; i++) + krb5_free_key_data_contents(handle->context, &val->key_data[i]); + free(val->key_data); } while (val->tl_data) { - tl = val->tl_data->tl_data_next; - free(val->tl_data->tl_data_contents); - free(val->tl_data); - val->tl_data = tl; + tl = val->tl_data->tl_data_next; + free(val->tl_data->tl_data_contents); + free(val->tl_data); + val->tl_data = tl; } return KADM5_OK; } |