← Back to branch summary

~ubuntu-branches/ubuntu/saucy/trousers/saucy

« back to all changes in this revision

Viewing changes to src/tcs/rpc/tcstp/rpc_certify.c

  • Committer: Logan Rosen
  • Date: 2012-11-30 16:31:54 UTC
  • mfrom: (0.1.25 sid)
  • Revision ID: logatronico@gmail.com-20121130163154-jllqpry4lo24ol6p
http://bugs.debian.org/680375
* Merge from Debian unstable. Remaining changes:
  - debian/trousers.postinst: Reload udev rules to reload new users and
    groups.
* Dropped Ubuntu change in debian/trousers.prerm to make remove work,
  as Debian made a different one with the same goal that works as well.
* Imported Upstream version 0.3.10
* Update symbols file
* Force build of tools
* Fix regression introduced in previous patch, preventing removal
  (Closes: #680375)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/tcs/rpc/tcstp/rpc_certify.c
46
46
        if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
47
47
                return TCSERR(TSS_E_INTERNAL_ERROR);
48
48
 
 
49
        if ((result = ctx_verify_context(hContext)))
 
50
                goto done;
 
51
 
49
52
        LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
50
53
 
51
54
        if (getData(TCSD_PACKET_TYPE_UINT32, 1, &certHandle, 0, &data->comm))
112
115
                }
113
116
                free(outData);
114
117
        } else
115
 
                initData(&data->comm, 0);
 
118
done:           initData(&data->comm, 0);
116
119
 
117
120
        data->comm.hdr.u.result = result;
118
121