oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

prefix libasn1 types with heim_

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12439 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-07-15 14:05:49 +00:00
parent 939b444ca3
commit 283630104a
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/krb5/get_cred.c
View File

@@ -692,7 +692,7 @@ get_cred_from_kdc_flags(krb5_context context,
} }
/* XXX this can loop forever */ /* XXX this can loop forever */
while(1){ while(1){
general_string tgt_inst; heim_general_string tgt_inst;
ret = get_cred_from_kdc_flags(context, flags, ccache, &tmp_creds, ret = get_cred_from_kdc_flags(context, flags, ccache, &tmp_creds,
&tgt, ret_tgts); &tgt, ret_tgts);

4
lib/krb5/keytab_file.c
View File

@@ -70,7 +70,7 @@ krb5_kt_ret_data(krb5_context context,
static krb5_error_code static krb5_error_code
krb5_kt_ret_string(krb5_context context, krb5_kt_ret_string(krb5_context context,
krb5_storage *sp, krb5_storage *sp,
general_string *data) heim_general_string *data)
{ {
int ret; int ret;
int16_t size; int16_t size;
@@ -109,7 +109,7 @@ krb5_kt_store_data(krb5_context context,
static krb5_error_code static krb5_error_code
krb5_kt_store_string(krb5_storage *sp, krb5_kt_store_string(krb5_storage *sp,
general_string data) heim_general_string data)
{ {
int ret; int ret;
size_t len = strlen(data); size_t len = strlen(data);

2
lib/krb5/krb5.h
View File

@@ -69,7 +69,7 @@ typedef u_int32_t krb5_flags;
typedef void *krb5_pointer; typedef void *krb5_pointer;
typedef const void *krb5_const_pointer; typedef const void *krb5_const_pointer;
typedef octet_string krb5_data; typedef heim_octet_string krb5_data;
struct krb5_crypto_data; struct krb5_crypto_data;
typedef struct krb5_crypto_data *krb5_crypto; typedef struct krb5_crypto_data *krb5_crypto;

4
lib/krb5/mk_error.c
View File

@@ -69,9 +69,9 @@ krb5_mk_error(krb5_context context,
} }
msg.error_code = error_code - KRB5KDC_ERR_NONE; msg.error_code = error_code - KRB5KDC_ERR_NONE;
if (e_text) if (e_text)
msg.e_text = (general_string*)&e_text; msg.e_text = (heim_general_string*)&e_text;
if (e_data) if (e_data)
msg.e_data = (octet_string*)e_data; msg.e_data = (heim_octet_string*)e_data;
if(server){ if(server){
msg.realm = server->realm; msg.realm = server->realm;
msg.sname = server->name; msg.sname = server->name;

6
lib/krb5/principal.c
View File

@@ -89,8 +89,8 @@ krb5_parse_name(krb5_context context,
krb5_principal *principal) krb5_principal *principal)
{ {
krb5_error_code ret; krb5_error_code ret;
general_string *comp; heim_general_string *comp;
general_string realm; heim_general_string realm;
int ncomp; int ncomp;
const char *p; const char *p;
@@ -398,7 +398,7 @@ append_component(krb5_context context, krb5_principal p,
const char *comp, const char *comp,
size_t comp_len) size_t comp_len)
{ {
general_string *tmp; heim_general_string *tmp;
size_t len = princ_num_comp(p); size_t len = princ_num_comp(p);
tmp = realloc(princ_comp(p), (len + 1) * sizeof(*tmp)); tmp = realloc(princ_comp(p), (len + 1) * sizeof(*tmp));