pull up r20175 from trunk
authorTom Yu <tlyu@mit.edu>
Wed, 2 Jan 2008 23:48:54 +0000 (23:48 +0000)
committerTom Yu <tlyu@mit.edu>
Wed, 2 Jan 2008 23:48:54 +0000 (23:48 +0000)
 r20175@cathode-dark-space:  coffman | 2007-12-12 09:10:33 -0500
 ticket: new
 subject: copy correct key for lucid context acceptor_subkey
 component: krb5-libs
 Tags: pullup

 Copy the correct key (acceptor_subkey) to lucid context's acceptor_subkey.

ticket: 5852
version_fixed: 1.6.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@20198 dc483132-0cff-0310-8789-dd5450dbe970

src/lib/gssapi/krb5/lucid_context.c

index a1679a93d5600f42ae8935b83dc6d46607ec29ac..0bb48b65c889b599b334d21852cecd79c154ecef 100644 (file)
@@ -231,7 +231,7 @@ make_external_lucid_ctx_v1(
                                        &lctx->cfx_kd.ctx_key)))
            goto error_out;
        if (gctx->have_acceptor_subkey) {
-           if ((retval = copy_keyblock_to_lucid_key(gctx->enc,
+           if ((retval = copy_keyblock_to_lucid_key(gctx->acceptor_subkey,
                                        &lctx->cfx_kd.acceptor_subkey)))
                goto error_out;
            lctx->cfx_kd.have_acceptor_subkey = 1;