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

iprop-log: Add missing error checks

Browse Source
This commit is contained in:
Nicolas Williams
2022-01-19 13:59:04 -06:00
parent ff4c82cd47
commit 9d6dd21256
1 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
lib/kadm5/iprop-log.c
View File

@@ -137,21 +137,29 @@ print_entry(kadm5_server_context *server_context,
entry_kind, op_names[op], ver, t, len); entry_kind, op_names[op], ver, t, len);
switch(op) { switch(op) {
case kadm_delete: case kadm_delete:
krb5_ret_principal(sp, &source); ret = krb5_ret_principal(sp, &source);
krb5_unparse_name(scontext, source, &name1); if (ret == 0)
ret = krb5_unparse_name(scontext, source, &name1);
if (ret)
krb5_err(scontext, 1, ret, "Failed to read a delete record");
printf(" %s\n", name1); printf(" %s\n", name1);
free(name1); free(name1);
krb5_free_principal(scontext, source); krb5_free_principal(scontext, source);
break; break;
case kadm_rename: case kadm_rename:
ret = krb5_data_alloc(&data, len); ret = krb5_data_alloc(&data, len);
if (ret) if (ret == 0)
krb5_err (scontext, 1, ret, "kadm_rename: data alloc: %d", len); ret = krb5_ret_principal(sp, &source);
krb5_ret_principal(sp, &source); if (ret == 0 && krb5_storage_read(sp, data.data, data.length) == -1)
krb5_storage_read(sp, data.data, data.length); ret = errno;
hdb_value2entry(scontext, &data, &ent); if (ret == 0)
krb5_unparse_name(scontext, source, &name1); ret = hdb_value2entry(scontext, &data, &ent);
krb5_unparse_name(scontext, ent.principal, &name2); if (ret == 0)
ret = krb5_unparse_name(scontext, source, &name1);
if (ret == 0)
ret = krb5_unparse_name(scontext, ent.principal, &name2);
if (ret)
krb5_err(scontext, 1, ret, "Failed to read a rename record");
printf(" %s -> %s\n", name1, name2); printf(" %s -> %s\n", name1, name2);
free(name1); free(name1);
free(name2); free(name2);
@@ -160,26 +168,30 @@ print_entry(kadm5_server_context *server_context,
break; break;
case kadm_create: case kadm_create:
ret = krb5_data_alloc(&data, len); ret = krb5_data_alloc(&data, len);
if (ret == 0 && krb5_storage_read(sp, data.data, data.length) == -1)
ret = errno;
if (ret == 0)
ret = hdb_value2entry(scontext, &data, &ent);
if (ret) if (ret)
krb5_err (scontext, 1, ret, "kadm_create: data alloc: %d", len); krb5_err(scontext, 1, ret, "Failed to read a create record");
krb5_storage_read(sp, data.data, data.length);
ret = hdb_value2entry(scontext, &data, &ent);
if(ret)
abort();
mask = ~0; mask = ~0;
goto foo; goto foo;
case kadm_modify: case kadm_modify:
ret = krb5_data_alloc(&data, len); ret = krb5_data_alloc(&data, len);
if (ret == 0)
ret = krb5_ret_int32(sp, &mask);
if (ret == 0 && krb5_storage_read(sp, data.data, data.length) == -1)
ret = errno;
if (ret == 0)
ret = hdb_value2entry(scontext, &data, &ent);
if (ret) if (ret)
krb5_err (scontext, 1, ret, "kadm_modify: data alloc: %d", len); krb5_err(scontext, 1, ret, "Failed to read a modify record");
krb5_ret_int32(sp, &mask);
krb5_storage_read(sp, data.data, data.length);
ret = hdb_value2entry(scontext, &data, &ent);
if(ret)
abort();
foo: foo:
if(ent.principal /* mask & KADM5_PRINCIPAL */) { if(ent.principal /* mask & KADM5_PRINCIPAL */) {
krb5_unparse_name(scontext, ent.principal, &name1); ret = krb5_unparse_name(scontext, ent.principal, &name1);
if (ret)
krb5_err(scontext, 1, ret,
"Failed to process a create or modify record");
printf(" principal = %s\n", name1); printf(" principal = %s\n", name1);
free(name1); free(name1);
} }
@@ -263,14 +275,19 @@ print_entry(kadm5_server_context *server_context,
case kadm_nop : case kadm_nop :
if (len == 16) { if (len == 16) {
uint64_t off; uint64_t off;
krb5_ret_uint64(sp, &off); ret = krb5_ret_uint64(sp, &off);
if (ret)
krb5_err(scontext, 1, ret, "Failed to read a no-op record");
printf("uberblock offset %llu ", (unsigned long long)off); printf("uberblock offset %llu ", (unsigned long long)off);
} else { } else {
printf("nop"); printf("nop");
} }
if (len == 16 || len == 8) { if (len == 16 || len == 8) {
krb5_ret_int32(sp, &nop_time); ret = krb5_ret_int32(sp, &nop_time);
krb5_ret_uint32(sp, &nop_ver); if (ret == 0)
ret = krb5_ret_uint32(sp, &nop_ver);
if (ret)
krb5_err(scontext, 1, ret, "Failed to read a no-op record");
timestamp = nop_time; timestamp = nop_time;
strftime(t, sizeof(t), "%Y-%m-%d %H:%M:%S", localtime(&timestamp)); strftime(t, sizeof(t), "%Y-%m-%d %H:%M:%S", localtime(&timestamp));
@@ -279,7 +296,7 @@ print_entry(kadm5_server_context *server_context,
printf("\n"); printf("\n");
break; break;
default: default:
abort(); krb5_errx(scontext, 1, "Unknown record type");
} }
krb5_data_free(&data); krb5_data_free(&data);