diff options
| author | Will Fiveash <will.fiveash@oracle.com> | 2009-01-26 21:42:23 +0000 |
|---|---|---|
| committer | Will Fiveash <will.fiveash@oracle.com> | 2009-01-26 21:42:23 +0000 |
| commit | 2999c1ecab0352f3c46a160c6d9396423b399017 (patch) | |
| tree | e9087caa5934ebe5ec8464b1cb403ae28d0849b7 /src/kadmin | |
| parent | 94d7b8186169dbce0270a435714c2e643222dbfc (diff) | |
| download | krb5-2999c1ecab0352f3c46a160c6d9396423b399017.zip krb5-2999c1ecab0352f3c46a160c6d9396423b399017.tar.gz krb5-2999c1ecab0352f3c46a160c6d9396423b399017.tar.bz2 | |
Restore krb5_free_key_data_contents() as it was in
src/lib/kadm5/misc_free.c and rename the version of that function in
kdb5.c to krb5_dbe_free_key_data_contents. Eventually this needs to be
consolidated somewhere.
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/mkey_migrate@21802 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin')
| -rw-r--r-- | src/kadmin/dbutil/kdb5_mkey.c | 2 | ||||
| -rw-r--r-- | src/kadmin/dbutil/kdb5_util.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/kadmin/dbutil/kdb5_mkey.c b/src/kadmin/dbutil/kdb5_mkey.c index 658dcbf..57d469b 100644 --- a/src/kadmin/dbutil/kdb5_mkey.c +++ b/src/kadmin/dbutil/kdb5_mkey.c @@ -312,7 +312,7 @@ kdb5_add_mkey(int argc, char *argv[]) for (cur_mkey_aux_data = mkey_aux_data_head; cur_mkey_aux_data != NULL; cur_mkey_aux_data = next_mkey_aux_data) { next_mkey_aux_data = cur_mkey_aux_data->next; - krb5_free_key_data_contents(util_context, &(cur_mkey_aux_data->latest_mkey)); + krb5_dbe_free_key_data_contents(util_context, &(cur_mkey_aux_data->latest_mkey)); free(cur_mkey_aux_data); } return; diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c index 74353b0..086217e 100644 --- a/src/kadmin/dbutil/kdb5_util.c +++ b/src/kadmin/dbutil/kdb5_util.c @@ -53,6 +53,11 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +/* + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + #include <stdio.h> #include <k5-int.h> #include <kadm5/admin.h> |