hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable concurrect maxadmin access

Browse Source 
The administrative operations in debugcmd.c now share a global lock.
This commit is contained in:
Markus Makela
2016-11-26 06:04:34 +02:00
parent 5aa791d16e
commit 8573df6ee7
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/modules/routing/debugcli/debugcmd.c
View File

@ -1520,6 +1520,8 @@ convert_arg(int mode, char *arg, int arg_type)
return 0; return 0;
} }
static SPINLOCK debugcmd_lock = SPINLOCK_INIT;
/** /**
* We have a complete line from the user, lookup the commands and execute them * We have a complete line from the user, lookup the commands and execute them
* *
@ -1611,6 +1613,8 @@ execute_cmd(CLI_SESSION *cli)
argc = i - 2; /* The number of extra arguments to commands */ argc = i - 2; /* The number of extra arguments to commands */
spinlock_acquire(&debugcmd_lock);
if (!strcasecmp(args[0], "help")) if (!strcasecmp(args[0], "help"))
{ {
if (args[1] == NULL || *args[1] == 0) if (args[1] == NULL || *args[1] == 0)
@ -1662,11 +1666,7 @@ execute_cmd(CLI_SESSION *cli)
} }
found = 1; found = 1;
} }
else if (!strcasecmp(args[0], "quit")) else if (strcasecmp(args[0], "quit") && argc >= 0)
{
return 0;
}
else if (argc >= 0)
{ {
for (i = 0; cmds[i].cmd; i++) for (i = 0; cmds[i].cmd; i++)
{ {
@ -1710,7 +1710,7 @@ execute_cmd(CLI_SESSION *cli)
if (arg_list[k] == 0) if (arg_list[k] == 0)
{ {
dcb_printf(dcb, "Invalid argument: %s\n", args[k + 2]); dcb_printf(dcb, "Invalid argument: %s\n", args[k + 2]);
return 0; break;
} }
} }
@ -1807,6 +1807,8 @@ execute_cmd(CLI_SESSION *cli)
"Command '%s' not known, type help for a list of available commands\n", args[0]); "Command '%s' not known, type help for a list of available commands\n", args[0]);
} }
spinlock_release(&debugcmd_lock);
memset(cli->cmdbuf, 0, CMDBUFLEN); memset(cli->cmdbuf, 0, CMDBUFLEN);
return 1; return 1;