From f9e626becbc1d44d28762e1116145f267bbcca22 Mon Sep 17 00:00:00 2001 From: Robert Bindar Date: Tue, 5 Feb 2019 08:26:36 +0200 Subject: [PATCH] Support for expired passwords Getter should get and the setter should set CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS --- libmariadb/mariadb_lib.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c index f587ff1e..533ece63 100644 --- a/libmariadb/mariadb_lib.c +++ b/libmariadb/mariadb_lib.c @@ -2786,7 +2786,10 @@ mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...) net_buffer_length= (unsigned long)(*(size_t *)arg1); break; case MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS: - *((my_bool *)arg1)= test(mysql->options.client_flag & CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS); + if (*(my_bool *)arg1) + mysql->options.client_flag |= CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS; + else + mysql->options.client_flag &= ~CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS; break; case MYSQL_OPT_SSL_ENFORCE: mysql->options.use_ssl= (*(my_bool *)arg1); @@ -3122,10 +3125,7 @@ mysql_get_optionv(MYSQL *mysql, enum mysql_option option, void *arg, ...) *((my_bool *)arg)= test(mysql->options.extension && mysql->options.extension->async_context); break; case MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS: - if (*(my_bool *)arg) - mysql->options.client_flag |= CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS; - else - mysql->options.client_flag &= ~CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS; + *((my_bool *)arg)= test(mysql->options.client_flag & CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS); break; case MYSQL_OPT_SSL_ENFORCE: *((my_bool *)arg)= mysql->options.use_ssl;