diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2019-12-27 16:07:28 +0100 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-12-27 17:27:45 +0100 |
commit | 813d4a00b4ce912e58c090f9bb1d0bdd74baf68c (patch) | |
tree | a399a1b419aa1e59d6b496d40761531b9c9e50f7 /ext/mysqlnd/mysqlnd_wireprotocol.h | |
parent | e7e1254f3e41db8f92b85b25658f393f7f5bce66 (diff) | |
download | php-git-813d4a00b4ce912e58c090f9bb1d0bdd74baf68c.tar.gz |
Handle error response during caching_sha2_password auth
In particular, this fixes handling of expired passwords.
Diffstat (limited to 'ext/mysqlnd/mysqlnd_wireprotocol.h')
-rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.h b/ext/mysqlnd/mysqlnd_wireprotocol.h index 83ea5557dd..c4ef4c3dad 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.h +++ b/ext/mysqlnd/mysqlnd_wireprotocol.h @@ -288,10 +288,15 @@ typedef struct st_mysqlnd_packet_cached_sha2_result { uint8_t request; zend_uchar * password; size_t password_len; + /* Used for auth switch request */ char *new_auth_protocol; size_t new_auth_protocol_len; zend_uchar *new_auth_protocol_data; size_t new_auth_protocol_data_len; + /* Used for error result */ + char error[MYSQLND_ERRMSG_SIZE+1]; + char sqlstate[MYSQLND_SQLSTATE_LENGTH + 1]; + unsigned int error_no; } MYSQLND_PACKET_CACHED_SHA2_RESULT; |