From 14c5ddecf25a15136ab69c47f687842c98e1430a Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Thu, 23 Apr 2026 16:52:02 +0800 Subject: [PATCH] fix(transport): fix SASL null pointer check and build config --- source/libs/transport/CMakeLists.txt | 2 +- source/libs/transport/src/transSasl.c | 5 ++++- source/libs/transport/src/transSvr.c | 1 - test/ci/cases.task | 3 +++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/source/libs/transport/CMakeLists.txt b/source/libs/transport/CMakeLists.txt index e2c6d7548088..1cf81222f3a4 100644 --- a/source/libs/transport/CMakeLists.txt +++ b/source/libs/transport/CMakeLists.txt @@ -2,7 +2,7 @@ aux_source_directory(src TRANSPORT_SRC) IF(TD_ENTERPRISE) LIST(APPEND TRANSPORT_SRC ${TD_ENTERPRISE_DIR}/src/plugins/trans/src/transTLSImpl.c) - #LIST(APPEND TRANSPORT_SRC ${TD_ENTERPRISE_DIR}/src/plugins/trans/src/transSaslImpl.c) + LIST(APPEND TRANSPORT_SRC ${TD_ENTERPRISE_DIR}/src/plugins/trans/src/transSaslImpl.c) ENDIF() add_library(transport STATIC ${TRANSPORT_SRC}) diff --git a/source/libs/transport/src/transSasl.c b/source/libs/transport/src/transSasl.c index f7991e92040a..9fb41691feb9 100644 --- a/source/libs/transport/src/transSasl.c +++ b/source/libs/transport/src/transSasl.c @@ -97,6 +97,8 @@ void saslBufferClear(SSaslBuffer* buf) { saslBufferClearImpl(buf); } +#if !defined(TD_ENTERPRISE) + void saslLibInitImpl() { return; } @@ -132,6 +134,7 @@ int32_t saslConnHandleAuthImpl(SSaslConn * pConn, const char* input, int32_t len } int8_t saslConnShoudDoAuthImpl(SSaslConn * pConn) { + if (pConn == NULL) return 1; return 0; } @@ -149,4 +152,4 @@ void saslBufferClearImpl(SSaslBuffer* buf) { return; } -//#endif +#endif diff --git a/source/libs/transport/src/transSvr.c b/source/libs/transport/src/transSvr.c index dd4db3954164..29d023509664 100644 --- a/source/libs/transport/src/transSvr.c +++ b/source/libs/transport/src/transSvr.c @@ -384,7 +384,6 @@ int32_t uvWhiteListAdd(SIpWhiteListTab* pWhite, char* user, SIpWhiteListDual* pl } pUserList->ver = ver; - pUserList->pList = plist; code = taosHashPut(pWhiteList, user, strlen(user), &pUserList, sizeof(void*)); diff --git a/test/ci/cases.task b/test/ci/cases.task index 40cf1304c8f2..80a7e70b1d7f 100644 --- a/test/ci/cases.task +++ b/test/ci/cases.task @@ -1048,6 +1048,9 @@ ,,y,.,./ci/pytest.sh pytest cases/70-Cluster/test_5dnode_3mnode_stop.py -N 5 -M 3 ,,y,.,./ci/pytest.sh pytest cases/70-Cluster/test_5dnode_3mnode_stop.py -N 5 -M 3 -I False +# 73-TLS +,,y,.,./ci/pytest.sh pytest cases/73-TLS/test_tls.py + # 80-Components