oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

httpkadmind: Fix warnings

Browse Source
This commit is contained in:
Nicolas Williams
2022-01-14 17:57:51 -06:00
parent 5dcad4635b
commit 5a3706db5b
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kdc/httpkadmind.c
View File

@@ -716,7 +716,8 @@ bad_reqv(kadmin_request_desc r,
if (r && r->hcontext && r->kv) if (r && r->hcontext && r->kv)
heim_audit_setkv_number((heim_svc_req_desc)r, "http-status-code", heim_audit_setkv_number((heim_svc_req_desc)r, "http-status-code",
http_status_code); http_status_code);
(void) gettimeofday(&r->tv_end, NULL); if (r)
(void) gettimeofday(&r->tv_end, NULL);
if (code == ENOMEM) { if (code == ENOMEM) {
if (context) if (context)
krb5_log_msg(context, logfac, 1, NULL, "Out of memory"); krb5_log_msg(context, logfac, 1, NULL, "Out of memory");
@@ -1203,7 +1204,7 @@ make_kstuple(krb5_context context,
if (p->n_key_data < 1) if (p->n_key_data < 1)
return 0; return 0;
*kstuple = calloc(p->n_key_data, sizeof (*kstuple)); *kstuple = calloc(p->n_key_data, sizeof (**kstuple));
for (i = 0; *kstuple && i < p->n_key_data; i++) { for (i = 0; *kstuple && i < p->n_key_data; i++) {
if (p->key_data[i].key_data_kvno == p->kvno) { if (p->key_data[i].key_data_kvno == p->kvno) {
(*kstuple)[i].ks_enctype = p->key_data[i].key_data_type[0]; (*kstuple)[i].ks_enctype = p->key_data[i].key_data_type[0];
@@ -1431,6 +1432,8 @@ get_keysN(kadmin_request_desc r, const char *method)
ret = heim_array_append_value(r->service_names, s); ret = heim_array_append_value(r->service_names, s);
heim_release(s); heim_release(s);
nsvcs = 1; nsvcs = 1;
if (ret)
return bad_503(r, ret, "Out of memory");
} }
/* FIXME: Make this configurable */ /* FIXME: Make this configurable */
@@ -1658,6 +1661,8 @@ get_config(kadmin_request_desc r)
ret = get_kadm_handle(r->context, r->realm ? r->realm : realm, ret = get_kadm_handle(r->context, r->realm ? r->realm : realm,
0 /* want_write */, &r->kadm_handle); 0 /* want_write */, &r->kadm_handle);
if (ret)
return bad_503(r, ret, "Could not access KDC database");
memset(&princ, 0, sizeof(princ)); memset(&princ, 0, sizeof(princ));
princ.key_data = NULL; princ.key_data = NULL;
@@ -2122,6 +2127,8 @@ main(int argc, char **argv)
argc -= optidx; argc -= optidx;
argv += optidx; argv += optidx;
if (argc != 0)
usage(1);
if ((errno = pthread_key_create(&k5ctx, k5_free_context))) if ((errno = pthread_key_create(&k5ctx, k5_free_context)))
err(1, "Could not create thread-specific storage"); err(1, "Could not create thread-specific storage");