← Back to branch summary

~ubuntu-branches/ubuntu/raring/trousers/raring-proposed

« back to all changes in this revision

Viewing changes to src/tcs/rpc/tcstp/rpc_caps_tpm.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_caps_tpm.c
41
41
        if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
42
42
                return TCSERR(TSS_E_INTERNAL_ERROR);
43
43
 
 
44
        if ((result = ctx_verify_context(hContext)))
 
45
                goto done;
 
46
 
44
47
        LogDebugFn("thread %ldd context %x", THREAD_ID, hContext);
45
48
 
46
49
        if (getData(TCSD_PACKET_TYPE_UINT32, 1, &capArea, 0, &data->comm))
82
85
                }
83
86
                free(resp);
84
87
        } else
85
 
                initData(&data->comm, 0);
 
88
done:           initData(&data->comm, 0);
86
89
 
87
90
        data->comm.hdr.u.result = result;
88
91
        return TSS_SUCCESS;
101
104
        if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
102
105
                return TCSERR(TSS_E_INTERNAL_ERROR);
103
106
 
 
107
        if ((result = ctx_verify_context(hContext)))
 
108
                goto done;
 
109
 
104
110
        LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
105
111
 
106
112
        if (getData(TCSD_PACKET_TYPE_AUTH, 1, &ownerAuth, 0, &data->comm))
127
133
                        return TCSERR(TSS_E_INTERNAL_ERROR);
128
134
                }
129
135
        } else
130
 
                initData(&data->comm, 0);
 
136
done:           initData(&data->comm, 0);
131
137
 
132
138
        data->comm.hdr.u.result = result;
133
139
        return TSS_SUCCESS;
148
154
        if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
149
155
                return TCSERR(TSS_E_INTERNAL_ERROR);
150
156
 
 
157
        if ((result = ctx_verify_context(hContext)))
 
158
                goto done;
 
159
 
151
160
        LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
152
161
 
153
162
        if (getData(TCSD_PACKET_TYPE_UINT32, 1, &capArea, 0, &data->comm))
213
222
                        }
214
223
                }
215
224
        } else
216
 
                initData(&data->comm, 0);
 
225
done:           initData(&data->comm, 0);
217
226
 
218
227
        data->comm.hdr.u.result = result;
219
228
        return TSS_SUCCESS;