Skip to content
Permalink
Browse files

Merge branch '3.1' of https://github.com/MariaDB/mariadb-connector-c

…into 3.1
  • Loading branch information
9EOR9 committed Oct 8, 2019
2 parents e8023f3 + a44b691 commit e37e08bf5fa39f50c0a1c72a7be42a0e5d6ec2f4
Showing with 1 addition and 9 deletions.
  1. +0 −8 plugins/auth/caching_sha2_pw.c
  2. +1 −1 plugins/auth/gssapi_errmsg.c
@@ -275,14 +275,6 @@ static int auth_caching_sha2_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
memmove(mysql->scramble_buff, packet, SCRAMBLE_LENGTH);
mysql->scramble_buff[SCRAMBLE_LENGTH]= 0;

/* if a tls session is active we need to send plain password */
if (mysql->client_flag & CLIENT_SSL)
{
if (vio->write_packet(vio, (unsigned char *)mysql->passwd, (int)strlen(mysql->passwd) + 1))
return CR_ERROR;
return CR_OK;
}

/* send empty packet if no password was provided */
if (!mysql->passwd || !mysql->passwd[0])
{
@@ -26,7 +26,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/

#ifdef __FreeBSD__
#if defined(__FreeBSD__) || defined(SOLARIS) || defined(__sun)
#include <gssapi/gssapi.h>
#else
#include <gssapi.h>

0 comments on commit e37e08b

Please sign in to comment.
You can’t perform that action at this time.