From 6b8576e29f08604e061aa2cf7b688e9e3b9f8293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Wed, 12 Apr 2006 17:45:03 +0000 Subject: [PATCH] Import sequence order element. From Wynn Wilkes . git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17060 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/gssapi/import_sec_context.c | 19 ++++++------------- lib/gssapi/krb5/import_sec_context.c | 19 ++++++------------- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/lib/gssapi/import_sec_context.c b/lib/gssapi/import_sec_context.c index e86f60d53..b047b9683 100644 --- a/lib/gssapi/import_sec_context.c +++ b/lib/gssapi/import_sec_context.c @@ -54,7 +54,6 @@ gss_import_sec_context ( int32_t tmp; int32_t flags; OM_uint32 minor; - int is_cfx = 0; GSSAPI_KRB5_INIT (); @@ -190,20 +189,14 @@ gss_import_sec_context ( if (krb5_ret_int32 (sp, &tmp)) goto failure; (*context_handle)->more_flags = tmp; - if (krb5_ret_int32 (sp, &tmp) == 0) - (*context_handle)->lifetime = tmp; - else - (*context_handle)->lifetime = GSS_C_INDEFINITE; - - gsskrb5_is_cfx(*context_handle, &is_cfx); - - ret = _gssapi_msg_order_create(minor_status, - &(*context_handle)->order, - _gssapi_msg_order_f((*context_handle)->flags), - 0, 0, is_cfx); - if (ret) + if (krb5_ret_int32 (sp, &tmp)) goto failure; + (*context_handle)->lifetime = tmp; + ret = _gssapi_msg_order_import(minor_status, sp, &(*context_handle)->order); + if (ret) + goto failure; + krb5_storage_free (sp); return GSS_S_COMPLETE; diff --git a/lib/gssapi/krb5/import_sec_context.c b/lib/gssapi/krb5/import_sec_context.c index e86f60d53..b047b9683 100644 --- a/lib/gssapi/krb5/import_sec_context.c +++ b/lib/gssapi/krb5/import_sec_context.c @@ -54,7 +54,6 @@ gss_import_sec_context ( int32_t tmp; int32_t flags; OM_uint32 minor; - int is_cfx = 0; GSSAPI_KRB5_INIT (); @@ -190,20 +189,14 @@ gss_import_sec_context ( if (krb5_ret_int32 (sp, &tmp)) goto failure; (*context_handle)->more_flags = tmp; - if (krb5_ret_int32 (sp, &tmp) == 0) - (*context_handle)->lifetime = tmp; - else - (*context_handle)->lifetime = GSS_C_INDEFINITE; - - gsskrb5_is_cfx(*context_handle, &is_cfx); - - ret = _gssapi_msg_order_create(minor_status, - &(*context_handle)->order, - _gssapi_msg_order_f((*context_handle)->flags), - 0, 0, is_cfx); - if (ret) + if (krb5_ret_int32 (sp, &tmp)) goto failure; + (*context_handle)->lifetime = tmp; + ret = _gssapi_msg_order_import(minor_status, sp, &(*context_handle)->order); + if (ret) + goto failure; + krb5_storage_free (sp); return GSS_S_COMPLETE;