Support ISC_R_INCOMPLETE for partial connects.

diff --git a/dhcpctl/dhcpctl.c b/dhcpctl/dhcpctl.c
index cf1a60148a1683a7683790cb06f81a20b4722087..9fe647bb4a724f05bfa7c6676033bac5bb254b5d 100644 (file)
--- a/dhcpctl/dhcpctl.c
+++ b/dhcpctl/dhcpctl.c
@@ -100,7 +100,9 @@ dhcpctl_status dhcpctl_connect (dhcpctl_handle *connection,
 
        status = omapi_protocol_connect (*connection, server_name,
                                         (unsigned)port, authinfo);
-       if (status != ISC_R_SUCCESS) {
+       if (status == ISC_R_SUCCESS)
+               return status;
+       if (status != ISC_R_INCOMPLETE) {
                omapi_object_dereference (connection, MDL);
                return status;
        }

diff --git a/includes/isc/result.h b/includes/isc/result.h
index 4c43564c60d181886466c4f645eda802c9589522..8fc4a79f57fa1256780806b5bf0edd057e657d33 100644 (file)
--- a/includes/isc/result.h
+++ b/includes/isc/result.h
@@ -74,8 +74,9 @@ ISC_LANG_BEGINDECLS
 #define ISC_R_NOKEYS                   46
 #define ISC_R_KEY_UNKNOWN              47
 #define ISC_R_INVALIDKEY               48
+#define ISC_R_INCOMPLETE               49
 
-#define ISC_R_NRESULTS                         49      /* Number of results */
+#define ISC_R_NRESULTS                         50      /* Number of results */
 
 const char *           isc_result_totext(isc_result_t);
 isc_result_t           isc_result_register(unsigned int base,

diff --git a/omapip/connection.c b/omapip/connection.c
index 7afa1605d662ae5ef7202418ca32c6d400db1975..aa37235faaca387158c5baa5f36dab2f544c2b59 100644 (file)
--- a/omapip/connection.c
+++ b/omapip/connection.c
@@ -361,7 +361,7 @@ isc_result_t omapi_connection_connect (omapi_object_t *h)
                                return ISC_R_UNEXPECTED;
                        }
                        c -> state = omapi_connection_connecting;
-                       return ISC_R_SUCCESS;
+                       return ISC_R_INCOMPLETE;
                }
                c -> state = omapi_connection_connected;
        }

diff --git a/omapip/result.c b/omapip/result.c
index e9a3161c434939842b5794e3ffe77709589992ff..4a855f55c3168ab6ac3ea3e708e13723fe98825f 100644 (file)
--- a/omapip/result.c
+++ b/omapip/result.c
@@ -94,6 +94,7 @@ static const char *text[ISC_R_NRESULTS] = {
        "no key specified",                     /* 46 */
        "zone TSIG key not known",              /* 47 */
        "invalid TSIG key",                     /* 48 */
+       "operation in progress",                /* 49 */
 };
 
 const char *isc_result_totext (isc_result_t result)