summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Heinrich <theinric@redhat.com>2011-12-16 10:54:40 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2011-12-16 10:54:40 +0100
commit5f662e81de4ec13bd29ec7b686646b2a8996f45d (patch)
tree9d7edc45a984831ce0b875f1e59b5852110d9982
parent21c2f630e9ce218f86b1bd314e7c803b381fcec2 (diff)
downloadrsyslog-5f662e81de4ec13bd29ec7b686646b2a8996f45d.tar.gz
rsyslog-5f662e81de4ec13bd29ec7b686646b2a8996f45d.tar.xz
rsyslog-5f662e81de4ec13bd29ec7b686646b2a8996f45d.zip
bugfix: potential fatal abort in omgssapi
-rw-r--r--ChangeLog4
-rw-r--r--plugins/omgssapi/omgssapi.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f2e0199..6fc754cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,9 @@ Version 4.8.1 [v4-stable], 2011-09-??
platforms)
- bugfix: potential abort after reading invalid X.509 certificate
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290
- Thanks to Tomas Heinrich for the patch
+ Thanks to Tomas Heinrich for the patch.
+- bugfix: potential fatal abort in omgssapi
+ Thanks to Tomas Heinrich for the patch.
- added doc for omprog
---------------------------------------------------------------------------
Version 4.8.0 [v4-stable] (rgerhards), 2011-09-07
diff --git a/plugins/omgssapi/omgssapi.c b/plugins/omgssapi/omgssapi.c
index 782ac22f..3fb0b8f0 100644
--- a/plugins/omgssapi/omgssapi.c
+++ b/plugins/omgssapi/omgssapi.c
@@ -361,9 +361,7 @@ static rsRetVal doTryResume(instanceData *pData)
}
break;
case eDestFORW:
- /* rgerhards, 2007-09-11: this can not happen, but I've included it to
- * a) make the compiler happy, b) detect any logic errors */
- assert(0);
+ /* NOOP */
break;
}