1 files changed, 6 insertions, 34 deletions
diff --git a/security/trousers/files/patch-src-tspi-rpc-hosttable.c b/security/trousers/files/patch-src-tspi-rpc-hosttable.c
index befd61032770..144ec14535ad 100644
--- a/security/trousers/files/patch-src-tspi-rpc-hosttable.c
+++ b/security/trousers/files/patch-src-tspi-rpc-hosttable.c
@@ -1,20 +1,6 @@
---- src/tspi/rpc/hosttable.c.orig	2012-09-20 02:35:07.000000000 +0900
-+++ src/tspi/rpc/hosttable.c	2014-08-06 15:35:22.000000000 +0900
-@@ -36,10 +36,10 @@
- }
- 
- #ifdef SOLARIS
--#pragma init(_init)
--void _init(void)
-+#pragma init(_init_hosttable)
-+void _init_hosttable(void)
- #else
--void __attribute__ ((constructor)) my_init(void)
-+static void __attribute__ ((constructor)) my_init(void)
- #endif
- {
- 	host_table_init();
-@@ -51,6 +51,8 @@
+--- src/tspi/rpc/hosttable.c.orig	2014-04-24 18:05:44 UTC
++++ src/tspi/rpc/hosttable.c
+@@ -51,6 +51,8 @@ host_table_final()
  {
  	struct host_table_entry *hte, *next = NULL;
  
@@ -23,21 +9,7 @@
  	MUTEX_LOCK(ht->lock);
  
  	for (hte = ht->entries; hte; hte = next) {
-@@ -70,10 +72,10 @@
- }
- 
- #ifdef SOLARIS
--#pragma fini(_fini)
--void _fini(void)
-+#pragma fini(_fini_hosttable)
-+void _fini_hosttable(void)
- #else
--void __attribute__ ((destructor)) my_fini(void)
-+static void __attribute__ ((destructor)) my_fini(void)
- #endif
- {
- 	host_table_final();
-@@ -84,6 +86,8 @@
+@@ -84,6 +86,8 @@ __tspi_add_table_entry(TSS_HCONTEXT tspC
  {
  	struct host_table_entry *entry, *tmp;
  
@@ -46,7 +18,7 @@
          entry = calloc(1, sizeof(struct host_table_entry));
          if (entry == NULL) {
                  LogError("malloc of %zd bytes failed.", sizeof(struct host_table_entry));
-@@ -134,6 +138,8 @@
+@@ -134,6 +138,8 @@ remove_table_entry(TSS_HCONTEXT tspConte
  {
  	struct host_table_entry *hte, *prev = NULL;
  
@@ -55,7 +27,7 @@
  	MUTEX_LOCK(ht->lock);
  
  	for (hte = ht->entries; hte; prev = hte, hte = hte->next) {
-@@ -158,6 +164,8 @@
+@@ -158,6 +164,8 @@ get_table_entry(TSS_HCONTEXT tspContext)
  {
  	struct host_table_entry *index = NULL;