summaryrefslogtreecommitdiffstats
path: root/src/lib/kadm5
diff options
context:
space:
mode:
authorBarry Jaspan <bjaspan@mit.edu>1997-05-28 17:35:05 +0000
committerBarry Jaspan <bjaspan@mit.edu>1997-05-28 17:35:05 +0000
commit9ed12e2d114d8f386528aebabc44e2dab7ee6634 (patch)
treeb183dd58b2525a822888f21633286e2975731b0f /src/lib/kadm5
parent8420ba340cae832813f416be0cfb3814d76b70ad (diff)
downloadkrb5-9ed12e2d114d8f386528aebabc44e2dab7ee6634.tar.gz
krb5-9ed12e2d114d8f386528aebabc44e2dab7ee6634.tar.xz
krb5-9ed12e2d114d8f386528aebabc44e2dab7ee6634.zip
* admin.h: add prototype for kadm5_setkey_principal
* misc_free.c (kadm5_free_key_data): add kadm5_free_data git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10089 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/kadm5')
-rw-r--r--src/lib/kadm5/ChangeLog6
-rw-r--r--src/lib/kadm5/admin.h5
-rw-r--r--src/lib/kadm5/misc_free.c19
3 files changed, 29 insertions, 1 deletions
diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog
index dc016db574..45b403c739 100644
--- a/src/lib/kadm5/ChangeLog
+++ b/src/lib/kadm5/ChangeLog
@@ -1,3 +1,9 @@
+Wed May 28 13:34:17 1997 Barry Jaspan <bjaspan@mit.edu>
+
+ * admin.h: add prototype for kadm5_setkey_principal
+
+ * misc_free.c (kadm5_free_key_data): add kadm5_free_data
+
Mon Mar 31 17:41:11 1997 Barry Jaspan <bjaspan@mit.edu>
* kadm_err.et, kadm_rpc.h, kadm_rpc_xdr.c: add support for
diff --git a/src/lib/kadm5/admin.h b/src/lib/kadm5/admin.h
index d45e16e9cf..0c2501b3f6 100644
--- a/src/lib/kadm5/admin.h
+++ b/src/lib/kadm5/admin.h
@@ -331,6 +331,11 @@ kadm5_ret_t kadm5_randkey_principal(void *server_handle,
krb5_keyblock **keyblocks,
int *n_keys);
#endif
+kadm5_ret_t kadm5_setkey_principal(void *server_handle,
+ krb5_principal principal,
+ krb5_keyblock *keyblocks,
+ int n_keys);
+
kadm5_ret_t kadm5_create_policy(void *server_handle,
kadm5_policy_ent_t ent,
long mask);
diff --git a/src/lib/kadm5/misc_free.c b/src/lib/kadm5/misc_free.c
index dbf91d3eeb..9dc91b53f7 100644
--- a/src/lib/kadm5/misc_free.c
+++ b/src/lib/kadm5/misc_free.c
@@ -38,7 +38,6 @@ kadm5_ret_t
return KADM5_OK;
}
-
/* XXX this ought to be in libkrb5.a, but isn't */
kadm5_ret_t krb5_free_key_data_contents(context, key)
krb5_context context;
@@ -56,6 +55,24 @@ kadm5_ret_t krb5_free_key_data_contents(context, key)
return KADM5_OK;
}
+kadm5_ret_t kadm5_free_key_data(void *server_handle,
+ krb5_int16 *n_key_data,
+ krb5_key_data *key_data)
+{
+ kadm5_server_handle_t handle = server_handle;
+ int i, nkeys = (int) *n_key_data;
+
+ _KADM5_CHECK_HANDLE(server_handle);
+
+ if (key_data == NULL)
+ return KADM5_OK;
+
+ for (i = 0; i < nkeys; i++)
+ krb5_free_key_data_contents(handle->context, &key_data[i]);
+ free(key_data);
+ return KADM5_OK;
+}
+
kadm5_ret_t
kadm5_free_principal_ent(void *server_handle,
kadm5_principal_ent_t val)