Don't send the intro until we receive the connect signal.

1 files changed, 13 insertions, 9 deletions

diff --git a/omapip/protocol.c b/omapip/protocol.c
index 65d1ce8c..d33ab76f 100644
--- a/omapip/protocol.c
+++ b/omapip/protocol.c
@@ -76,15 +76,6 @@ isc_result_t omapi_protocol_connect (omapi_object_t *h,
 		return status;
 	}
 
-	/* Send the introductory message. */
-	status = omapi_protocol_send_intro ((omapi_object_t *)obj,
-					    OMAPI_PROTOCOL_VERSION,
-					    sizeof (omapi_protocol_header_t));
-	if (status != ISC_R_SUCCESS) {
-		omapi_object_dereference ((omapi_object_t **)&obj, MDL);
-		return status;
-	}
-
 	if (authinfo)
 		omapi_object_reference (&obj -> authinfo, authinfo, MDL);
 	omapi_object_dereference ((omapi_object_t **)&obj, MDL);
@@ -253,6 +244,19 @@ isc_result_t omapi_protocol_signal_handler (omapi_object_t *h,
 	}
 	p = (omapi_protocol_object_t *)h;
 
+	if (!strcmp (name, "connect")) {
+		/* Send the introductory message. */
+		status = omapi_protocol_send_intro
+			((omapi_object_t *)obj,
+			 OMAPI_PROTOCOL_VERSION,
+			 sizeof (omapi_protocol_header_t));
+		if (status != ISC_R_SUCCESS) {
+			omapi_disconnect (p -> outer, 1);
+			return status;
+		}
+		return ISC_R_SUCCESS;
+	}
+
 	/* Not a signal we recognize? */
 	if (strcmp (name, "ready")) {
 		if (p -> inner && p -> inner -> type -> signal_handler)