From: Shawn Routhier <sar@isc.org>
Date: Tue, 24 May 2011 00:32:00 +0000 (+0000)
Subject: Convert ISC_R_INPROGRESS status to ISC_R_SUCCESS when called from other
X-Git-Tag: v4_2_2b1~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8e1fe59452533080851b4973e79d816c4fc05f0;p=thirdparty%2Fdhcp.git

Convert ISC_R_INPROGRESS status to ISC_R_SUCCESS when called from other
than the dispatch handler.  This fixes an issue where omshell, when
run from the same platform as the server, would appear to fail to
connect.  This is a companion to #21839.  [ISC-Bugs #23592]
---

diff --git a/RELNOTES b/RELNOTES
index ff258717d..12b5a1535 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -146,6 +146,11 @@ work on other platforms. Please report any problems and suggested fixes to
 - Server no longer complains about NULL pointer when configured 
   server-identifier expression fails to evaluate. [ISC-Bugs #24547]
 
+- Convert ISC_R_INPROGRESS status to ISC_R_SUCCESS when called from other
+  than the dispatch handler.  This fixes an issue where omshell, when
+  run from the same platform as the server, would appear to fail to
+  connect.  This is a companion to #21839.  [ISC-Bugs #23592]
+
 			Changes since 4.2.1rc1
 
 - None
diff --git a/omapip/connection.c b/omapip/connection.c
index bb244c2ec..a91996836 100644
--- a/omapip/connection.c
+++ b/omapip/connection.c
@@ -3,7 +3,7 @@
    Subroutines for dealing with connections. */
 
 /*
- * Copyright (c) 2009-2010 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009-2011 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004,2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
  *
@@ -231,6 +231,16 @@ isc_result_t omapi_connect_list (omapi_object_t *c,
 			goto out;
 		status = omapi_connection_connect_internal ((omapi_object_t *)
 							    obj);
+		/*
+		 * inprogress is the same as success but used
+		 * to indicate to the dispatch code that we should
+		 * mark the socket as requiring more attention.
+		 * Routines calling this function should handle
+		 * success properly.
+		 */
+		if (status == ISC_R_INPROGRESS) {
+			status = ISC_R_SUCCESS;
+		}
 #if defined (TRACING)
 	}
 	omapi_connection_register (obj, MDL);