aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/libstrongswan/utils.c2
-rw-r--r--src/libstrongswan/utils.h5
2 files changed, 7 insertions, 0 deletions
diff --git a/src/libstrongswan/utils.c b/src/libstrongswan/utils.c
index f613b0c64..8c0c7f46c 100644
--- a/src/libstrongswan/utils.c
+++ b/src/libstrongswan/utils.c
@@ -254,6 +254,8 @@ const char *safe_strerror(int errnum)
return msg;
}
#else /* HAVE_STRERROR_R */
+/* we actually wan't to call strerror(3) below */
+#undef strerror
/*
* Described in header.
*/
diff --git a/src/libstrongswan/utils.h b/src/libstrongswan/utils.h
index 954925dab..c671a2e08 100644
--- a/src/libstrongswan/utils.h
+++ b/src/libstrongswan/utils.h
@@ -422,6 +422,11 @@ bool mkdir_p(const char *path, mode_t mode);
*/
const char *safe_strerror(int errnum);
+/**
+ * Replace usages of strerror(3) with thread-safe variant.
+ */
+#define strerror(errnum) safe_strerror(errnum)
+
#ifndef HAVE_CLOSEFROM
/**
* Close open file descriptors greater than or equal to lowfd.