diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-29 16:31:40 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-29 16:31:40 +0200 |
| commit | 2b710090aa51914e47d5066b7ce49e6cff3ea32e (patch) | |
| tree | bfa03363ffa56354e2d7dc1c77f0f7edd7d6f590 /plugin | |
| parent | b62a846642c14eb6665b5ef0ce5c4de79555754a (diff) | |
| parent | d4e1fa39f06a6d3019eca3f7c81ae79618ff3bb0 (diff) | |
| download | mariadb-git-2b710090aa51914e47d5066b7ce49e6cff3ea32e.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/auth_pam/auth_pam_tool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugin/auth_pam/auth_pam_tool.c b/plugin/auth_pam/auth_pam_tool.c index 3947091ec4a..624b6880933 100644 --- a/plugin/auth_pam/auth_pam_tool.c +++ b/plugin/auth_pam/auth_pam_tool.c @@ -33,7 +33,7 @@ static int roundtrip(struct param *param, const unsigned char *buf, if (write(1, &b, 1) < 1 || write_string(1, buf, buf_len)) return -1; *pkt= (unsigned char *) param->buf; - return read_string(0, (char *) param->buf, (int) sizeof(param->buf)) - 1; + return read_string(0, (char *) param->buf, (int) sizeof(param->buf)); } typedef struct st_mysql_server_auth_info |