ctlib: Fix cs_will_convert
Use CT-Library types, not TDS ones. Signed-off-by: fandehui <fandehui@xfusion.com> (cherry picked from commit 493587811eb5784f24e747a926485adc796cb42a)
This commit is contained in:
parent
de6b948422
commit
aafa492e78
28
ctlib-Fix-cs_will_convert.patch
Normal file
28
ctlib-Fix-cs_will_convert.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
From 84f3ff1d8f76ba6f764a6b2fa164c40aba54c28a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Frediano Ziglio <freddy77@gmail.com>
|
||||||
|
Date: Sun, 17 Mar 2019 19:02:35 +0000
|
||||||
|
Subject: [PATCH] ctlib: Fix cs_will_convert
|
||||||
|
|
||||||
|
Use CT-Library types, not TDS ones.
|
||||||
|
|
||||||
|
Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
|
||||||
|
---
|
||||||
|
src/ctlib/cs.c | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/ctlib/cs.c b/src/ctlib/cs.c
|
||||||
|
index 30dd2de0..70c314c1 100644
|
||||||
|
--- a/src/ctlib/cs.c
|
||||||
|
+++ b/src/ctlib/cs.c
|
||||||
|
@@ -1293,6 +1293,8 @@ cs_will_convert(CS_CONTEXT * ctx, CS_INT srctype, CS_INT desttype, CS_BOOL * res
|
||||||
|
|
||||||
|
tdsdump_log(TDS_DBG_FUNC, "cs_will_convert(%p, %d, %d, %p)\n", ctx, srctype, desttype, result);
|
||||||
|
|
||||||
|
+ srctype = _ct_get_server_type(NULL, srctype);
|
||||||
|
+ desttype = _ct_get_server_type(NULL, desttype);
|
||||||
|
*result = (tds_willconvert(srctype, desttype) ? CS_TRUE : CS_FALSE);
|
||||||
|
return CS_SUCCEED;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
@ -1,13 +1,14 @@
|
|||||||
Name: freetds
|
Name: freetds
|
||||||
Summary: Implementation of the TDS (Tabular DataStream) protocol
|
Summary: Implementation of the TDS (Tabular DataStream) protocol
|
||||||
Version: 1.00.38
|
Version: 1.00.38
|
||||||
Release: 8
|
Release: 9
|
||||||
License: LGPLv2+ and GPLv2+
|
License: LGPLv2+ and GPLv2+
|
||||||
URL: http://www.freetds.org/
|
URL: http://www.freetds.org/
|
||||||
|
|
||||||
Source0: ftp://ftp.freetds.org/pub/freetds/stable/freetds-%{version}.tar.bz2
|
Source0: ftp://ftp.freetds.org/pub/freetds/stable/freetds-%{version}.tar.bz2
|
||||||
Source1: freetds-tds_sysdep_public.h
|
Source1: freetds-tds_sysdep_public.h
|
||||||
Patch0: CVE-2019-13508.patch
|
Patch0: CVE-2019-13508.patch
|
||||||
|
Patch1: ctlib-Fix-cs_will_convert.patch
|
||||||
|
|
||||||
BuildRequires: unixODBC-devel readline-devel gnutls-devel krb5-devel
|
BuildRequires: unixODBC-devel readline-devel gnutls-devel krb5-devel
|
||||||
BuildRequires: libgcrypt-devel libtool doxygen docbook-style-dsssl
|
BuildRequires: libgcrypt-devel libtool doxygen docbook-style-dsssl
|
||||||
@ -120,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Dec 28 2023 fandehui <fandehui@xfusion.com> - 1.00.38-9
|
||||||
|
- ctlib: Fix cs_will_convert
|
||||||
|
|
||||||
* Wed Feb 09 2022 wangkai <wangkai385@huawei.com> - 1.00.38-8
|
* Wed Feb 09 2022 wangkai <wangkai385@huawei.com> - 1.00.38-8
|
||||||
- Fix CVE-2019-13508
|
- Fix CVE-2019-13508
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user