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

Revert "kadmin: do not assign passwords at realm initialization"

Browse Source 
This reverts commit 83def5bc18. Not passing all
tests, will resubmit as pull request.
This commit is contained in:
Luke Howard
2018-12-27 16:42:36 +11:00
parent 83def5bc18
commit be3836d4ca
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
kadmin/init.c
View File

@@ -52,6 +52,11 @@ create_random_entry(krb5_principal princ,
krb5_keyblock *keys; krb5_keyblock *keys;
int n_keys, i; int n_keys, i;
char *name; char *name;
const char *password;
char pwbuf[512];
random_password(pwbuf, sizeof(pwbuf));
password = pwbuf;
ret = krb5_unparse_name(context, princ, &name); ret = krb5_unparse_name(context, princ, &name);
if (ret) { if (ret) {
@@ -71,14 +76,14 @@ create_random_entry(krb5_principal princ,
mask |= KADM5_MAX_RLIFE; mask |= KADM5_MAX_RLIFE;
} }
ent.attributes |= attributes | KRB5_KDB_DISALLOW_ALL_TIX; ent.attributes |= attributes | KRB5_KDB_DISALLOW_ALL_TIX;
mask |= KADM5_ATTRIBUTES | KADM5_KEY_DATA; mask |= KADM5_ATTRIBUTES;
/* Create the entry with no keys or password */ /* Create the entry with a random password */
ret = kadm5_s_create_principal_with_key(kadm_handle, &ent, mask); ret = kadm5_create_principal(kadm_handle, &ent, mask, password);
if(ret) { if(ret) {
if (ret == KADM5_DUP && (flags & CRE_DUP_OK)) if (ret == KADM5_DUP && (flags & CRE_DUP_OK))
goto out; goto out;
krb5_warn(context, ret, "create_random_entry(%s): create failed", krb5_warn(context, ret, "create_random_entry(%s): randkey failed",
name); name);
goto out; goto out;
} }