diff options
| author | Shawn Routhier <sar@isc.org> | 2011-05-24 00:36:58 +0000 |
|---|---|---|
| committer | Shawn Routhier <sar@isc.org> | 2011-05-24 00:36:58 +0000 |
| commit | 199f0b8abb1180c93fb628039fad614d870ab0ef (patch) | |
| tree | 94854022a824cb16187caee8e31a215d35a7b2e5 /omapip | |
| parent | f6a13c3259c15cfb516555f6d3c87fb3f6f0f31b (diff) | |
| download | isc-dhcp-199f0b8abb1180c93fb628039fad614d870ab0ef.tar.gz | |
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]
Diffstat (limited to 'omapip')
| -rw-r--r-- | omapip/connection.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/omapip/connection.c b/omapip/connection.c index bb244c2e..a9199683 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); |