database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-08 14:02:17 +03:00
Code Activity

Fix for CONC-441:

Browse Source 
Instead of getlogin() we first try to determine the current user of the process
by calling getpwuid(). If for some reaon getpwuid() will fail, we will use getlogin() instead.
This commit is contained in:
Georg Richter
2020-03-12 18:09:40 +01:00
parent 3be5897c33
commit 8c773db1fb
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/CheckFunctions.cmake
View File

@@ -22,3 +22,4 @@ CHECK_FUNCTION_EXISTS (nl_langinfo HAVE_NL_LANGINFO)
CHECK_FUNCTION_EXISTS (setlocale HAVE_SETLOCALE) CHECK_FUNCTION_EXISTS (setlocale HAVE_SETLOCALE)
CHECK_FUNCTION_EXISTS (poll HAVE_POLL) CHECK_FUNCTION_EXISTS (poll HAVE_POLL)
CHECK_FUNCTION_EXISTS (getpwuid HAVE_GETPWUID) CHECK_FUNCTION_EXISTS (getpwuid HAVE_GETPWUID)
CHECK_FUNCTION_EXISTS (cuserid HAVE_CUSERID)

1
include/ma_config.h.in
View File

@@ -45,6 +45,7 @@
#cmakedefine HAVE_THR_YIELD 1 #cmakedefine HAVE_THR_YIELD 1
#cmakedefine HAVE_VASPRINTF 1 #cmakedefine HAVE_VASPRINTF 1
#cmakedefine HAVE_VSNPRINTF 1 #cmakedefine HAVE_VSNPRINTF 1
#cmakedefine HAVE_CUSERID 1
/* /*
* types and sizes * types and sizes

15
libmariadb/mariadb_lib.c
View File

@@ -497,7 +497,7 @@ struct passwd *getpwuid(uid_t);
char* getlogin(void); char* getlogin(void);
#endif #endif
#if !defined(MSDOS) && ! defined(VMS) && !defined(_WIN32) && !defined(OS2) #if !defined(_WIN32)
void read_user_name(char *name) void read_user_name(char *name)
{ {
if (geteuid() == 0) if (geteuid() == 0)
@@ -507,13 +507,14 @@ void read_user_name(char *name)
#ifdef HAVE_GETPWUID #ifdef HAVE_GETPWUID
struct passwd *skr; struct passwd *skr;
const char *str; const char *str;
if ((str=getlogin()) == NULL) if ((skr=getpwuid(geteuid())) != NULL)
{ {
if ((skr=getpwuid(geteuid())) != NULL) str=skr->pw_name;
str=skr->pw_name; } else if ((str=getlogin()) == NULL)
else if (!(str=getenv("USER")) && !(str=getenv("LOGNAME")) && {
!(str=getenv("LOGIN"))) if (!(str=getenv("USER")) && !(str=getenv("LOGNAME")) &&
str="UNKNOWN_USER"; !(str=getenv("LOGIN")))
str="UNKNOWN_USER";
} }
ma_strmake(name,str,USERNAME_LENGTH); ma_strmake(name,str,USERNAME_LENGTH);
#elif defined(HAVE_CUSERID) #elif defined(HAVE_CUSERID)