From: Thomas Markwalder <tmark@isc.org>
Date: Tue, 6 Sep 2016 19:34:38 +0000 (-0400)
Subject: [master] Removed extraneous expression from omapi socket callback
X-Git-Tag: v4_4_0b1_f1~138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9564b4f04c996c95d1359630a8b900857b266ef3;p=thirdparty%2Fdhcp.git

[master] Removed extraneous expression from omapi socket callback

    Merges in rt42834.
---

diff --git a/RELNOTES b/RELNOTES
index 23c923308..5666f4601 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -60,6 +60,12 @@ by Eric Young (eay@cryptsoft.com).
   script.
   [ISC-Bugs #39863]
 
+- Removed an extraneous expression in omapi socket callback function. Prior
+  to this change, the logic was techinically incorrect but other factors
+  ensured the outcome itself was correct.  This change was made primarily
+  for code clarity.
+  [ISC-Bugs #42834]
+
 			Changes since 4.3.0 (bug fixes)
 
 - Tidy up several small tickets.
diff --git a/omapip/dispatch.c b/omapip/dispatch.c
index be3918b68..d42d74403 100644
--- a/omapip/dispatch.c
+++ b/omapip/dispatch.c
@@ -134,12 +134,11 @@ omapi_iscsock_cb(isc_task_t   *task,
 	 * walk through the io states list, if our object is on there
 	 * service it.  if not ignore it.
 	 */
-	for (obj = omapi_io_states.next;
-	     (obj != NULL) && (obj->next != NULL);
-	     obj = obj->next) {
+	for (obj = omapi_io_states.next; obj != NULL; obj = obj->next) {
 		if (obj == cbarg)
 			break;
 	}
+
 	if (obj == NULL) {
 		return(0);
 	}