From ae317a751cd48d22b57403a8dd1a169fb695b997 Mon Sep 17 00:00:00 2001 From: Cary Xu Date: Tue, 19 Oct 2021 17:56:03 +0800 Subject: [PATCH] code restore --- src/mnode/src/mnodeDb.c | 4 ++-- src/mnode/src/mnodeDnode.c | 1 + src/mnode/src/mnodeFunc.c | 2 ++ src/mnode/src/mnodeUser.c | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/mnode/src/mnodeDb.c b/src/mnode/src/mnodeDb.c index 935caebabf..00471bbf04 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 3bbd3b129c..cb7855bc32 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 1a8c65915b..f6456383c9 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 2bd35aafa8..c5c54791cf 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; -- GitLab