(kadm5_c_randkey_principal): new _kadm5_client_recv
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6959 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan
|
* Copyright (c) 1997 - 1999 Kungliga Tekniska H<>gskolan
|
||||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
@@ -51,22 +51,37 @@ kadm5_c_randkey_principal(void *server_handle,
|
|||||||
krb5_storage *sp;
|
krb5_storage *sp;
|
||||||
unsigned char buf[1024];
|
unsigned char buf[1024];
|
||||||
int32_t tmp;
|
int32_t tmp;
|
||||||
|
krb5_data reply;
|
||||||
|
|
||||||
sp = krb5_storage_from_mem(buf, sizeof(buf));
|
sp = krb5_storage_from_mem(buf, sizeof(buf));
|
||||||
|
if (sp == NULL)
|
||||||
|
return ENOMEM;
|
||||||
krb5_store_int32(sp, kadm_randkey);
|
krb5_store_int32(sp, kadm_randkey);
|
||||||
krb5_store_principal(sp, princ);
|
krb5_store_principal(sp, princ);
|
||||||
ret = _kadm5_client_send(context, sp);
|
ret = _kadm5_client_send(context, sp);
|
||||||
sp->seek(sp, SEEK_SET, 0);
|
krb5_storage_free(sp);
|
||||||
ret = _kadm5_client_recv(context, sp);
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
ret = _kadm5_client_recv(context, &reply);
|
||||||
if(ret)
|
if(ret)
|
||||||
goto out;
|
return ret;
|
||||||
|
sp = krb5_storage_from_data(&reply);
|
||||||
|
if (sp == NULL) {
|
||||||
|
krb5_data_free (&reply);
|
||||||
|
return ENOMEM;
|
||||||
|
}
|
||||||
krb5_ret_int32(sp, &tmp);
|
krb5_ret_int32(sp, &tmp);
|
||||||
ret = tmp;
|
ret = tmp;
|
||||||
if(ret == 0){
|
if(ret == 0){
|
||||||
krb5_keyblock *k;
|
krb5_keyblock *k;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
krb5_ret_int32(sp, &tmp);
|
krb5_ret_int32(sp, &tmp);
|
||||||
k = malloc(tmp * sizeof(*k));
|
k = malloc(tmp * sizeof(*k));
|
||||||
|
if (k == NULL) {
|
||||||
|
ret = ENOMEM;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
for(i = 0; i < tmp; i++)
|
for(i = 0; i < tmp; i++)
|
||||||
krb5_ret_keyblock(sp, &k[i]);
|
krb5_ret_keyblock(sp, &k[i]);
|
||||||
*n_keys = tmp;
|
*n_keys = tmp;
|
||||||
@@ -74,6 +89,6 @@ kadm5_c_randkey_principal(void *server_handle,
|
|||||||
}
|
}
|
||||||
out:
|
out:
|
||||||
krb5_storage_free(sp);
|
krb5_storage_free(sp);
|
||||||
|
krb5_data_free (&reply);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user