cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-10 13:04:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #119 from ldx/winhosts

Browse Source 
Fix hosts file use on Windows.
This commit is contained in:
Nick Mathewson 2014-09-18 11:41:18 -04:00
commit c8c7fa3a16
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
evdns.c
View File

@ -3556,8 +3556,8 @@ evdns_get_default_hosts_filename(void)
if (! SHGetSpecialFolderPathA(NULL, path, CSIDL_SYSTEM, 0)) if (! SHGetSpecialFolderPathA(NULL, path, CSIDL_SYSTEM, 0))
return NULL; return NULL;
len_out = strlen(path)+strlen(hostfile); len_out = strlen(path)+strlen(hostfile)+1;
path_out = mm_malloc(len_out+1); path_out = mm_malloc(len_out);
evutil_snprintf(path_out, len_out, "%s%s", path, hostfile); evutil_snprintf(path_out, len_out, "%s%s", path, hostfile);
return path_out; return path_out;
#else #else
@ -3827,17 +3827,18 @@ evdns_base_config_windows_nameservers(struct evdns_base *base)
if (base == NULL) if (base == NULL)
return -1; return -1;
EVDNS_LOCK(base); EVDNS_LOCK(base);
fname = evdns_get_default_hosts_filename();
log(EVDNS_LOG_DEBUG, "Loading hosts entries from %s", fname);
evdns_base_load_hosts(base, fname);
if (fname)
mm_free(fname);
if (load_nameservers_with_getnetworkparams(base) == 0) { if (load_nameservers_with_getnetworkparams(base) == 0) {
EVDNS_UNLOCK(base); EVDNS_UNLOCK(base);
return 0; return 0;
} }
r = load_nameservers_from_registry(base); r = load_nameservers_from_registry(base);
fname = evdns_get_default_hosts_filename();
evdns_base_load_hosts(base, fname);
if (fname)
mm_free(fname);
EVDNS_UNLOCK(base); EVDNS_UNLOCK(base);
return r; return r;
} }