diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2020-04-13 10:21:15 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2020-04-13 10:24:46 +0200 |
| commit | 0c620a5803afbb667da7ac4bcc91b245a214a80c (patch) | |
| tree | 6ae61267f2c23c5c25437c4645dfd2376fec75a2 | |
| parent | e894c61836e4b967f7ec65358fdaed2ba86ed238 (diff) | |
| download | postgresql-0c620a5803afbb667da7ac4bcc91b245a214a80c.tar.gz postgresql-0c620a5803afbb667da7ac4bcc91b245a214a80c.zip | |
Improve error messages after LoadLibrary()
Move the file name to a format parameter to ease translatability. Add
error code where missing. Make the wording consistent.
| -rw-r--r-- | src/backend/libpq/auth.c | 7 | ||||
| -rw-r--r-- | src/common/restricted_token.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index e1057f9fc75..02b6c3f127c 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -1518,8 +1518,8 @@ pg_SSPI_recvauth(Port *port) secur32 = LoadLibrary("SECUR32.DLL"); if (secur32 == NULL) ereport(ERROR, - (errmsg_internal("could not load secur32.dll: error code %lu", - GetLastError()))); + (errmsg("could not load library \"%s\": error code %lu", + "SECUR32.DLL", GetLastError()))); _QuerySecurityContextToken = (QUERY_SECURITY_CONTEXT_TOKEN_FN) GetProcAddress(secur32, "QuerySecurityContextToken"); @@ -2517,7 +2517,8 @@ InitializeLDAPConnection(Port *port, LDAP **ldap) * wldap32, but check anyway */ ereport(LOG, - (errmsg("could not load wldap32.dll"))); + (errmsg("could not load library \"%s\": error code %lu", + "WLDAP32.DLL", GetLastError()))); ldap_unbind(*ldap); return STATUS_ERROR; } diff --git a/src/common/restricted_token.c b/src/common/restricted_token.c index a3e0e85fefa..d8d3aeffcdc 100644 --- a/src/common/restricted_token.c +++ b/src/common/restricted_token.c @@ -61,8 +61,8 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo) Advapi32Handle = LoadLibrary("ADVAPI32.DLL"); if (Advapi32Handle == NULL) { - pg_log_error("could not load advapi32.dll: error code %lu", - GetLastError()); + pg_log_error("could not load library \"%s\": error code %lu", + "ADVAPI32.DLL", GetLastError()); return 0; } |