database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-21 00:42:43 +03:00
Code Activity

Fix incorrect error message reported for non-existent users

Browse Source 
Previously, lookups of non-existent user names could return "Success";
it will now return "User does not exist" by resetting errno.  This also
centralizes the user name lookup code in libpgport.

Report and analysis by Nicolas Marchildon;  patch by me
This commit is contained in:
Bruce Momjian
2013-12-18 12:16:16 -05:00
parent 11ac4c73cb
commit 613c6d26bd
19 changed files with 129 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/backend/main/main.c
View File

@@ -20,7 +20,6 @@
*/
#include "postgres.h"
#include <pwd.h>
#include <unistd.h>
#if defined(__alpha) && defined(__osf__) /* no __alpha__ ? */
@@ -49,7 +48,6 @@ const char *progname;
static void startup_hacks(const char *progname);
static void help(const char *progname);
static void check_root(const char *progname);
static char *get_current_username(const char *progname);
/*
@@ -191,7 +189,7 @@ main(int argc, char *argv[])
else if (argc > 1 && strcmp(argv[1], "--single") == 0)
PostgresMain(argc, argv,
NULL, /* no dbname */
get_current_username(progname)); /* does not return */
strdup(get_user_name_or_exit(progname))); /* does not return */
else
PostmasterMain(argc, argv); /* does not return */
abort(); /* should not get here */
@@ -372,36 +370,3 @@ check_root(const char *progname)
}
#endif /* WIN32 */
}
static char *
get_current_username(const char *progname)
{
#ifndef WIN32
struct passwd *pw;
pw = getpwuid(geteuid());
if (pw == NULL)
{
write_stderr("%s: invalid effective UID: %d\n",
progname, (int) geteuid());
exit(1);
}
/* Allocate new memory because later getpwuid() calls can overwrite it. */
return strdup(pw->pw_name);
#else
unsigned long namesize = 256 /* UNLEN */ + 1;
char *name;
name = malloc(namesize);
if (!GetUserName(name, &namesize))
{
write_stderr("%s: could not determine user name (GetUserName failed)\n",
progname);
exit(1);
}
return name;
#endif
}