← Back to branch summary

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

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

« back to all changes in this revision

Viewing changes to src/tcsd/tcsd_conf.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)

files removed:
.gitignore

files modified:
Makefile.am

Makefile.in

aclocal.m4

autom4te.cache/output.0

autom4te.cache/output.1

autom4te.cache/requests

autom4te.cache/traces.0

autom4te.cache/traces.1

config.guess

config.sub

configure

configure.in

debian/changelog

debian/libtspi1.symbols

debian/rules

debian/trousers.prerm

depcomp

dist/Makefile.in

install-sh

ltmain.sh *

man/Makefile.in

man/man3/Makefile.in

man/man5/Makefile.in

man/man8/Makefile.in

missing

src/Makefile.in

src/include/Makefile.in

src/include/hosttable.h

src/include/rpc_tcstp.h

src/include/tcslog.h

src/tcs/Makefile.am

src/tcs/Makefile.in

src/tcs/rpc/tcstp/rpc.c

src/tcs/rpc/tcstp/rpc_admin.c

src/tcs/rpc/tcstp/rpc_aik.c

src/tcs/rpc/tcstp/rpc_audit.c

src/tcs/rpc/tcstp/rpc_auth.c

src/tcs/rpc/tcstp/rpc_bind.c

src/tcs/rpc/tcstp/rpc_caps.c

src/tcs/rpc/tcstp/rpc_caps_tpm.c

src/tcs/rpc/tcstp/rpc_certify.c

src/tcs/rpc/tcstp/rpc_changeauth.c

src/tcs/rpc/tcstp/rpc_cmk.c

src/tcs/rpc/tcstp/rpc_context.c

src/tcs/rpc/tcstp/rpc_counter.c

src/tcs/rpc/tcstp/rpc_daa.c

src/tcs/rpc/tcstp/rpc_delegate.c

src/tcs/rpc/tcstp/rpc_dir.c

src/tcs/rpc/tcstp/rpc_ek.c

src/tcs/rpc/tcstp/rpc_evlog.c

src/tcs/rpc/tcstp/rpc_key.c

src/tcs/rpc/tcstp/rpc_maint.c

src/tcs/rpc/tcstp/rpc_migration.c

src/tcs/rpc/tcstp/rpc_nv.c

src/tcs/rpc/tcstp/rpc_oper.c

src/tcs/rpc/tcstp/rpc_own.c

src/tcs/rpc/tcstp/rpc_pcr_extend.c

src/tcs/rpc/tcstp/rpc_ps.c

src/tcs/rpc/tcstp/rpc_quote.c

src/tcs/rpc/tcstp/rpc_quote2.c

src/tcs/rpc/tcstp/rpc_random.c

src/tcs/rpc/tcstp/rpc_seal.c

src/tcs/rpc/tcstp/rpc_selftest.c

src/tcs/rpc/tcstp/rpc_sign.c

src/tcs/rpc/tcstp/rpc_tick.c

src/tcs/rpc/tcstp/rpc_transport.c

src/tcs/tcs_aik.c

src/tcs/tcs_context.c

src/tcs/tcs_context_key.c

src/tcs/tcs_evlog_biosem.c

src/tcs/tcs_evlog_imaem.c

src/tcs/tcs_pbg.c

src/tcs/tcs_utils.c

src/tcs/tcsi_caps_tpm.c

src/tcs/tcsi_transport.c

src/tcsd/Makefile.am

src/tcsd/Makefile.in

src/tcsd/tcsd_conf.c

src/tcsd/tcsd_threads.c

src/tddl/Makefile.am

src/tddl/Makefile.in

src/trspi/Makefile.in

src/trspi/trousers.c

src/tspi/Makefile.in

src/tspi/obj_encdata.c

src/tspi/obj_pcrs.c

src/tspi/rpc/hosttable.c

src/tspi/rpc/tcstp/rpc.c

src/tspi/ssl_ui.c

src/tspi/tsp_caps.c

src/tspi/tsp_delegate.c

src/tspi/tspi_admin.c

src/tspi/tspi_dir.c

src/tspi/tspi_maint.c

src/tspi/tspi_quote.c

src/tspi/tspi_quote2.c

tools/Makefile.in

Show diffs side-by-side

added added

removed removed

src/tcsd/tcsd_conf.c

107

107

new_class->classURI = malloc(new_class->classURISize);

108

108

if (new_class->classURI == NULL) {

109

109

LogError("malloc of %u bytes failed", new_class->classURISize);

110

free(new_class);

110

111

return TCSERR(TSS_E_OUTOFMEMORY);

111

112

}

112

113

memcpy(new_class->classURI, tcg_platform_specs[i].specURI,

Older »