diff options
| author | unknown <joerg@mysql.com> | 2004-09-13 23:31:15 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2004-09-13 23:31:15 +0200 |
| commit | 23c2113d9d1eb36f2e6664963758d3ee17949135 (patch) | |
| tree | a9d082bbc56b2f8a79c6d3f28455cf13e7953854 | |
| parent | b39ddcf9b9debff0e79a8e1e39c60c5767b559e9 (diff) | |
| parent | 8f8ccc4bd56957a8051ae2e4624d5c76a6502403 (diff) | |
| download | mariadb-git-23c2113d9d1eb36f2e6664963758d3ee17949135.tar.gz | |
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
| -rw-r--r-- | sql/mysqld.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index c59f1ddcad6..ce64d2a39da 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1126,14 +1126,14 @@ static void set_effective_user(struct passwd *user_info) { #if !defined(__WIN__) && !defined(OS2) && !defined(__NETWARE__) 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); } - 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); } #endif @@ -2657,9 +2657,9 @@ server."); #if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT) && !defined(EMBEDDED_LIBRARY) if (locked_in_memory && !getuid()) { - if (seteuid(0) == -1) + if (setreuid((uid_t)-1, 0) == -1) { // this should never happen - sql_perror("seteuid"); + sql_perror("setreuid"); unireg_abort(1); } if (mlockall(MCL_CURRENT)) |