diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-01-03 01:22:58 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-01-10 15:07:38 -0800 |
| commit | b7a7b1a624c97945c0aaa49d46ae996fc0bdb6bc (patch) | |
| tree | 0e09490075ee4f9a75a77ef4168d8ee254c52e5b /ext/mysqlnd/mysqlnd_auth.c | |
| parent | 773c8b0c092a0e9ad5c5548815bcb9991d54d5c1 (diff) | |
| download | php-git-b7a7b1a624c97945c0aaa49d46ae996fc0bdb6bc.tar.gz | |
trailing whitespace removal
Diffstat (limited to 'ext/mysqlnd/mysqlnd_auth.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_auth.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c index 616c80dfee..2abc0e6d5b 100644 --- a/ext/mysqlnd/mysqlnd_auth.c +++ b/ext/mysqlnd/mysqlnd_auth.c @@ -98,7 +98,7 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn, auth_packet->auth_data = auth_plugin_data; auth_packet->auth_data_len = auth_plugin_data_len; auth_packet->auth_plugin_name = auth_protocol; - + if (conn->server_capabilities & CLIENT_CONNECT_ATTRS) { auth_packet->connect_attr = conn->options->connect_attr; } @@ -127,7 +127,7 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn, } else { *switch_to_auth_protocol_data = NULL; *switch_to_auth_protocol_data_len = 0; - } + } } } else if (auth_resp_packet->response_code == 0xFF) { if (auth_resp_packet->sqlstate[0]) { @@ -199,7 +199,7 @@ mysqlnd_auth_change_user(MYSQLND_CONN_DATA * const conn, CONN_SET_STATE(conn, CONN_QUIT_SENT); SET_CLIENT_ERROR(*conn->error_info, CR_SERVER_GONE_ERROR, UNKNOWN_SQLSTATE, mysqlnd_server_gone); goto end; - } + } } else { auth_packet = conn->protocol->m.get_auth_packet(conn->protocol, FALSE); @@ -222,7 +222,7 @@ mysqlnd_auth_change_user(MYSQLND_CONN_DATA * const conn, if (conn->m->get_server_version(conn) >= 50123) { auth_packet->charset_no = conn->charset->nr; } - + if (!PACKET_WRITE(auth_packet, conn)) { CONN_SET_STATE(conn, CONN_QUIT_SENT); SET_CLIENT_ERROR(*conn->error_info, CR_SERVER_GONE_ERROR, UNKNOWN_SQLSTATE, mysqlnd_server_gone); @@ -248,7 +248,7 @@ mysqlnd_auth_change_user(MYSQLND_CONN_DATA * const conn, } else { *switch_to_auth_protocol_data = NULL; *switch_to_auth_protocol_data_len = 0; - } + } } } @@ -485,7 +485,7 @@ mysqlnd_sha256_get_rsa_key(MYSQLND_CONN_DATA * conn, ) { RSA * ret = NULL; - const char * fname = (net_options->sha256_server_public_key && net_options->sha256_server_public_key[0] != '\0')? + const char * fname = (net_options->sha256_server_public_key && net_options->sha256_server_public_key[0] != '\0')? net_options->sha256_server_public_key: MYSQLND_G(sha256_server_public_key); php_stream * stream; @@ -536,7 +536,7 @@ mysqlnd_sha256_get_rsa_key(MYSQLND_CONN_DATA * conn, DBG_INF_FMT("ret=%p", ret); DBG_RETURN(ret); - + SET_CLIENT_ERROR(*conn->error_info, CR_UNKNOWN_ERROR, UNKNOWN_SQLSTATE, "sha256_server_public_key is not set for the connection or as mysqlnd.sha256_server_public_key"); DBG_ERR("server_public_key is not set"); |