diff options
| author | Theodore Tso <tytso@mit.edu> | 1996-07-25 00:40:06 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1996-07-25 00:40:06 +0000 |
| commit | b190bca60a18880dacf91f3752ed2e114f601faa (patch) | |
| tree | 060520077165036516dc4107a7c63389467c8c72 /src | |
| parent | aa9ac88439ff7b152211946bfba0724e76fbc0a9 (diff) | |
| download | krb5-b190bca60a18880dacf91f3752ed2e114f601faa.tar.gz krb5-b190bca60a18880dacf91f3752ed2e114f601faa.tar.xz krb5-b190bca60a18880dacf91f3752ed2e114f601faa.zip | |
ser_sctx.c (kg_oid_externalize): Add proper return code
accept_sec_context.c (krb5_gss_accept_sec_context):
init_sec_context.c (krb5_gss_init_sec_context): Test (gss_flags &
XXXX) against 0 so that we pass a int value to g_order_init. Needed
since int is 16 bits for Win16 build.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8810 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/gssapi/krb5/ChangeLog | 9 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/accept_sec_context.c | 4 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/init_sec_context.c | 8 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/ser_sctx.c | 1 |
4 files changed, 16 insertions, 6 deletions
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index 3ca720cb6..3e39c7f36 100644 --- a/src/lib/gssapi/krb5/ChangeLog +++ b/src/lib/gssapi/krb5/ChangeLog @@ -1,3 +1,12 @@ +Wed Jul 24 19:40:55 1996 Theodore Y. Ts'o <tytso@mit.edu> + + * ser_sctx.c (kg_oid_externalize): Add proper return code + + * accept_sec_context.c (krb5_gss_accept_sec_context): + * init_sec_context.c (krb5_gss_init_sec_context): Test (gss_flags & + XXXX) against 0 so that we pass a int value to + g_order_init. Needed since int is 16 bits for Win16 build. + Tue Jul 23 22:35:53 1996 Theodore Y. Ts'o <tytso@mit.edu> * Makefile.in (all-windows): Fix broken Windows commands to copy diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c index 09ed41247..194443254 100644 --- a/src/lib/gssapi/krb5/accept_sec_context.c +++ b/src/lib/gssapi/krb5/accept_sec_context.c @@ -458,8 +458,8 @@ krb5_gss_accept_sec_context(minor_status, context_handle, krb5_auth_con_getremoteseqnumber(context, auth_context, &ctx->seq_recv); g_order_init(&(ctx->seqstate), ctx->seq_recv, - gss_flags & GSS_C_REPLAY_FLAG, - gss_flags & GSS_C_SEQUENCE_FLAG); + (gss_flags & GSS_C_REPLAY_FLAG) != 0, + (gss_flags & GSS_C_SEQUENCE_FLAG) != 0); /* at this point, the entire context structure is filled in, so it can be released. */ diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c index 686384216..e5cbcc4d0 100644 --- a/src/lib/gssapi/krb5/init_sec_context.c +++ b/src/lib/gssapi/krb5/init_sec_context.c @@ -443,8 +443,8 @@ krb5_gss_init_sec_context(minor_status, claimant_cred_handle, } else { ctx->seq_recv = ctx->seq_send; g_order_init(&(ctx->seqstate), ctx->seq_recv, - req_flags & GSS_C_REPLAY_FLAG, - req_flags & GSS_C_SEQUENCE_FLAG); + (req_flags & GSS_C_REPLAY_FLAG) != 0, + (req_flags & GSS_C_SEQUENCE_FLAG) != 0); ctx->established = 1; /* fall through to GSS_S_COMPLETE */ } @@ -525,8 +525,8 @@ krb5_gss_init_sec_context(minor_status, claimant_cred_handle, /* store away the sequence number */ ctx->seq_recv = ap_rep_data->seq_number; g_order_init(&(ctx->seqstate), ctx->seq_recv, - req_flags & GSS_C_REPLAY_FLAG, - req_flags & GSS_C_SEQUENCE_FLAG); + (req_flags & GSS_C_REPLAY_FLAG) != 0, + (req_flags & GSS_C_SEQUENCE_FLAG) !=0); /* free the ap_rep_data */ krb5_free_ap_rep_enc_part(context, ap_rep_data); diff --git a/src/lib/gssapi/krb5/ser_sctx.c b/src/lib/gssapi/krb5/ser_sctx.c index 2a8cd0dd0..428e52c14 100644 --- a/src/lib/gssapi/krb5/ser_sctx.c +++ b/src/lib/gssapi/krb5/ser_sctx.c @@ -238,6 +238,7 @@ kg_oid_externalize(kcontext, arg, buffer, lenremain) buffer, lenremain); (void) krb5_ser_pack_bytes((krb5_octet *) oid->elements, oid->length, buffer, lenremain); + return 0; } static krb5_error_code |