From 2a40113f131cbec6b92006dda1f05385470105b2 Mon Sep 17 00:00:00 2001 From: slzhou Date: Thu, 14 Sep 2023 14:44:09 +0800 Subject: [PATCH] fix: entprise version compilation --- source/dnode/mnode/impl/src/mndPrivilege.c | 22 ++++++++++++++++++++++ source/dnode/mnode/impl/src/mndUser.c | 20 -------------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/source/dnode/mnode/impl/src/mndPrivilege.c b/source/dnode/mnode/impl/src/mndPrivilege.c index fccdd4afd8..0ecaee2168 100644 --- a/source/dnode/mnode/impl/src/mndPrivilege.c +++ b/source/dnode/mnode/impl/src/mndPrivilege.c @@ -33,6 +33,28 @@ int32_t mndCheckTopicPrivilege(SMnode *pMnode, const char *user, EOperType operT int32_t mndCheckTopicPrivilegeByName(SMnode *pMnode, const char *user, EOperType operType, const char *topicName) { return 0; } + + +// TODO: for community version use the commented version +int32_t mndSetUserWhiteListRsp(SMnode *pMnode, SUserObj *pUser, SGetUserWhiteListRsp *pWhiteListRsp) { + memcpy(pWhiteListRsp->user, pUser->user, TSDB_USER_LEN); + // pWhiteListRsp->numWhiteLists = 1; + // pWhiteListRsp->pWhiteLists = taosMemoryMalloc(pWhiteListRsp->numWhiteLists * sizeof(SIpV4Range)); + // if (pWhiteListRsp->pWhiteLists == NULL) { + // return TSDB_CODE_OUT_OF_MEMORY; + // } + // memset(pUser->pIpWhiteList->pIpRange, 0, pWhiteListRsp->numWhiteLists * sizeof(SIpV4Range)); + pWhiteListRsp->numWhiteLists = pUser->pIpWhiteList->num; + pWhiteListRsp->pWhiteLists = taosMemoryMalloc(pWhiteListRsp->numWhiteLists * sizeof(SIpV4Range)); + if (pWhiteListRsp->pWhiteLists == NULL) { + return TSDB_CODE_OUT_OF_MEMORY; + } + memcpy(pWhiteListRsp->pWhiteLists, pUser->pIpWhiteList->pIpRange, + pWhiteListRsp->numWhiteLists * sizeof(SIpV4Range)); + + return 0; +} + int32_t mndSetUserAuthRsp(SMnode *pMnode, SUserObj *pUser, SGetUserAuthRsp *pRsp) { memcpy(pRsp->user, pUser->user, TSDB_USER_LEN); pRsp->superAuth = 1; diff --git a/source/dnode/mnode/impl/src/mndUser.c b/source/dnode/mnode/impl/src/mndUser.c index d8ec075f45..4943328b43 100644 --- a/source/dnode/mnode/impl/src/mndUser.c +++ b/source/dnode/mnode/impl/src/mndUser.c @@ -1231,26 +1231,6 @@ _OVER: return code; } -// TODO: for community version use the commented version -int32_t mndSetUserWhiteListRsp(SMnode *pMnode, SUserObj *pUser, SGetUserWhiteListRsp *pWhiteListRsp) { - memcpy(pWhiteListRsp->user, pUser->user, TSDB_USER_LEN); - // pWhiteListRsp->numWhiteLists = 1; - // pWhiteListRsp->pWhiteLists = taosMemoryMalloc(pWhiteListRsp->numWhiteLists * sizeof(SIpV4Range)); - // if (pWhiteListRsp->pWhiteLists == NULL) { - // return TSDB_CODE_OUT_OF_MEMORY; - // } - // memset(pUser->pIpWhiteList->pIpRange, 0, pWhiteListRsp->numWhiteLists * sizeof(SIpV4Range)); - pWhiteListRsp->numWhiteLists = pUser->pIpWhiteList->num; - pWhiteListRsp->pWhiteLists = taosMemoryMalloc(pWhiteListRsp->numWhiteLists * sizeof(SIpV4Range)); - if (pWhiteListRsp->pWhiteLists == NULL) { - return TSDB_CODE_OUT_OF_MEMORY; - } - memcpy(pWhiteListRsp->pWhiteLists, pUser->pIpWhiteList->pIpRange, - pWhiteListRsp->numWhiteLists * sizeof(SIpV4Range)); - - return 0; -} - int32_t mndProcessGetUserWhiteListReq(SRpcMsg *pReq) { SMnode *pMnode = pReq->info.node; int32_t code = -1;