1
0
mirror of https://github.com/Yubico/yubico-pam.git synced 2024-11-29 00:24:11 +01:00

mysql: use the .is_null_value member of the MYSQL_BIND structure

instead of setting a pointer, this seems to have better API
compatibility, also get rid of the error member that was never checked.
This commit is contained in:
Klas Lindfors 2021-03-31 12:02:59 +02:00
parent 8538e93761
commit 55a0f78972
No known key found for this signature in database
GPG Key ID: BCA00FD4B2168C0A

8
util.c
View File

@ -136,8 +136,6 @@ check_user_token_mysql(const char *mysql_server,
long unsigned int length;
int int_data;
int row_count;
my_bool is_null;
my_bool error;
if(mysql_library_init(0, NULL, NULL)){
if(verbose){
@ -195,7 +193,6 @@ check_user_token_mysql(const char *mysql_server,
ps_params[0].buffer = (char *)username;
ps_params[0].buffer_length = str_username;
ps_params[0].length = &str_username;
ps_params[0].is_null = 0;
if(otp_id != NULL)
{
@ -204,7 +201,6 @@ check_user_token_mysql(const char *mysql_server,
ps_params[1].buffer = (char *)otp_id;
ps_params[1].buffer_length = str_otp;
ps_params[1].length = &str_otp;
ps_params[1].is_null = 0;
}
if(mysql_stmt_bind_param(stmt, ps_params))
@ -225,8 +221,6 @@ check_user_token_mysql(const char *mysql_server,
bind[0].buffer_type = MYSQL_TYPE_LONG;
bind[0].buffer = (char *)&int_data;
bind[0].length = &length;
bind[0].is_null = &is_null;
bind[0].error = &error;
if(mysql_stmt_bind_result(stmt, bind))
{
@ -243,7 +237,7 @@ check_user_token_mysql(const char *mysql_server,
while(!mysql_stmt_fetch(stmt))
{
if(is_null)
if(bind[0].is_null_value)
{
D (debug_file, "mysql_stmt_fetch() failed");
}