|
|
@ -995,11 +995,6 @@ ares_status_t ares__init_by_sysconfig(ares_channel_t *channel) |
|
|
|
|
|
|
|
|
|
|
|
memset(&sysconfig, 0, sizeof(sysconfig)); |
|
|
|
memset(&sysconfig, 0, sizeof(sysconfig)); |
|
|
|
|
|
|
|
|
|
|
|
status = ares__init_by_environment(&sysconfig); |
|
|
|
|
|
|
|
if (status != ARES_SUCCESS) { |
|
|
|
|
|
|
|
goto done; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef _WIN32 |
|
|
|
#ifdef _WIN32 |
|
|
|
status = ares__init_sysconfig_windows(&sysconfig); |
|
|
|
status = ares__init_sysconfig_windows(&sysconfig); |
|
|
|
#elif defined(__MVS__) |
|
|
|
#elif defined(__MVS__) |
|
|
@ -1020,6 +1015,12 @@ ares_status_t ares__init_by_sysconfig(ares_channel_t *channel) |
|
|
|
goto done; |
|
|
|
goto done; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Environment is supposed to override sysconfig */ |
|
|
|
|
|
|
|
status = ares__init_by_environment(&sysconfig); |
|
|
|
|
|
|
|
if (status != ARES_SUCCESS) { |
|
|
|
|
|
|
|
goto done; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
status = ares_sysconfig_apply(channel, &sysconfig); |
|
|
|
status = ares_sysconfig_apply(channel, &sysconfig); |
|
|
|
if (status != ARES_SUCCESS) { |
|
|
|
if (status != ARES_SUCCESS) { |
|
|
|
goto done; |
|
|
|
goto done; |
|
|
|