PlaneteCasio
/
libc
1
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

* libc/minires-os-if.c (cygwin_query): Remove ERROR_PROC_NOT_FOUND case. 

(get_dns_info): Verify DnsQuery exists. Use autoloaded GetNetworkParams.
This commit is contained in:
Corinna Vinschen 2006-12-15 09:50:32 +00:00
parent 4c0b8a072b
commit c21efb9a85
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2006-12-15 Pierre A. Humblet <Pierre.Humblet@ieee.org>
* libc/minires-os-if.c (cygwin_query): Remove ERROR_PROC_NOT_FOUND case.
(get_dns_info): Verify DnsQuery exists. Use autoloaded GetNetworkParams.
2006-12-13 Corinna Vinschen <corinna@vinschen.de>
* winsup.h (clear_procimptoken): Close hProcImpToken in a safer way.

26
winsup/cygwin/libc/minires-os-if.c
View File

@ -196,10 +196,6 @@ static int cygwin_query(res_state statp, const char * DomName, int Class, int Ty
DPRINTF(debug, "DnsQuery: %lu (Windows)\n", res);
if (res) {
switch (res) {
case ERROR_PROC_NOT_FOUND:
errno = ENOSYS;
statp->res_h_errno = NO_RECOVERY;
break;
case ERROR_INVALID_NAME:
errno = EINVAL;
statp->res_h_errno = NETDB_INTERNAL;;
@ -393,13 +389,12 @@ void get_dns_info(res_state statp)
DWORD dwRetVal;
IP_ADDR_STRING * pIPAddr;
FIXED_INFO * pFixedInfo;
HINSTANCE kerneldll;
typedef DWORD WINAPI (*GNPType)(PFIXED_INFO, PULONG);
GNPType PGetNetworkParams;
int numAddresses = 0;
if (statp->use_os) {
DPRINTF(debug, "using dnsapi.dll\n");
if (statp->use_os
&& ((dwRetVal = DnsQuery_A(NULL, 0, 0, NULL, NULL, NULL)) != ERROR_PROC_NOT_FOUND))
{
DPRINTF(debug, "using dnsapi.dll %d\n", dwRetVal);
statp->os_query = (typeof(statp->os_query)) cygwin_query;
/* We just need the search list. Avoid loading iphlpapi. */
statp->nscount = -1;
@ -408,17 +403,8 @@ void get_dns_info(res_state statp)
if (statp->nscount != 0)
goto use_registry;
if (!(kerneldll = LoadLibrary("IPHLPAPI.DLL"))) {
DPRINTF(debug, "LoadLibrary: error %lu (Windows)\n", GetLastError());
goto use_registry;
}
if (!(PGetNetworkParams = (GNPType) GetProcAddress(kerneldll,
"GetNetworkParams"))) {
DPRINTF(debug, "GetProcAddress: error %lu (Windows)\n", GetLastError());
goto use_registry;
}
/* First call to get the buffer length we need */
dwRetVal = PGetNetworkParams((FIXED_INFO *) 0, &ulOutBufLen);
dwRetVal = GetNetworkParams((FIXED_INFO *) 0, &ulOutBufLen);
if (dwRetVal != ERROR_BUFFER_OVERFLOW) {
DPRINTF(debug, "GetNetworkParams: error %lu (Windows)\n", dwRetVal);
goto use_registry;
@ -427,7 +413,7 @@ void get_dns_info(res_state statp)
DPRINTF(debug, "alloca: %s\n", strerror(errno));
goto use_registry;
}
if ((dwRetVal = PGetNetworkParams((FIXED_INFO *) pFixedInfo, & ulOutBufLen))) {
if ((dwRetVal = GetNetworkParams(pFixedInfo, & ulOutBufLen))) {
DPRINTF(debug, "GetNetworkParams: error %lu (Windows)\n", dwRetVal);
goto use_registry;
}