svn rev #24498: branches/krb5-1-9/src/lib/gssapi/krb5/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24498
Commit By: tlyu
Log Message:
ticket: 6809
version_fixed: 1.9
status: resolved

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 at likewise.com.


Changed Files:
U   branches/krb5-1-9/src/lib/gssapi/krb5/k5sealv3iov.c
Modified: branches/krb5-1-9/src/lib/gssapi/krb5/k5sealv3iov.c
===================================================================
--- branches/krb5-1-9/src/lib/gssapi/krb5/k5sealv3iov.c	2010-11-01 20:36:28 UTC (rev 24497)
+++ branches/krb5-1-9/src/lib/gssapi/krb5/k5sealv3iov.c	2010-11-01 20:36:33 UTC (rev 24498)
@@ -268,6 +268,8 @@
     }
 
     code = 0;
+    if (conf_state != NULL)
+        *conf_state = conf_req_flag;
 
 cleanup:
     if (code != 0)