diff -urN vdt-1.1.13-1/gridftp/control/source/dirt.sh vdt-1.1.14-1/gridftp/control/source/dirt.sh --- vdt-1.1.13-1/gridftp/control/source/dirt.sh Wed May 21 01:59:18 2003 +++ vdt-1.1.14-1/gridftp/control/source/dirt.sh Thu Mar 18 21:14:17 2004 @@ -1,2 +1,2 @@ -DIRT_TIMESTAMP=1053475158 +DIRT_TIMESTAMP=1078499767 DIRT_BRANCH_ID=42 diff -urN vdt-1.1.13-1/gridftp/control/source/globus_ftp_control_client.c vdt-1.1.14-1/gridftp/control/source/globus_ftp_control_client.c --- vdt-1.1.13-1/gridftp/control/source/globus_ftp_control_client.c Wed May 21 01:59:15 2003 +++ vdt-1.1.14-1/gridftp/control/source/globus_ftp_control_client.c Fri Mar 5 16:09:09 2004 @@ -371,6 +371,7 @@ int result; char localhost[MAXHOSTNAMELEN]; struct hostent * hp; + char tmp_hostname[4]; globus_ftp_control_rw_queue_element_t * element; globus_i_ftp_control_debug_printf(1, @@ -450,14 +451,14 @@ goto unlock_exit; } - element->callback=callback; - element->arg=callback_arg; + element->callback = callback; + element->arg = callback_arg; - result=globus_libc_gethostname(localhost,MAXHOSTNAMELEN); + result = globus_libc_gethostname(localhost,MAXHOSTNAMELEN); globus_assert(result == 0); - hp=globus_libc_gethostbyname_r( + hp = globus_libc_gethostbyname_r( host, &(handle->cc_handle.server), handle->cc_handle.server_buffer, @@ -476,6 +477,33 @@ globus_libc_free(element); goto unlock_exit; } + + if(handle->cc_handle.server.h_addr_list[0] != NULL) + { + memcpy(tmp_hostname, handle->cc_handle.server.h_addr_list[0], 4); + + hp = globus_libc_gethostbyaddr_r( + tmp_hostname, + 4, + AF_INET, + &(handle->cc_handle.server), + handle->cc_handle.server_buffer, + GLOBUS_FTP_CONTROL_HOSTENT_BUFFER_SIZE, + &errno); + + if(hp == GLOBUS_NULL) + { + rc = globus_error_put( + globus_error_construct_string( + GLOBUS_FTP_CONTROL_MODULE, + GLOBUS_NULL, + "globus_ftp_control_connect: globus_libc_gethostbyaddr_r failed") + ); + + globus_libc_free(element); + goto unlock_exit; + } + } hp=globus_libc_gethostbyname_r( localhost, diff -urN vdt-1.1.13-1/gridftp/control/source/pkgdata/pkg_data_src.gpt.in vdt-1.1.14-1/gridftp/control/source/pkgdata/pkg_data_src.gpt.in --- vdt-1.1.13-1/gridftp/control/source/pkgdata/pkg_data_src.gpt.in Wed May 21 01:59:17 2003 +++ vdt-1.1.14-1/gridftp/control/source/pkgdata/pkg_data_src.gpt.in Fri Mar 5 16:10:41 2004 @@ -3,7 +3,7 @@ - + GridFTP Client Library FileAccess