summaryrefslogtreecommitdiff
path: root/src/common/username.c
diff options
context:
space:
mode:
authorTom Lane2015-01-11 17:35:44 +0000
committerTom Lane2015-01-11 17:35:44 +0000
commit080eabe2e8a184ff40b7380aaaa9418714acace9 (patch)
treef203be9f71fbc124f6b1bb95d98326c8c5bdb138 /src/common/username.c
parentde6429a8fdd3538e977b482d90389785d733e373 (diff)
Fix libpq's behavior when /etc/passwd isn't readable.
Some users run their applications in chroot environments that lack an /etc/passwd file. This means that the current UID's user name and home directory are not obtainable. libpq used to be all right with that, so long as the database role name to use was specified explicitly. But commit a4c8f14364c27508233f8a31ac4b10a4c90235a9 broke such cases by causing any failure of pg_fe_getauthname() to be treated as a hard error. In any case it did little to advance its nominal goal of causing errors in pg_fe_getauthname() to be reported better. So revert that and instead put some real error-reporting code in place. This requires changes to the APIs of pg_fe_getauthname() and pqGetpwuid(), since the latter had departed from the POSIX-specified API of getpwuid_r() in a way that made it impossible to distinguish actual lookup errors from "no such user". To allow such failures to be reported, while not failing if the caller supplies a role name, add a second call of pg_fe_getauthname() in connectOptions2(). This is a tad ugly, and could perhaps be avoided with some refactoring of PQsetdbLogin(), but I'll leave that idea for later. (Note that the complained-of misbehavior only occurs in PQsetdbLogin, not when using the PQconnect functions, because in the latter we will never bother to call pg_fe_getauthname() if the user gives a role name.) In passing also clean up the Windows-side usage of GetUserName(): the recommended buffer size is 257 bytes, the passed buffer length should be the buffer size not buffer size less 1, and any error is reported by GetLastError() not errno. Per report from Christoph Berg. Back-patch to 9.4 where the chroot failure case was introduced. The generally poor reporting of errors here is of very long standing, of course, but given the lack of field complaints about it we won't risk changing these APIs further back (even though they're theoretically internal to libpq).
Diffstat (limited to 'src/common/username.c')
-rw-r--r--src/common/username.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/common/username.c b/src/common/username.c
index ee5ef1c0727..686a6a43c51 100644
--- a/src/common/username.c
+++ b/src/common/username.c
@@ -26,8 +26,8 @@
#include "common/username.h"
/*
- * Returns the current user name in a static buffer, or NULL on error and
- * sets errstr
+ * Returns the current user name in a static buffer
+ * On error, returns NULL and sets *errstr to point to a palloc'd message
*/
const char *
get_user_name(char **errstr)
@@ -50,15 +50,17 @@ get_user_name(char **errstr)
return pw->pw_name;
#else
- /* UNLEN = 256, 'static' variable remains after function exit */
+ /* Microsoft recommends buffer size of UNLEN+1, where UNLEN = 256 */
+ /* "static" variable remains after function exit */
static char username[256 + 1];
- DWORD len = sizeof(username) - 1;
+ DWORD len = sizeof(username);
*errstr = NULL;
if (!GetUserName(username, &len))
{
- *errstr = psprintf(_("user name lookup failure: %s"), strerror(errno));
+ *errstr = psprintf(_("user name lookup failure: error code %lu"),
+ GetLastError());
return NULL;
}