From dc17806ebfd42041f4829310035fde643efced7b Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Mon, 1 Nov 2010 20:36:33 +0000 Subject: [PATCH] pull up r24483 from trunk ------------------------------------------------------------------------ r24483 | ghudson | 2010-10-26 10:17:38 -0400 (Tue, 26 Oct 2010) | 8 lines ticket: 6809 target_version: 1.9 tags: pullup Set *conf_state on successful return from gss_krb5int_make_seal_token_v3_iov, fixing a case where it wasn't always set by gss_wrap_iov. Patch from aberry@likewise.com. ticket: 6809 version_fixed: 1.9 status: resolved git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-9@24498 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/gssapi/krb5/k5sealv3iov.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/gssapi/krb5/k5sealv3iov.c b/src/lib/gssapi/krb5/k5sealv3iov.c index f977d9b19..5ccee2cd7 100644 --- a/src/lib/gssapi/krb5/k5sealv3iov.c +++ b/src/lib/gssapi/krb5/k5sealv3iov.c @@ -268,6 +268,8 @@ gss_krb5int_make_seal_token_v3_iov(krb5_context context, } code = 0; + if (conf_state != NULL) + *conf_state = conf_req_flag; cleanup: if (code != 0) -- 2.26.2