diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-09-21 13:45:36 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-09-21 14:40:10 -0400 |
| commit | aa7f55c45f942f45692c4a99e6fe1d5784609509 (patch) | |
| tree | 03e89187475b27ae43c9d0f2a75a1b93d29ea251 | |
| parent | 418e6caeebfb13c66ea1b4904fb331fe57b82b80 (diff) | |
| download | tor-aa7f55c45f942f45692c4a99e6fe1d5784609509.tar.gz tor-aa7f55c45f942f45692c4a99e6fe1d5784609509.zip | |
Use load_windows_system_library in place of LoadLibrary
| -rw-r--r-- | changes/bug1954_loadlib | 4 | ||||
| -rw-r--r-- | src/or/eventdns.c | 2 | ||||
| -rw-r--r-- | src/or/ntmain.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/changes/bug1954_loadlib b/changes/bug1954_loadlib new file mode 100644 index 0000000000..901d9baa5c --- /dev/null +++ b/changes/bug1954_loadlib @@ -0,0 +1,4 @@ + o Major bugfixes + - Always search the windows system directory for system DLLs, and + nowhere else. Fixes bug 1954. + diff --git a/src/or/eventdns.c b/src/or/eventdns.c index 8ebfb79353..c6fcbd9484 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -3132,7 +3132,7 @@ load_nameservers_with_getnetworkparams(void) GetNetworkParams_fn_t fn; /* XXXX Possibly, we should hardcode the location of this DLL. */ - if (!(handle = LoadLibrary(TEXT("iphlpapi.dll")))) { + if (!(handle = load_windows_system_library(TEXT("iphlpapi.dll")))) { log(EVDNS_LOG_WARN, "Could not open iphlpapi.dll"); /* right now status = 0, doesn't that mean "good" - mikec */ status = -1; diff --git a/src/or/ntmain.c b/src/or/ntmain.c index 0b611f0bf1..e5855aad8e 100644 --- a/src/or/ntmain.c +++ b/src/or/ntmain.c @@ -139,7 +139,7 @@ nt_service_loadlibrary(void) return; /* XXXX Possibly, we should hardcode the location of this DLL. */ - if (!(library = LoadLibrary(TEXT("advapi32.dll")))) { + if (!(library = load_windows_system_library(TEXT("advapi32.dll")))) { log_err(LD_GENERAL, "Couldn't open advapi32.dll. Are you trying to use " "NT services on Windows 98? That doesn't work."); goto err; |