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

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 3ca720cb65228f07314793e97cc0b31d85509233..3e39c7f360cee63e83951232c3e5ab42b186de90 100644 (file)
--- 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 09ed412472d07aecb4d38de5d5d1f4655874feb6..194443254dfa4346e122c46bb4d7cabe02f9fe8a 100644 (file)
--- 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 686384216a6d72c78d5daabce9c7b8820d18b6b5..e5cbcc4d009b9dabae777858a5b7862936163648 100644 (file)
--- 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 2a8cd0dd038fc8d1cf3340ec4f4004465dea33a8..428e52c14f83dfb0025f8c82a8e30f184fbec82d 100644 (file)
--- 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