Commit 57694d52 authored by Sergei Golubchik's avatar Sergei Golubchik

MDEV-395 PR_SET_DUMPABLE set in unreachable code

parent b45c551e
...@@ -2026,13 +2026,19 @@ static struct passwd *check_user(const char *user) ...@@ -2026,13 +2026,19 @@ static struct passwd *check_user(const char *user)
if (!(tmp_user_info= getpwuid(atoi(user)))) if (!(tmp_user_info= getpwuid(atoi(user))))
goto err; goto err;
} }
return tmp_user_info; return tmp_user_info;
/* purecov: end */ /* purecov: end */
err: err:
sql_print_error("Fatal error: Can't change to run as user '%s' ; Please check that the user exists!\n",user); sql_print_error("Fatal error: Can't change to run as user '%s' ; Please check that the user exists!\n",user);
unireg_abort(1); unireg_abort(1);
#endif
return NULL;
}
static inline void allow_coredumps()
{
#ifdef PR_SET_DUMPABLE #ifdef PR_SET_DUMPABLE
if (test_flags & TEST_CORE_ON_SIGNAL) if (test_flags & TEST_CORE_ON_SIGNAL)
{ {
...@@ -2040,11 +2046,9 @@ err: ...@@ -2040,11 +2046,9 @@ err:
(void) prctl(PR_SET_DUMPABLE, 1); (void) prctl(PR_SET_DUMPABLE, 1);
} }
#endif #endif
#endif
return NULL;
} }
static void set_user(const char *user, struct passwd *user_info_arg) static void set_user(const char *user, struct passwd *user_info_arg)
{ {
/* purecov: begin tested */ /* purecov: begin tested */
...@@ -2071,6 +2075,7 @@ static void set_user(const char *user, struct passwd *user_info_arg) ...@@ -2071,6 +2075,7 @@ static void set_user(const char *user, struct passwd *user_info_arg)
sql_perror("setuid"); sql_perror("setuid");
unireg_abort(1); unireg_abort(1);
} }
allow_coredumps();
#endif #endif
/* purecov: end */ /* purecov: end */
} }
...@@ -2090,6 +2095,7 @@ static void set_effective_user(struct passwd *user_info_arg) ...@@ -2090,6 +2095,7 @@ static void set_effective_user(struct passwd *user_info_arg)
sql_perror("setreuid"); sql_perror("setreuid");
unireg_abort(1); unireg_abort(1);
} }
allow_coredumps();
#endif #endif
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment