1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.com:/M41/mysql-4.1
This commit is contained in:
unknown 2004-09-13 23:31:15 +02:00
commit 23c2113d9d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sql/mysqld.cc
View File

@ -1126,14 +1126,14 @@ static void set_effective_user(struct passwd *user_info)
{ {
#if !defined(__WIN__) && !defined(OS2) && !defined(__NETWARE__) #if !defined(__WIN__) && !defined(OS2) && !defined(__NETWARE__)
DBUG_ASSERT(user_info); DBUG_ASSERT(user_info);
if (setegid(user_info->pw_gid) == -1) if (setregid((gid_t)-1, user_info->pw_gid) == -1)
{ {
sql_perror("setegid"); sql_perror("setregid");
unireg_abort(1); unireg_abort(1);
} }
if (seteuid(user_info->pw_uid) == -1) if (setreuid((uid_t)-1, user_info->pw_uid) == -1)
{ {
sql_perror("seteuid"); sql_perror("setreuid");
unireg_abort(1); unireg_abort(1);
} }
#endif #endif
@ -2657,9 +2657,9 @@ server.");
#if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT) && !defined(EMBEDDED_LIBRARY) #if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT) && !defined(EMBEDDED_LIBRARY)
if (locked_in_memory && !getuid()) if (locked_in_memory && !getuid())
{ {
if (seteuid(0) == -1) if (setreuid((uid_t)-1, 0) == -1)
{ // this should never happen { // this should never happen
sql_perror("seteuid"); sql_perror("setreuid");
unireg_abort(1); unireg_abort(1);
} }
if (mlockall(MCL_CURRENT)) if (mlockall(MCL_CURRENT))