@@ -662,7 +662,7 @@ AC_FUNC_FORK

 AC_CHECK_FUNCS([ \

 	daemon chroot getpwnam setuid nice system getpid dup dup2 \

-	getpass strerror syslog openlog mlockall getgrnam setgid \

+	getpass syslog openlog mlockall getgrnam setgid \

 	setgroups stat flock readv writev time gettimeofday \

 	ctime memset vsnprintf strdup \

 	setsid chdir putenv getpeername unlink \

@@ -267,7 +267,7 @@ x_msg_va(const unsigned int flags, const char *format, va_list arglist)

     if ((flags & M_ERRNO) && e)

     {

         openvpn_snprintf(m2, ERR_BUF_SIZE, "%s: %s (errno=%d)",

-                         m1, strerror_ts(e, &gc), e);

+                         m1, strerror(e), e);

         SWAP;

     }

@@ -693,20 +693,15 @@ x_check_status(int status,

         {

             if (extended_msg)

             {

-                msg(x_cs_info_level, "%s %s [%s]: %s (code=%d)",

-                    description,

+                msg(x_cs_info_level, "%s %s [%s]: %s (code=%d)", description,

                     sock ? proto2ascii(sock->info.proto, sock->info.af, true) : "",

-                    extended_msg,

-                    strerror_ts(my_errno, &gc),

-                    my_errno);

+                    extended_msg, strerror(my_errno), my_errno);

             }

             else

             {

-                msg(x_cs_info_level, "%s %s: %s (code=%d)",

-                    description,

+                msg(x_cs_info_level, "%s %s: %s (code=%d)", description,

                     sock ? proto2ascii(sock->info.proto, sock->info.af, true) : "",

-                    strerror_ts(my_errno, &gc),

-                    my_errno);

+                    strerror(my_errno), my_errno);

             }

             if (x_cs_err_delay_ms)

@@ -2006,9 +2006,8 @@ man_io_error(struct management *man, const char *prefix)

     if (!ignore_sys_error(err))

     {

         struct gc_arena gc = gc_new();

-        msg(D_MANAGEMENT, "MANAGEMENT: TCP %s error: %s",

-            prefix,

-            strerror_ts(err, &gc));

+        msg(D_MANAGEMENT, "MANAGEMENT: TCP %s error: %s", prefix,

+            strerror(err));

         gc_free(&gc);

         return true;

     }

@@ -444,21 +444,6 @@ init_random_seed(void)

     }

 }

-/* thread-safe strerror */

-

-const char *

-strerror_ts(int errnum, struct gc_arena *gc)

-{

-#ifdef HAVE_STRERROR

-    struct buffer out = alloc_buf_gc(256, gc);

-

-    buf_printf(&out, "%s", openvpn_strerror(errnum, gc));

-    return BSTR(&out);

-#else

-    return "[error string unavailable]";

-#endif

-}

-

 /*

  * Set environmental variable (int or string).

  *

@@ -95,12 +95,6 @@ openvpn_run_script(const struct argv *a, const struct env_set *es, const unsigne

 }

-#ifdef HAVE_STRERROR

-/* a thread-safe version of strerror */

-const char *strerror_ts(int errnum, struct gc_arena *gc);

-

-#endif

-

 /* Set standard file descriptors to /dev/null */

 void set_std_files_to_null(bool stdin_only);

@@ -1473,10 +1473,8 @@ socket_connect(socket_descriptor_t *sd,

     if (status)

     {

-        msg(D_LINK_ERRORS,

-            "TCP: connect to %s failed: %s",

-            print_sockaddr(dest, &gc),

-            strerror_ts(status, &gc));

+        msg(D_LINK_ERRORS, "TCP: connect to %s failed: %s",

+            print_sockaddr(dest, &gc), strerror(status));

         openvpn_close_socket(*sd);

         *sd = SOCKET_UNDEFINED;