database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

WL#1054: code style remarks fixed.

Browse Source
This commit is contained in:
Georgi Kodinov
2010-09-20 19:38:27 +03:00
parent 353739fdef
commit 5f9c629da0
5 changed files with 323 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/mysql/plugin_auth.h
View File

@ -30,6 +30,13 @@
#include <mysql/plugin_auth_common.h> #include <mysql/plugin_auth_common.h>
/* defines for MYSQL_SERVER_AUTH_INFO.password_used */
#define PASSWORD_USED_NO 0
#define PASSWORD_USED_YES 1
#define PASSWORD_USED_NO_MENTION 2
/** /**
Provides server plugin access to authentication information Provides server plugin access to authentication information
*/ */

2
plugin/auth/auth_socket.c
View File

@ -46,7 +46,7 @@ static int socket_auth(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info)
return CR_ERROR; return CR_ERROR;
} }
info->password_used = 2; info->password_used= PASSWORD_USED_NO_MENTION;
vio->info(vio, &vio_info); vio->info(vio, &vio_info);
if (vio_info.protocol != MYSQL_VIO_SOCKET) if (vio_info.protocol != MYSQL_VIO_SOCKET)

10
plugin/auth/dialog.c
View File

@ -78,10 +78,10 @@ static int two_questions(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info)
if ((pkt_len= vio->read_packet(vio, &pkt)) < 0) if ((pkt_len= vio->read_packet(vio, &pkt)) < 0)
return CR_ERROR; return CR_ERROR;
info->password_used = 1; info->password_used= PASSWORD_USED_YES;
/* fail if the password is wrong */ /* fail if the password is wrong */
if (strcmp((const char *)pkt, info->auth_string)) if (strcmp((const char *) pkt, info->auth_string))
return CR_ERROR; return CR_ERROR;
/* send the last, ordinary, question */ /* send the last, ordinary, question */
@ -93,7 +93,7 @@ static int two_questions(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info)
return CR_ERROR; return CR_ERROR;
/* check the reply */ /* check the reply */
return strcmp((const char *)pkt, "yes, of course") ? CR_ERROR : CR_OK; return strcmp((const char *) pkt, "yes, of course") ? CR_ERROR : CR_OK;
} }
static struct st_mysql_auth two_handler= static struct st_mysql_auth two_handler=
@ -120,7 +120,7 @@ static int three_attempts(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info)
if ((pkt_len= vio->read_packet(vio, &pkt)) < 0) if ((pkt_len= vio->read_packet(vio, &pkt)) < 0)
return CR_ERROR; return CR_ERROR;
info->password_used = 1; info->password_used= PASSWORD_USED_YES;
/* /*
finish, if the password is correct. finish, if the password is correct.
@ -310,7 +310,7 @@ static int init_dialog(char *unused1 __attribute__((unused)),
va_list unused4 __attribute__((unused))) va_list unused4 __attribute__((unused)))
{ {
void *sym= dlsym(RTLD_DEFAULT, "mysql_authentication_dialog_ask"); void *sym= dlsym(RTLD_DEFAULT, "mysql_authentication_dialog_ask");
ask= sym ? (mysql_authentication_dialog_ask_t)sym : builtin_ask; ask= sym ? (mysql_authentication_dialog_ask_t) sym : builtin_ask;
return 0; return 0;
} }

5
plugin/auth/test_plugin.c
View File

@ -70,7 +70,7 @@ static int auth_test_plugin(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info)
if ((pkt_len= vio->read_packet(vio, &pkt)) < 0) if ((pkt_len= vio->read_packet(vio, &pkt)) < 0)
return CR_ERROR; return CR_ERROR;
info->password_used = 1; info->password_used= PASSWORD_USED_YES;
/* fail if the password is wrong */ /* fail if the password is wrong */
if (strcmp((const char *) pkt, info->auth_string)) if (strcmp((const char *) pkt, info->auth_string))
@ -177,7 +177,8 @@ static int test_plugin_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
if (!reply) if (!reply)
return CR_ERROR; return CR_ERROR;
/* send the reply to the server */ /* send the reply to the server */
res= vio->write_packet(vio, (const unsigned char *)reply, strlen(reply)+1); res= vio->write_packet(vio, (const unsigned char *) reply,
strlen(reply) + 1);
if (res) if (res)
return CR_ERROR; return CR_ERROR;

607
sql/sql_acl.cc
View File

File diff suppressed because it is too large Load Diff