Fix some type conflicts.
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3095 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -55,12 +55,16 @@ krb5_mk_priv(krb5_context context,
|
|||||||
unsigned tmp_seq;
|
unsigned tmp_seq;
|
||||||
krb5_keyblock *key;
|
krb5_keyblock *key;
|
||||||
int32_t sec, usec;
|
int32_t sec, usec;
|
||||||
|
KerberosTime sec2;
|
||||||
|
unsigned usec2;
|
||||||
|
|
||||||
krb5_us_timeofday (context, &sec, &usec);
|
krb5_us_timeofday (context, &sec, &usec);
|
||||||
|
|
||||||
part.user_data = *userdata;
|
part.user_data = *userdata;
|
||||||
part.timestamp = &sec;
|
sec2 = sec;
|
||||||
part.usec = &usec;
|
part.timestamp = &sec2;
|
||||||
|
usec2 = usec;
|
||||||
|
part.usec = &usec2;
|
||||||
if (auth_context->flags & KRB5_AUTH_CONTEXT_DO_SEQUENCE) {
|
if (auth_context->flags & KRB5_AUTH_CONTEXT_DO_SEQUENCE) {
|
||||||
tmp_seq = ++auth_context->local_seqnumber;
|
tmp_seq = ++auth_context->local_seqnumber;
|
||||||
part.seq_number = &tmp_seq;
|
part.seq_number = &tmp_seq;
|
||||||
|
@@ -50,6 +50,8 @@ krb5_mk_safe(krb5_context context,
|
|||||||
krb5_error_code r;
|
krb5_error_code r;
|
||||||
KRB_SAFE s;
|
KRB_SAFE s;
|
||||||
int32_t sec, usec;
|
int32_t sec, usec;
|
||||||
|
KerberosTime sec2;
|
||||||
|
unsigned usec2;
|
||||||
u_char buf[1024];
|
u_char buf[1024];
|
||||||
size_t len;
|
size_t len;
|
||||||
unsigned tmp_seq;
|
unsigned tmp_seq;
|
||||||
@@ -60,8 +62,10 @@ krb5_mk_safe(krb5_context context,
|
|||||||
s.safe_body.user_data = *userdata;
|
s.safe_body.user_data = *userdata;
|
||||||
krb5_us_timeofday (context, &sec, &usec);
|
krb5_us_timeofday (context, &sec, &usec);
|
||||||
|
|
||||||
s.safe_body.timestamp = &sec;
|
sec2 = sec;
|
||||||
s.safe_body.usec = &usec;
|
s.safe_body.timestamp = &sec2;
|
||||||
|
usec2 = usec2;
|
||||||
|
s.safe_body.usec = &usec2;
|
||||||
if (auth_context->flags & KRB5_AUTH_CONTEXT_DO_SEQUENCE) {
|
if (auth_context->flags & KRB5_AUTH_CONTEXT_DO_SEQUENCE) {
|
||||||
tmp_seq = ++auth_context->local_seqnumber;
|
tmp_seq = ++auth_context->local_seqnumber;
|
||||||
s.safe_body.seq_number = &tmp_seq;
|
s.safe_body.seq_number = &tmp_seq;
|
||||||
|
Reference in New Issue
Block a user