From eb232f60eede01255382c3c71d881e15291aaf6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Thu, 11 Aug 2005 13:28:22 +0000 Subject: [PATCH] Merge in KADM5_TL_DATA in the database. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15883 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/kadm5/ent_setup.c | 60 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/lib/kadm5/ent_setup.c b/lib/kadm5/ent_setup.c index 4c6837a3d..fe2a8921e 100644 --- a/lib/kadm5/ent_setup.c +++ b/lib/kadm5/ent_setup.c @@ -56,6 +56,57 @@ attr_to_flags(unsigned attr, HDBFlags *flags) flags->ok_as_delegate = !!(attr & KRB5_KDB_OK_AS_DELEGATE); } +/* + * Modify the `ent' according to `tl_data'. + */ + +static kadm5_ret_t +perform_tl_data(krb5_context context, + HDB *db, + hdb_entry *ent, + const krb5_tl_data *tl_data) +{ + HDB_extension ext; + kadm5_ret_t ret = 0; + + if (tl_data->tl_data_type == KRB5_TL_PASSWORD) { + heim_utf8_string pw = tl_data->tl_data_contents; + + if (pw[tl_data->tl_data_length] != '\0') + return KADM5_BAD_TL_TYPE; + + ret = hdb_entry_set_password(context, db, ent, pw); + + } else if (tl_data->tl_data_type == KRB5_TL_LAST_PWD_CHANGE) { + unsigned char *s; + time_t t; + + if (tl_data->tl_data_length != 4) + return KADM5_BAD_TL_TYPE; + + s = tl_data->tl_data_contents; + + t = s[0] | (s[1] << 8) | (s[2] << 16) | (s[3] << 24); + + ret = hdb_entry_set_pw_change_time(context, ent, t); + + } else if (tl_data->tl_data_type == KRB5_TL_EXTENSION) { + ret = decode_HDB_extension(tl_data->tl_data_contents, + tl_data->tl_data_length, + &ext, + NULL); + if (ret) + return KADM5_BAD_TL_TYPE; + + ret = hdb_replace_extension(context, ent, &ext); + + } else { + return KADM5_BAD_TL_TYPE; + } + return ret; +} + + /* * Create the hdb entry `ent' based on data from `princ' with * `princ_mask' specifying what fields to be gotten from there and @@ -134,7 +185,14 @@ _kadm5_setup_entry(kadm5_server_context *context, _kadm5_set_keys2(context, ent, princ->n_key_data, princ->key_data); } if(mask & KADM5_TL_DATA) { - /* XXX */ + krb5_tl_data *tl; + + for (tl = princ->tl_data; tl != NULL; tl = tl->tl_data_next) { + kadm5_ret_t ret; + ret = perform_tl_data(context->context, context->db, ent, tl); + if (ret) + return ret; + } } if(mask & KADM5_FAIL_AUTH_COUNT) { /* XXX */