prefix libasn1 types with heim_
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12439 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -692,7 +692,7 @@ get_cred_from_kdc_flags(krb5_context context,
|
||||
}
|
||||
/* XXX this can loop forever */
|
||||
while(1){
|
||||
general_string tgt_inst;
|
||||
heim_general_string tgt_inst;
|
||||
|
||||
ret = get_cred_from_kdc_flags(context, flags, ccache, &tmp_creds,
|
||||
&tgt, ret_tgts);
|
||||
|
@@ -70,7 +70,7 @@ krb5_kt_ret_data(krb5_context context,
|
||||
static krb5_error_code
|
||||
krb5_kt_ret_string(krb5_context context,
|
||||
krb5_storage *sp,
|
||||
general_string *data)
|
||||
heim_general_string *data)
|
||||
{
|
||||
int ret;
|
||||
int16_t size;
|
||||
@@ -109,7 +109,7 @@ krb5_kt_store_data(krb5_context context,
|
||||
|
||||
static krb5_error_code
|
||||
krb5_kt_store_string(krb5_storage *sp,
|
||||
general_string data)
|
||||
heim_general_string data)
|
||||
{
|
||||
int ret;
|
||||
size_t len = strlen(data);
|
||||
|
@@ -69,7 +69,7 @@ typedef u_int32_t krb5_flags;
|
||||
typedef void *krb5_pointer;
|
||||
typedef const void *krb5_const_pointer;
|
||||
|
||||
typedef octet_string krb5_data;
|
||||
typedef heim_octet_string krb5_data;
|
||||
|
||||
struct krb5_crypto_data;
|
||||
typedef struct krb5_crypto_data *krb5_crypto;
|
||||
|
@@ -69,9 +69,9 @@ krb5_mk_error(krb5_context context,
|
||||
}
|
||||
msg.error_code = error_code - KRB5KDC_ERR_NONE;
|
||||
if (e_text)
|
||||
msg.e_text = (general_string*)&e_text;
|
||||
msg.e_text = (heim_general_string*)&e_text;
|
||||
if (e_data)
|
||||
msg.e_data = (octet_string*)e_data;
|
||||
msg.e_data = (heim_octet_string*)e_data;
|
||||
if(server){
|
||||
msg.realm = server->realm;
|
||||
msg.sname = server->name;
|
||||
|
@@ -89,8 +89,8 @@ krb5_parse_name(krb5_context context,
|
||||
krb5_principal *principal)
|
||||
{
|
||||
krb5_error_code ret;
|
||||
general_string *comp;
|
||||
general_string realm;
|
||||
heim_general_string *comp;
|
||||
heim_general_string realm;
|
||||
int ncomp;
|
||||
|
||||
const char *p;
|
||||
@@ -398,7 +398,7 @@ append_component(krb5_context context, krb5_principal p,
|
||||
const char *comp,
|
||||
size_t comp_len)
|
||||
{
|
||||
general_string *tmp;
|
||||
heim_general_string *tmp;
|
||||
size_t len = princ_num_comp(p);
|
||||
|
||||
tmp = realloc(princ_comp(p), (len + 1) * sizeof(*tmp));
|
||||
|
Reference in New Issue
Block a user