1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug #57744: sql-common/client.c: Missing DBUG_RETURN macro

Browse Source 
- added missing DBUG_RETURN
- fixed whitespace according to coding style.
This commit is contained in:
Georgi Kodinov 2010-11-10 17:21:51 +02:00
parent bb356127a3
commit 236affe7f9
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sql-common/client.c
View File

@ -4197,7 +4197,7 @@ static int native_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
int pkt_len; int pkt_len;
uchar *pkt; uchar *pkt;
DBUG_ENTER ("native_password_auth_client"); DBUG_ENTER("native_password_auth_client");
if (((MCPVIO_EXT *)vio)->mysql_change_user) if (((MCPVIO_EXT *)vio)->mysql_change_user)
@ -4213,10 +4213,10 @@ static int native_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
{ {
/* read the scramble */ /* read the scramble */
if ((pkt_len= vio->read_packet(vio, &pkt)) < 0) if ((pkt_len= vio->read_packet(vio, &pkt)) < 0)
return CR_ERROR; DBUG_RETURN(CR_ERROR);
if (pkt_len != SCRAMBLE_LENGTH + 1) if (pkt_len != SCRAMBLE_LENGTH + 1)
DBUG_RETURN (CR_SERVER_HANDSHAKE_ERR); DBUG_RETURN(CR_SERVER_HANDSHAKE_ERR);
/* save it in MYSQL */ /* save it in MYSQL */
memcpy(mysql->scramble, pkt, SCRAMBLE_LENGTH); memcpy(mysql->scramble, pkt, SCRAMBLE_LENGTH);
@ -4226,19 +4226,19 @@ static int native_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
if (mysql->passwd[0]) if (mysql->passwd[0])
{ {
char scrambled[SCRAMBLE_LENGTH + 1]; char scrambled[SCRAMBLE_LENGTH + 1];
DBUG_PRINT ("info", ("sending scramble")); DBUG_PRINT("info", ("sending scramble"));
scramble(scrambled, (char*)pkt, mysql->passwd); scramble(scrambled, (char*)pkt, mysql->passwd);
if (vio->write_packet(vio, (uchar*)scrambled, SCRAMBLE_LENGTH)) if (vio->write_packet(vio, (uchar*)scrambled, SCRAMBLE_LENGTH))
DBUG_RETURN (CR_ERROR); DBUG_RETURN(CR_ERROR);
} }
else else
{ {
DBUG_PRINT ("info", ("no password")); DBUG_PRINT("info", ("no password"));
if (vio->write_packet(vio, 0, 0)) /* no password */ if (vio->write_packet(vio, 0, 0)) /* no password */
DBUG_RETURN (CR_ERROR); DBUG_RETURN(CR_ERROR);
} }
DBUG_RETURN (CR_OK); DBUG_RETURN(CR_OK);
} }
/** /**
@ -4250,7 +4250,7 @@ static int old_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
uchar *pkt; uchar *pkt;
int pkt_len; int pkt_len;
DBUG_ENTER ("old_password_auth_client"); DBUG_ENTER("old_password_auth_client");
if (((MCPVIO_EXT *)vio)->mysql_change_user) if (((MCPVIO_EXT *)vio)->mysql_change_user)
{ {
@ -4265,11 +4265,11 @@ static int old_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
{ {
/* read the scramble */ /* read the scramble */
if ((pkt_len= vio->read_packet(vio, &pkt)) < 0) if ((pkt_len= vio->read_packet(vio, &pkt)) < 0)
return CR_ERROR; DBUG_RETURN(CR_ERROR);
if (pkt_len != SCRAMBLE_LENGTH_323 + 1 && if (pkt_len != SCRAMBLE_LENGTH_323 + 1 &&
pkt_len != SCRAMBLE_LENGTH + 1) pkt_len != SCRAMBLE_LENGTH + 1)
DBUG_RETURN (CR_SERVER_HANDSHAKE_ERR); DBUG_RETURN(CR_SERVER_HANDSHAKE_ERR);
/* save it in MYSQL */ /* save it in MYSQL */
memcpy(mysql->scramble, pkt, pkt_len); memcpy(mysql->scramble, pkt, pkt_len);
@ -4281,11 +4281,11 @@ static int old_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
char scrambled[SCRAMBLE_LENGTH_323 + 1]; char scrambled[SCRAMBLE_LENGTH_323 + 1];
scramble_323(scrambled, (char*)pkt, mysql->passwd); scramble_323(scrambled, (char*)pkt, mysql->passwd);
if (vio->write_packet(vio, (uchar*)scrambled, SCRAMBLE_LENGTH_323 + 1)) if (vio->write_packet(vio, (uchar*)scrambled, SCRAMBLE_LENGTH_323 + 1))
DBUG_RETURN (CR_ERROR); DBUG_RETURN(CR_ERROR);
} }
else else
if (vio->write_packet(vio, 0, 0)) /* no password */ if (vio->write_packet(vio, 0, 0)) /* no password */
DBUG_RETURN (CR_ERROR); DBUG_RETURN(CR_ERROR);
DBUG_RETURN (CR_OK); DBUG_RETURN(CR_OK);
} }