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 ff258717dc9eed1b9fbb208e5aec8ec6230dca04..12b5a1535757a094517e9da7306fb72350d00c4e 100644 (file)
--- 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 bb244c2ece72644325dc5bb27790c5d7cb31a3d7..a919968369e7b3c115541015dd4d79a8dc4d7952 100644 (file)
--- 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);