summaryrefslogtreecommitdiff
path: root/src/openvpn/error.c
diff options
context:
space:
mode:
authorAlberto Gonzalez Iniesta <agi@inittab.org>2016-01-20 12:01:07 +0100
committerAlberto Gonzalez Iniesta <agi@inittab.org>2016-01-20 12:01:07 +0100
commit19eab1fe2df20e38ea64d7a642d3e21c957082b8 (patch)
treefad602b603321d3e0e45807f8abb4f6c670a6cf2 /src/openvpn/error.c
parent35807e5652390e8b2fd66b9051f3b41c9488302e (diff)
parent9653b1bffea4e96c1eb7c1814e8bed21fea62321 (diff)
Merge tag 'upstream/2.3.10'
Upstream version 2.3.10
Diffstat (limited to 'src/openvpn/error.c')
-rw-r--r--src/openvpn/error.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/openvpn/error.c b/src/openvpn/error.c
index 6848425..f503cf4 100644
--- a/src/openvpn/error.c
+++ b/src/openvpn/error.c
@@ -397,9 +397,13 @@ dont_mute (unsigned int flags)
}
void
-assert_failed (const char *filename, int line)
+assert_failed (const char *filename, int line, const char *condition)
{
- msg (M_FATAL, "Assertion failed at %s:%d", filename, line);
+ if (condition)
+ msg (M_FATAL, "Assertion failed at %s:%d (%s)", filename, line, condition);
+ else
+ msg (M_FATAL, "Assertion failed at %s:%d", filename, line);
+ _exit(1);
}
/*