From ddb031b6a1d8b6e26a0f10f454dc1453a48a6ca8 Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Fri, 7 Jan 2022 17:54:25 +0100 Subject: [PATCH] Travis fix: When reading connection parameters from configuration file a secure connection must be established. --- unittest/libmariadb/connection.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/unittest/libmariadb/connection.c b/unittest/libmariadb/connection.c index cfc702ea..696f072b 100644 --- a/unittest/libmariadb/connection.c +++ b/unittest/libmariadb/connection.c @@ -2018,15 +2018,25 @@ static int test_conn_str_1(MYSQL *my __attribute__((unused))) MYSQL *mysql; FILE *fp; int rc; + char conn_str[1024]; mysql= mysql_init(NULL); + if (!(fp= fopen("./conc274.cnf", "w"))) return FAIL; - fprintf(fp, "[client]\n"); - fprintf(fp, "connection=host=%s;user=%s;password=%s;port=%d;ssl_enforce=1;socket=%s\n", + sprintf(conn_str, "connection=host=%s;user=%s;password=%s;port=%d;ssl_enforce=1;socket=%s", hostname ? hostname : "localhost", username ? username : "", password ? password : "", port, socketname ? socketname : ""); + /* SkySQL requires secure connection */ + if (IS_SKYSQL(hostname)) + { + strcat(conn_str, ";ssl_enforce=1"); + } + + fprintf(fp, "[client]\n"); + fprintf(fp, "%s\n", conn_str); + fclose(fp); rc= mysql_options(mysql, MYSQL_READ_DEFAULT_FILE, "./conc274.cnf");