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

Rename err' to ret'.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4352 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1998-01-22 23:27:21 +00:00
parent 0cc4c41754
commit 1c967d721a
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/krb5/get_in_tkt.c
View File

@@ -123,7 +123,7 @@ _krb5_extract_ticket(krb5_context context,
krb5_decrypt_proc decrypt_proc, krb5_decrypt_proc decrypt_proc,
krb5_const_pointer decryptarg) krb5_const_pointer decryptarg)
{ {
krb5_error_code err; krb5_error_code ret;
krb5_principal tmp_principal; krb5_principal tmp_principal;
int tmp; int tmp;
time_t tmp_time; time_t tmp_time;
@@ -131,15 +131,15 @@ _krb5_extract_ticket(krb5_context context,
/* compare client */ /* compare client */
err = principalname2krb5_principal (&tmp_principal, ret = principalname2krb5_principal (&tmp_principal,
rep->kdc_rep.cname, rep->kdc_rep.cname,
rep->kdc_rep.crealm); rep->kdc_rep.crealm);
if (err) if (ret)
goto out; goto out;
tmp = krb5_principal_compare (context, tmp_principal, creds->client); tmp = krb5_principal_compare (context, tmp_principal, creds->client);
krb5_free_principal (context, tmp_principal); krb5_free_principal (context, tmp_principal);
if (!tmp) { if (!tmp) {
err = KRB5KRB_AP_ERR_MODIFIED; ret = KRB5KRB_AP_ERR_MODIFIED;
goto out; goto out;
} }
@@ -158,10 +158,10 @@ _krb5_extract_ticket(krb5_context context,
/* compare server */ /* compare server */
err = principalname2krb5_principal (&tmp_principal, ret = principalname2krb5_principal (&tmp_principal,
rep->kdc_rep.ticket.sname, rep->kdc_rep.ticket.sname,
rep->kdc_rep.ticket.realm); rep->kdc_rep.ticket.realm);
if (err) if (ret)
goto out; goto out;
if(allow_server_mismatch){ if(allow_server_mismatch){
krb5_free_principal(context, creds->server); krb5_free_principal(context, creds->server);
@@ -171,7 +171,7 @@ _krb5_extract_ticket(krb5_context context,
tmp = krb5_principal_compare (context, tmp_principal, creds->server); tmp = krb5_principal_compare (context, tmp_principal, creds->server);
krb5_free_principal (context, tmp_principal); krb5_free_principal (context, tmp_principal);
if (!tmp) { if (!tmp) {
err = KRB5KRB_AP_ERR_MODIFIED; ret = KRB5KRB_AP_ERR_MODIFIED;
goto out; goto out;
} }
} }
@@ -181,14 +181,14 @@ _krb5_extract_ticket(krb5_context context,
if (decrypt_proc == NULL) if (decrypt_proc == NULL)
decrypt_proc = decrypt_tkt; decrypt_proc = decrypt_tkt;
err = (*decrypt_proc)(context, key, decryptarg, rep); ret = (*decrypt_proc)(context, key, decryptarg, rep);
if (err) if (ret)
goto out; goto out;
/* compare nonces */ /* compare nonces */
if (nonce != rep->enc_part.nonce) { if (nonce != rep->enc_part.nonce) {
err = KRB5KRB_AP_ERR_MODIFIED; ret = KRB5KRB_AP_ERR_MODIFIED;
goto out; goto out;
} }
@@ -213,13 +213,13 @@ _krb5_extract_ticket(krb5_context context,
if (creds->times.starttime == 0 if (creds->times.starttime == 0
&& abs(tmp_time - sec_now) > context->max_skew) { && abs(tmp_time - sec_now) > context->max_skew) {
err = KRB5KRB_AP_ERR_MODIFIED; ret = KRB5KRB_AP_ERR_MODIFIED;
goto out; goto out;
} }
if (creds->times.starttime != 0 if (creds->times.starttime != 0
&& tmp_time != creds->times.starttime) { && tmp_time != creds->times.starttime) {
err = KRB5KRB_AP_ERR_MODIFIED; ret = KRB5KRB_AP_ERR_MODIFIED;
goto out; goto out;
} }
@@ -232,7 +232,7 @@ _krb5_extract_ticket(krb5_context context,
if (creds->times.renew_till != 0 if (creds->times.renew_till != 0
&& tmp_time > creds->times.renew_till) { && tmp_time > creds->times.renew_till) {
err = KRB5KRB_AP_ERR_MODIFIED; ret = KRB5KRB_AP_ERR_MODIFIED;
goto out; goto out;
} }
@@ -242,7 +242,7 @@ _krb5_extract_ticket(krb5_context context,
if (creds->times.endtime != 0 if (creds->times.endtime != 0
&& rep->enc_part.endtime > creds->times.endtime) { && rep->enc_part.endtime > creds->times.endtime) {
err = KRB5KRB_AP_ERR_MODIFIED; ret = KRB5KRB_AP_ERR_MODIFIED;
goto out; goto out;
} }
@@ -263,14 +263,14 @@ _krb5_extract_ticket(krb5_context context,
creds->session.keyvalue.length = 0; creds->session.keyvalue.length = 0;
creds->session.keyvalue.data = NULL; creds->session.keyvalue.data = NULL;
creds->session.keytype = rep->enc_part.key.keytype; creds->session.keytype = rep->enc_part.key.keytype;
err = krb5_data_copy (&creds->session.keyvalue, ret = krb5_data_copy (&creds->session.keyvalue,
rep->enc_part.key.keyvalue.data, rep->enc_part.key.keyvalue.data,
rep->enc_part.key.keyvalue.length); rep->enc_part.key.keyvalue.length);
out: out:
memset (rep->enc_part.key.keyvalue.data, 0, memset (rep->enc_part.key.keyvalue.data, 0,
rep->enc_part.key.keyvalue.length); rep->enc_part.key.keyvalue.length);
return err; return ret;
} }