diff options
| author | Damien Neil <source@isc.org> | 2000-12-09 00:07:46 +0000 |
|---|---|---|
| committer | Damien Neil <source@isc.org> | 2000-12-09 00:07:46 +0000 |
| commit | a3239005104eac255d7210c5ec76a376d7ff0116 (patch) | |
| tree | c9da0e4f238b300faaaa9e1c5571244f1866e675 /omapip | |
| parent | 580523b01354ccc9dc6c25228a60e8343bce4886 (diff) | |
| download | isc-dhcp-a3239005104eac255d7210c5ec76a376d7ff0116.tar.gz | |
Fix omapi_protocol_connect() to properly return ISC_R_INCOMPLETE
when necessary. This should fix problems with forming OMAPI connections
to remote hosts.
Diffstat (limited to 'omapip')
| -rw-r--r-- | omapip/protocol.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/omapip/protocol.c b/omapip/protocol.c index ac1d63bd..02af9dba 100644 --- a/omapip/protocol.c +++ b/omapip/protocol.c @@ -53,7 +53,7 @@ isc_result_t omapi_protocol_connect (omapi_object_t *h, unsigned port, omapi_object_t *a) { - isc_result_t status; + isc_result_t rstatus, status; omapi_protocol_object_t *obj; #ifdef DEBUG_PROTOCOL @@ -65,10 +65,10 @@ isc_result_t omapi_protocol_connect (omapi_object_t *h, if (status != ISC_R_SUCCESS) return status; - status = omapi_connect ((omapi_object_t *)obj, server_name, port); - if (status != ISC_R_SUCCESS && status != ISC_R_INCOMPLETE) { + rstatus = omapi_connect ((omapi_object_t *)obj, server_name, port); + if (rstatus != ISC_R_SUCCESS && rstatus != ISC_R_INCOMPLETE) { omapi_protocol_dereference (&obj, MDL); - return status; + return rstatus; } status = omapi_object_reference (&h -> outer, (omapi_object_t *)obj, MDL); @@ -102,14 +102,16 @@ isc_result_t omapi_protocol_connect (omapi_object_t *h, } obj -> insecure = 0; - status = ISC_R_INCOMPLETE; + rstatus = ISC_R_INCOMPLETE; } else { obj -> insecure = 1; +#if 0 status = ISC_R_SUCCESS; +#endif } omapi_protocol_dereference (&obj, MDL); - return status; + return rstatus; } /* Send the protocol introduction message. */ |