mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.3' into 10.4

Browse source
This commit is contained in:
Oleksandr Byelkin 2019-05-19 20:55:37 +02:00
commit c07325f932
3893 changed files with 11761 additions and 6455 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugin/auth_pam/auth_pam_base.c
View file

@ -60,6 +60,8 @@ static char pam_debug = 0;
#define PAM_DEBUG(X) /* no-op */
#endif
static char winbind_hack = 0;
static int conv(int n, const struct pam_message **msg,
struct pam_response **resp, void *data)
{
@ -161,7 +163,8 @@ static int pam_auth_base(struct param *param, MYSQL_SERVER_AUTH_INFO *info)
PAM_DEBUG((stderr, "PAM: pam_get_item(PAM_USER)\n"));
DO( pam_get_item(pamh, PAM_USER, (pam_get_item_3_arg) &new_username) );
if (new_username && strcmp(new_username, info->user_name))
if (new_username &&
(winbind_hack ? strcasecmp : strcmp)(new_username, info->user_name))
strncpy(info->authenticated_as, new_username,
sizeof(info->authenticated_as));
info->authenticated_as[sizeof(info->authenticated_as)-1]= 0;