diff --git a/src/mnode/src/mnodeDb.c b/src/mnode/src/mnodeDb.c index 935caebabf341e9cb8eeb9b75f470c1aa7c6af8e..00471bbf042e147a210fb575e7372d9696c33617 100644 --- a/src/mnode/src/mnodeDb.c +++ b/src/mnode/src/mnodeDb.c @@ -930,9 +930,9 @@ static int32_t mnodeProcessCreateDbMsg(SMnodeMsg *pMsg) { #ifdef GRANT_CHECK_WRITE if (grantCheck(TSDB_GRANT_TIME) != TSDB_CODE_SUCCESS) { code = TSDB_CODE_GRANT_EXPIRED; - } else + } // else #endif - if (!pMsg->pUser->writeAuth) { + if (!pMsg->pUser->writeAuth) { code = TSDB_CODE_MND_NO_RIGHTS; } else { code = mnodeCreateDb(pMsg->pUser->pAcct, pCreate, pMsg); diff --git a/src/mnode/src/mnodeDnode.c b/src/mnode/src/mnodeDnode.c index 3bbd3b129cdd762e33af746fa0a08b1d5013387f..cb7855bc327c1cb48c1beb37ff4ea5eac58b53fb 100644 --- a/src/mnode/src/mnodeDnode.c +++ b/src/mnode/src/mnodeDnode.c @@ -667,6 +667,7 @@ static int32_t mnodeCreateDnode(char *ep, SMnodeMsg *pMsg) { if (grantCode != TSDB_CODE_SUCCESS) { return grantCode; } + char dnodeEp[TSDB_EP_LEN] = {0}; tstrncpy(dnodeEp, ep, TSDB_EP_LEN); strtrim(dnodeEp); diff --git a/src/mnode/src/mnodeFunc.c b/src/mnode/src/mnodeFunc.c index 1a8c65915bfc43b1bfd969f8e54da0961260d30a..f6456383c9f83dac115d07335301811ea6b89672 100644 --- a/src/mnode/src/mnodeFunc.c +++ b/src/mnode/src/mnodeFunc.c @@ -205,10 +205,12 @@ int32_t mnodeCreateFunc(SAcctObj *pAcct, char *name, int32_t codeLen, char *code if (code != TSDB_CODE_SUCCESS) { return code; } + code = grantCheck(TSDB_GRANT_USER); if (code != TSDB_CODE_SUCCESS) { return code; } + if (name[0] == 0) { return TSDB_CODE_MND_INVALID_FUNC_NAME; } diff --git a/src/mnode/src/mnodeUser.c b/src/mnode/src/mnodeUser.c index 2bd35aafa82f050b516dcfbe98c79f0007219fd4..c5c54791cf828661e146b121765806a630ea8baa 100644 --- a/src/mnode/src/mnodeUser.c +++ b/src/mnode/src/mnodeUser.c @@ -249,7 +249,7 @@ int32_t mnodeCreateUser(SAcctObj *pAcct, char *name, char *pass, void *pMsg) { mnodeDecUserRef(pUser); return TSDB_CODE_MND_USER_ALREADY_EXIST; } - + code = grantCheck(TSDB_GRANT_USER); if (code != TSDB_CODE_SUCCESS) { return code;