From 111ddeddac16c0fef968438aa43821b84ebe51f3 Mon Sep 17 00:00:00 2001
From: Niels Provos <provos@gmail.com>
Date: Fri, 3 Oct 2008 15:23:47 +0000
Subject: [PATCH] fix merge error: event_add would not return error for some
 backends; from Dean McNamee

svn:r943
---
 ChangeLog | 3 +++
 event.c   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c5921393..ae5d991e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Changes in 1.4.9-stable:
+ o event_add would not return error for some backends; from Dean McNamee
+
 Changes in 1.4.8-stable:
  o Match the query in DNS replies to the query in the request; from Vsevolod Stakhov.
  o Fix a merge problem in which name_from_addr returned pointers to the stack; found by Jiang Hong.
diff --git a/event.c b/event.c
index 3396b351..487ce252 100644
--- a/event.c
+++ b/event.c
@@ -779,7 +779,7 @@ event_add(struct event *ev, const struct timeval *tv)
 		event_queue_insert(base, ev, EVLIST_TIMEOUT);
 	}
 
-	return (0);
+	return (res);
 }
 
 int