diff options
| author | Will Fiveash <will.fiveash@oracle.com> | 2009-03-10 20:26:24 +0000 |
|---|---|---|
| committer | Will Fiveash <will.fiveash@oracle.com> | 2009-03-10 20:26:24 +0000 |
| commit | d6012ef017e13f179cf9846cdac812878cf6eab1 (patch) | |
| tree | 0f9d48990c8ae05394e818004a6171f89f2d5a1c /src/kadmin | |
| parent | 413124cb5a0033e3f7cb39b50389811984241408 (diff) | |
| download | krb5-d6012ef017e13f179cf9846cdac812878cf6eab1.tar.gz krb5-d6012ef017e13f179cf9846cdac812878cf6eab1.tar.xz krb5-d6012ef017e13f179cf9846cdac812878cf6eab1.zip | |
Several small fixes to enable the migrate mkey commands to work properly with a LDAP KDB. See the ticket for more details
ticket: 6405
Tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22073 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin')
| -rw-r--r-- | src/kadmin/dbutil/kdb5_mkey.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/kadmin/dbutil/kdb5_mkey.c b/src/kadmin/dbutil/kdb5_mkey.c index 23e51eb66d..7827b29597 100644 --- a/src/kadmin/dbutil/kdb5_mkey.c +++ b/src/kadmin/dbutil/kdb5_mkey.c @@ -185,6 +185,7 @@ add_new_mkey(krb5_context context, krb5_db_entry *master_entry, mkey_aux_data_head))) { goto clean_n_exit; } + master_entry->mask |= KADM5_KEY_DATA; clean_n_exit: krb5_dbe_free_mkey_aux_list(context, mkey_aux_data_head); @@ -906,6 +907,8 @@ update_princ_encryption_1(void *cb, krb5_db_entry *ent) goto fail; } + ent->mask |= KADM5_KEY_DATA; + if ((retval = krb5_db_put_principal(util_context, ent, &nentries))) { com_err(progname, retval, "while updating principal '%s' key data in the database", @@ -1422,6 +1425,8 @@ kdb5_purge_mkeys(int argc, char *argv[]) goto cleanup_return; } + master_entry.mask |= KADM5_KEY_DATA; + if ((retval = krb5_db_put_principal(util_context, &master_entry, &nentries))) { (void) krb5_db_fini(util_context); com_err(progname, retval, "while adding master key entry to the database"); |