aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kadm5/modify_s.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/kadm5/modify_s.c')
-rw-r--r--lib/kadm5/modify_s.c86
1 files changed, 65 insertions, 21 deletions
diff --git a/lib/kadm5/modify_s.c b/lib/kadm5/modify_s.c
index 7907995ec3b8..78f26734f0f7 100644
--- a/lib/kadm5/modify_s.c
+++ b/lib/kadm5/modify_s.c
@@ -44,43 +44,87 @@ modify_principal(void *server_handle,
kadm5_server_context *context = server_handle;
hdb_entry_ex ent;
kadm5_ret_t ret;
+
+ memset(&ent, 0, sizeof(ent));
+
if((mask & forbidden_mask))
return KADM5_BAD_MASK;
if((mask & KADM5_POLICY) && strcmp(princ->policy, "default"))
return KADM5_UNK_POLICY;
- memset(&ent, 0, sizeof(ent));
- ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
- if(ret)
- return ret;
+ if (!context->keep_open) {
+ ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
+ if(ret)
+ return ret;
+ }
+
+ ret = kadm5_log_init(context);
+ if (ret)
+ goto out;
+
ret = context->db->hdb_fetch_kvno(context->context, context->db,
princ->principal, HDB_F_GET_ANY|HDB_F_ADMIN_DATA, 0, &ent);
- if(ret)
- goto out;
- ret = _kadm5_setup_entry(context, &ent, mask, princ, mask, NULL, 0);
- if(ret)
+ if (ret)
goto out2;
+ ret = _kadm5_setup_entry(context, &ent, mask, princ, mask, NULL, 0);
+ if (ret)
+ goto out3;
ret = _kadm5_set_modifier(context, &ent.entry);
- if(ret)
- goto out2;
+ if (ret)
+ goto out3;
+
+ /*
+ * If any keys are bogus, disallow the modify. If the keys were
+ * bogus as stored in the HDB we could allow those through, but
+ * distinguishing that case from a pre-1.6 client using add_enctype
+ * without the get-keys privilege requires more work (mainly: checking that
+ * the bogus keys in princ->key_data[] have corresponding bogus keys in ent
+ * before calling _kadm5_setup_entry()).
+ */
+ if ((mask & KADM5_KEY_DATA) &&
+ kadm5_some_keys_are_bogus(princ->n_key_data, princ->key_data)) {
+ ret = KADM5_AUTH_GET_KEYS; /* Not quite appropriate, but it'll do */
+ goto out3;
+ }
ret = hdb_seal_keys(context->context, context->db, &ent.entry);
if (ret)
- goto out2;
+ goto out3;
- ret = context->db->hdb_store(context->context, context->db,
- HDB_F_REPLACE, &ent);
- if (ret)
- goto out2;
+ if ((mask & KADM5_POLICY)) {
+ HDB_extension ext;
+
+ memset(&ext, 0, sizeof(ext));
+ /* XXX should be TRUE, but we don't yet support policies */
+ ext.mandatory = FALSE;
+ ext.data.element = choice_HDB_extension_data_policy;
+ ext.data.u.policy = strdup(princ->policy);
+ if (ext.data.u.policy == NULL) {
+ ret = ENOMEM;
+ goto out3;
+ }
+ /* This calls free_HDB_extension(), freeing ext.data.u.policy */
+ ret = hdb_replace_extension(context->context, &ent.entry, &ext);
+ free(ext.data.u.policy);
+ if (ret)
+ goto out3;
+ }
- kadm5_log_modify (context,
- &ent.entry,
- mask | KADM5_MOD_NAME | KADM5_MOD_TIME);
+ /* This logs the change for iprop and writes to the HDB */
+ ret = kadm5_log_modify(context, &ent.entry,
+ mask | KADM5_MOD_NAME | KADM5_MOD_TIME);
-out2:
+ out3:
hdb_free_entry(context->context, &ent);
-out:
- context->db->hdb_close(context->context, context->db);
+ out2:
+ (void) kadm5_log_end(context);
+ out:
+ if (!context->keep_open) {
+ kadm5_ret_t ret2;
+ ret2 = context->db->hdb_close(context->context, context->db);
+ if (ret == 0 && ret2 != 0)
+ ret = ret2;
+ }
return _kadm5_error_code(ret);
}