From ec95aa80d551747ab736d4e60603584ed7a093f4 Mon Sep 17 00:00:00 2001 From: "Aaron M. Ucko" Date: Mon, 13 May 2024 10:11:13 -0400 Subject: [PATCH] ct_connect: Set client_charset in addition to server_charset. Signed-off-by: Aaron M. Ucko --- src/ctlib/ct.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ctlib/ct.c b/src/ctlib/ct.c index 396048e849..1f4ce4b384 100644 --- a/src/ctlib/ct.c +++ b/src/ctlib/ct.c @@ -766,7 +766,10 @@ ct_connect(CS_CONNECTION * con, CS_CHAR * servername, CS_INT snamelen) /* override locale settings with CS_CONNECTION settings, if any */ if (con->locale) { if (con->locale->charset) { - if (!tds_dstr_copy(&login->server_charset, con->locale->charset)) + if (!tds_dstr_copy(&login->server_charset, + con->locale->charset) + || !tds_dstr_copy(&login->client_charset, + con->locale->charset)) goto Cleanup; } if (con->locale->language) {