Revert "kadm5: Allow princ creation with keys"

This reverts commit 5b70a0cac6.
This commit is contained in:
Nicolas Williams
2020-09-07 23:58:46 -05:00
parent e17f78c738
commit a12fe376ae

View File

@@ -265,22 +265,13 @@ kadm5_s_create_principal(void *server_handle,
if (ret) if (ret)
return ret; return ret;
if (use_pw) ret = create_principal(context, princ, mask, &ent,
ret = create_principal(context, princ, mask, &ent, KADM5_PRINCIPAL,
KADM5_PRINCIPAL, KADM5_LAST_PWD_CHANGE | KADM5_MOD_TIME
KADM5_LAST_PWD_CHANGE | KADM5_MOD_TIME | KADM5_MOD_NAME | KADM5_MKVNO
| KADM5_MOD_NAME | KADM5_MKVNO | KADM5_AUX_ATTRIBUTES | KADM5_KEY_DATA
| KADM5_AUX_ATTRIBUTES | KADM5_KEY_DATA | KADM5_POLICY_CLR | KADM5_LAST_SUCCESS
| KADM5_POLICY_CLR | KADM5_LAST_SUCCESS | KADM5_LAST_FAILED | KADM5_FAIL_AUTH_COUNT);
| KADM5_LAST_FAILED | KADM5_FAIL_AUTH_COUNT);
else
ret = create_principal(context, princ, mask, &ent,
KADM5_PRINCIPAL | KADM5_KEY_DATA,
KADM5_LAST_PWD_CHANGE | KADM5_MOD_TIME
| KADM5_MOD_NAME | KADM5_MKVNO
| KADM5_AUX_ATTRIBUTES
| KADM5_POLICY_CLR | KADM5_LAST_SUCCESS
| KADM5_LAST_FAILED | KADM5_FAIL_AUTH_COUNT);
if (ret) if (ret)
return ret; return ret;