summaryrefslogtreecommitdiffstats
path: root/src/lib/krb5
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/krb5')
-rw-r--r--src/lib/krb5/ccache/cc_file.c6
-rw-r--r--src/lib/krb5/ccache/cc_keyring.c6
-rw-r--r--src/lib/krb5/krb/copy_princ.c2
-rw-r--r--src/lib/krb5/krb/parse.c4
-rw-r--r--src/lib/krb5/rcache/rc_base.c16
-rw-r--r--src/lib/krb5/rcache/rc_conv.c4
-rw-r--r--src/lib/krb5/rcache/rc_io.c7
7 files changed, 20 insertions, 25 deletions
diff --git a/src/lib/krb5/ccache/cc_file.c b/src/lib/krb5/ccache/cc_file.c
index 9e54d1bdd..d8257a231 100644
--- a/src/lib/krb5/ccache/cc_file.c
+++ b/src/lib/krb5/ccache/cc_file.c
@@ -506,7 +506,7 @@ krb5_fcc_read_principal(krb5_context context, krb5_ccache id, krb5_principal *pr
}
tmpprinc->data = ALLOC (msize, krb5_data);
if (tmpprinc->data == 0) {
- free((char *)tmpprinc);
+ free(tmpprinc);
return KRB5_CC_NOMEM;
}
} else
@@ -531,8 +531,8 @@ krb5_fcc_read_principal(krb5_context context, krb5_ccache id, krb5_principal *pr
while(--i >= 0)
free(krb5_princ_component(context, tmpprinc, i)->data);
free(krb5_princ_realm(context, tmpprinc)->data);
- free((char *)tmpprinc->data);
- free((char *)tmpprinc);
+ free(tmpprinc->data);
+ free(tmpprinc);
return kret;
}
diff --git a/src/lib/krb5/ccache/cc_keyring.c b/src/lib/krb5/ccache/cc_keyring.c
index 528f43f06..9353fd497 100644
--- a/src/lib/krb5/ccache/cc_keyring.c
+++ b/src/lib/krb5/ccache/cc_keyring.c
@@ -1388,7 +1388,7 @@ krb5_krcc_parse_principal(krb5_context context, krb5_ccache id,
}
tmpprinc->data = ALLOC(msize, krb5_data);
if (tmpprinc->data == 0) {
- free((char *) tmpprinc);
+ free(tmpprinc);
return KRB5_CC_NOMEM;
}
} else
@@ -1415,8 +1415,8 @@ krb5_krcc_parse_principal(krb5_context context, krb5_ccache id,
while (--i >= 0)
free(krb5_princ_component(context, tmpprinc, i)->data);
free(krb5_princ_realm(context, tmpprinc)->data);
- free((char *) tmpprinc->data);
- free((char *) tmpprinc);
+ free(tmpprinc->data);
+ free(tmpprinc);
return kret;
}
diff --git a/src/lib/krb5/krb/copy_princ.c b/src/lib/krb5/krb/copy_princ.c
index 85dc816ad..14af7b5f3 100644
--- a/src/lib/krb5/krb/copy_princ.c
+++ b/src/lib/krb5/krb/copy_princ.c
@@ -49,7 +49,7 @@ krb5_copy_principal(krb5_context context, krb5_const_principal inprinc, krb5_pri
tempprinc->data = malloc(nelems * sizeof(krb5_data));
if (tempprinc->data == 0) {
- free((char *)tempprinc);
+ free(tempprinc);
return ENOMEM;
}
diff --git a/src/lib/krb5/krb/parse.c b/src/lib/krb5/krb/parse.c
index d55a488e3..5dd29fb43 100644
--- a/src/lib/krb5/krb/parse.c
+++ b/src/lib/krb5/krb/parse.c
@@ -148,7 +148,7 @@ k5_parse_name(krb5_context context, const char *name,
}
principal->data = (krb5_data *) malloc(sizeof(krb5_data) * components);
if (principal->data == NULL) {
- free((char *)principal);
+ free(principal);
return ENOMEM;
}
principal->length = components;
@@ -170,7 +170,7 @@ k5_parse_name(krb5_context context, const char *name,
retval = krb5_get_default_realm(context, &default_realm);
if (retval) {
free(principal->data);
- free((char *)principal);
+ free(principal);
return(retval);
}
default_realm_size = strlen(default_realm);
diff --git a/src/lib/krb5/rcache/rc_base.c b/src/lib/krb5/rcache/rc_base.c
index ad69282a4..ea532b3d7 100644
--- a/src/lib/krb5/rcache/rc_base.c
+++ b/src/lib/krb5/rcache/rc_base.c
@@ -15,8 +15,6 @@
#include "rc-int.h"
#include "k5-thread.h"
-#define FREE(x) ((void) free((char *) (x)))
-
struct krb5_rc_typelist {
const krb5_rc_ops *ops;
struct krb5_rc_typelist *next;
@@ -119,13 +117,13 @@ krb5_rc_default(krb5_context context, krb5_rcache *id)
if ((retval = krb5_rc_resolve_type(context, id,
krb5_rc_default_type(context)))) {
- FREE(*id);
+ free(*id);
return retval;
}
if ((retval = krb5_rc_resolve(context, *id,
krb5_rc_default_name(context)))) {
k5_mutex_destroy(&(*id)->lock);
- FREE(*id);
+ free(*id);
return retval;
}
(*id)->magic = KV5M_RCACHE;
@@ -154,19 +152,19 @@ krb5_error_code krb5_rc_resolve_full(krb5_context context, krb5_rcache *idptr,
type[residual - string_name] = '\0';
if (!(id = (krb5_rcache) malloc(sizeof(*id)))) {
- FREE(type);
+ free(type);
return KRB5_RC_MALLOC;
}
if ((retval = krb5_rc_resolve_type(context, &id,type))) {
- FREE(type);
- FREE(id);
+ free(type);
+ free(id);
return retval;
}
- FREE(type);
+ free(type);
if ((retval = krb5_rc_resolve(context, id,residual + 1))) {
k5_mutex_destroy(&id->lock);
- FREE(id);
+ free(id);
return retval;
}
id->magic = KV5M_RCACHE;
diff --git a/src/lib/krb5/rcache/rc_conv.c b/src/lib/krb5/rcache/rc_conv.c
index 3370f45df..2684929a6 100644
--- a/src/lib/krb5/rcache/rc_conv.c
+++ b/src/lib/krb5/rcache/rc_conv.c
@@ -11,8 +11,6 @@
* An implementation for the default replay cache type.
*/
-#define FREE(x) ((void) free((char *) (x)))
-
#include "rc_base.h"
/*
@@ -31,7 +29,7 @@ krb5_auth_to_rep(krb5_context context, krb5_tkt_authent *auth, krb5_donot_replay
return retval; /* shouldn't happen */
if ((retval = krb5_unparse_name(context, auth->authenticator->client,
&rep->client))) {
- FREE(rep->server);
+ free(rep->server);
return retval; /* shouldn't happen. */
}
return 0;
diff --git a/src/lib/krb5/rcache/rc_io.c b/src/lib/krb5/rcache/rc_io.c
index 82b56297b..683e1a907 100644
--- a/src/lib/krb5/rcache/rc_io.c
+++ b/src/lib/krb5/rcache/rc_io.c
@@ -40,7 +40,6 @@
#error find some way to use net-byte-order file version numbers.
#endif
-#define FREE(x) ((void) free((char *) (x)))
#define UNIQUE getpid() /* hopefully unique number */
#define GETDIR (dir = getdir(), dirlen = strlen(dir) + sizeof(PATH_SEPARATOR) - 1)
@@ -205,7 +204,7 @@ cleanup:
if (d->fn) {
if (!do_not_unlink)
(void) unlink(d->fn);
- FREE(d->fn);
+ free(d->fn);
d->fn = NULL;
}
if (d->fd != -1) {
@@ -299,7 +298,7 @@ cleanup:
if (d->fn) {
if (!do_not_unlink)
(void) unlink(d->fn);
- FREE(d->fn);
+ free(d->fn);
d->fn = NULL;
}
if (d->fd >= 0)
@@ -470,7 +469,7 @@ krb5_error_code
krb5_rc_io_close(krb5_context context, krb5_rc_iostuff *d)
{
if (d->fn != NULL) {
- FREE(d->fn);
+ free(d->fn);
d->fn = NULL;
}
if (d->fd != -1) {
generated by cgit (git 2.34.1) at 2025-02-25 13:47:21 +0000