diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-06-30 20:41:26 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-07-02 14:27:31 +0200 |
| commit | dd93028dae22f00a6b23ff27d348ff1a4722ee88 (patch) | |
| tree | c9a5e1fe924af4dd6cd8311c0707818cf4a12db8 /sql/sql_acl.cc | |
| parent | ec494cb1fadb40ae25b944bb1229fc2d6f88e8c6 (diff) | |
| download | mariadb-git-dd93028dae22f00a6b23ff27d348ff1a4722ee88.tar.gz | |
MDEV-19878 pam v2: pam password authentication doesn't work at all
* wait() for the child process to die, let it rest in peace
* fix incorrect parentheses
* if there was no password on the command line or in .cnf file,
pkt will be "", and we need to request the user to enter the password
* make sure that auth->salt is always allocated on a permanent memroot.
when called from set_user_salt_if_needed(), user_copy and its auth_str
are on the thd memroot, but auth_copy->salt is then copied to auth->salt
* adjust service files so that systemd wouldn't interfere with our
setuid executables
also
* print the pam error message in debug mode
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 076b2e2994d..382275320e5 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -2072,7 +2072,7 @@ static int set_user_salt(ACL_USER::AUTH *auth, plugin_ref plugin) auth->salt.length= len; } else - auth->salt= auth->auth_string; + auth->salt= safe_lexcstrdup_root(&acl_memroot, auth->auth_string); return 0; } |