* cygtls.cc (_cygtls::init_thread): Drop setting locals.process_logmask.

	* cygtls.cc (_cygtls::remove): Always free mallocated TLS storage on
	thread exit.  Drop freeing locals.process_ident.
	* cygtls.h (struct _local_storage): Remove syslog-related members.
	* syslog.cc (syslog_globals): New static storage for global syslog
	settings.  Use throughout instead of _my_tls.locals.
	(openlog): Set new syslog_globals.process_ident value more carefully.
	* tlsoffsets.h: Regenerate.

1 files changed, 14 insertions, 17 deletions

diff --git a/winsup/cygwin/cygtls.cc b/winsup/cygwin/cygtls.cc
index 026d4c837..ba4e31a61 100644
--- a/winsup/cygwin/cygtls.cc
+++ b/winsup/cygwin/cygtls.cc
@@ -93,7 +93,6 @@ _cygtls::init_thread (void *x, DWORD (*func) (void *, void *))
 	  local_clib.__sglue._niobs = 3;
 	  local_clib.__sglue._iobs = &_GLOBAL_REENT->__sf[0];
 	}
-      locals.process_logmask = LOG_UPTO (LOG_DEBUG);
     }
 
   thread_id = GetCurrentThreadId ();
@@ -146,25 +145,23 @@ _cygtls::remove (DWORD wait)
     return;
 
   debug_printf ("wait %p", wait);
+
+  /* FIXME: Need some sort of atthreadexit function to allow things like
+     select to control this themselves. */
+
+  /* Close handle and free memory used by select. */
   if (locals.select.sockevt)
-      CloseHandle (locals.select.sockevt);
-  if (wait)
     {
-      /* FIXME: Need some sort of atthreadexit function to allow things like
-	 select to control this themselves. */
-      if (locals.select.sockevt)
-	{
-	  locals.select.sockevt = NULL;
-	  free_local (select.ser_num);
-	  free_local (select.w4);
-	}
-      free_local (process_ident);
-      free_local (ntoa_buf);
-      free_local (protoent_buf);
-      free_local (servent_buf);
-      free_local (hostent_buf);
+      CloseHandle (locals.select.sockevt);
+      locals.select.sockevt = NULL;
+      free_local (select.ser_num);
+      free_local (select.w4);
     }
-
+  /* Free memory used by network functions. */
+  free_local (ntoa_buf);
+  free_local (protoent_buf);
+  free_local (servent_buf);
+  free_local (hostent_buf);
   /* Free temporary TLS path buffers. */
   locals.pathbufs.destroy ();