← 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_own.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_own.c
47
47
        if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
48
48
                return TCSERR(TSS_E_INTERNAL_ERROR);
49
49
 
 
50
        if ((result = ctx_verify_context(hContext)))
 
51
                goto done;
 
52
 
50
53
        LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
51
54
 
52
55
        if (getData(TCSD_PACKET_TYPE_UINT16, 1, &protocolID, 0, &data->comm))
130
133
                }
131
134
                free(srkKey);
132
135
        } else
133
 
                initData(&data->comm, 0);
 
136
done:           initData(&data->comm, 0);
134
137
 
135
138
        data->comm.hdr.u.result = result;
136
139
        return TSS_SUCCESS;
146
149
        if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
147
150
                return TCSERR(TSS_E_INTERNAL_ERROR);
148
151
 
 
152
        if ((result = ctx_verify_context(hContext)))
 
153
                goto done;
 
154
 
149
155
        LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
150
156
 
151
157
        if (getData(TCSD_PACKET_TYPE_AUTH, 1, &auth, 0, &data->comm))
163
169
                        return TCSERR(TSS_E_INTERNAL_ERROR);
164
170
                }
165
171
        } else
166
 
                initData(&data->comm, 0);
 
172
done:           initData(&data->comm, 0);
167
173
 
168
174
        data->comm.hdr.u.result = result;
169
175
        return TSS_SUCCESS;