diff options
| -rw-r--r-- | src/kadmin/server/server_stubs.c | 2 | ||||
| -rw-r--r-- | src/kdc/network.c | 2 | ||||
| -rw-r--r-- | src/lib/krb5/krb/mk_cred.c | 2 | ||||
| -rw-r--r-- | src/slave/kprop.c | 4 |
4 files changed, 4 insertions, 6 deletions
diff --git a/src/kadmin/server/server_stubs.c b/src/kadmin/server/server_stubs.c index cf93e8667..a6435acf9 100644 --- a/src/kadmin/server/server_stubs.c +++ b/src/kadmin/server/server_stubs.c @@ -1631,7 +1631,7 @@ generic_ret *init_2_svc(krb5_ui_4 *arg, struct svc_req *rqstp) } if (ret.code != 0) - errmsg = krb5_get_error_message(handle ? handle->context : NULL, ret.code); + errmsg = krb5_get_error_message(NULL, ret.code); else errmsg = "success"; diff --git a/src/kdc/network.c b/src/kdc/network.c index 82b1c7768..1072fce3d 100644 --- a/src/kdc/network.c +++ b/src/kdc/network.c @@ -1086,10 +1086,8 @@ static void process_packet(struct connection *conn, const char *prog, return; } if (cc != response->length) { - krb5_free_data(kdc_context, response); com_err(prog, 0, "short reply write %d vs %d\n", response->length, cc); - return; } krb5_free_data(kdc_context, response); return; diff --git a/src/lib/krb5/krb/mk_cred.c b/src/lib/krb5/krb/mk_cred.c index cb4464717..3479aa29e 100644 --- a/src/lib/krb5/krb/mk_cred.c +++ b/src/lib/krb5/krb/mk_cred.c @@ -183,8 +183,8 @@ krb5_mk_ncred(krb5_context context, krb5_auth_context auth_context, if ((pcred->tickets = (krb5_ticket **)malloc(sizeof(krb5_ticket *) * (ncred + 1))) == NULL) { - retval = ENOMEM; free(pcred); + return ENOMEM; } memset(pcred->tickets, 0, sizeof(krb5_ticket *) * (ncred +1)); diff --git a/src/slave/kprop.c b/src/slave/kprop.c index b2ea2c2b3..42bc8fbda 100644 --- a/src/slave/kprop.c +++ b/src/slave/kprop.c @@ -1,7 +1,7 @@ /* * slave/kprop.c * - * Copyright 1990,1991 by the Massachusetts Institute of Technology. + * Copyright 1990,1991,2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * * Export of this software from the United States of America may @@ -505,12 +505,12 @@ open_database(context, data_fn, size) free(data_ok_fn); exit(1); } - free(data_ok_fn); if (stbuf.st_mtime > stbuf_ok.st_mtime) { com_err(progname, 0, "'%s' more recent than '%s'.", data_fn, data_ok_fn); exit(1); } + free(data_ok_fn); *size = stbuf.st_size; return(fd); } |