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

kadm5: Add missing error checks

Browse Source
This commit is contained in:
Nicolas Williams
2022-01-19 16:57:06 -06:00
parent 97cef99f54
commit 4a0e01f9ed
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/kadm5/get_princs_s.c
View File

@@ -98,7 +98,9 @@ kadm5_s_get_principals(void *server_handle,
krb5_realm r; krb5_realm r;
int aret; int aret;
krb5_get_default_realm(context->context, &r); ret = krb5_get_default_realm(context->context, &r);
if (ret)
goto out;
aret = asprintf(&d.exp2, "%s@%s", expression, r); aret = asprintf(&d.exp2, "%s@%s", expression, r);
free(r); free(r);
if (aret == -1 || d.exp2 == NULL) { if (aret == -1 || d.exp2 == NULL) {

5
lib/kadm5/get_s.c
View File

@@ -296,8 +296,7 @@ kadm5_s_get_principal(void *server_handle,
krb5_free_salt(context->context, salt); krb5_free_salt(context->context, salt);
assert( out->n_key_data == n_keys ); assert( out->n_key_data == n_keys );
} }
if (ret) assert(ret == 0);
goto out;
if(mask & KADM5_TL_DATA) { if(mask & KADM5_TL_DATA) {
time_t last_pw_expire; time_t last_pw_expire;
const HDB_Ext_PKINIT_acl *acl; const HDB_Ext_PKINIT_acl *acl;
@@ -324,6 +323,8 @@ kadm5_s_get_principal(void *server_handle,
unsigned char buf[4]; unsigned char buf[4];
_krb5_put_int(buf, last_pw_expire, sizeof(buf)); _krb5_put_int(buf, last_pw_expire, sizeof(buf));
ret = add_tl_data(out, KRB5_TL_LAST_PWD_CHANGE, buf, sizeof(buf)); ret = add_tl_data(out, KRB5_TL_LAST_PWD_CHANGE, buf, sizeof(buf));
if (ret)
goto out;
} }
ret = hdb_entry_get_krb5_config(&ent, &krb5_config); ret = hdb_entry_get_krb5_config(&ent, &krb5_config);

4
lib/kadm5/rename_s.c
View File

@@ -136,7 +136,9 @@ kadm5_s_rename_principal(void *server_handle,
Salt salt; Salt salt;
krb5_salt salt2; krb5_salt salt2;
memset(&salt, 0, sizeof(salt)); memset(&salt, 0, sizeof(salt));
krb5_get_pw_salt(context->context, source, &salt2); ret = krb5_get_pw_salt(context->context, source, &salt2);
if (ret)
goto out3;
salt.type = hdb_pw_salt; salt.type = hdb_pw_salt;
salt.salt = salt2.saltvalue; salt.salt = salt2.saltvalue;
for(i = 0; i < ent.keys.len; i++){ for(i = 0; i < ent.keys.len; i++){