|
|
@ -126,7 +126,6 @@ char *WSAErrorMsg(void) { |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
static const char *UNAVAILABLE = " - API will not be available"; |
|
|
|
static const char *UNAVAILABLE = " - API will not be available"; |
|
|
|
static const char *INVAPIGROUPS = "Invalid --api-groups parameter"; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static const char *BLANK = ""; |
|
|
|
static const char *BLANK = ""; |
|
|
|
static const char *COMMA = ","; |
|
|
|
static const char *COMMA = ","; |
|
|
@ -3587,30 +3586,21 @@ static void setup_groups() |
|
|
|
colon = strchr(ptr, ':'); |
|
|
|
colon = strchr(ptr, ':'); |
|
|
|
if (colon) |
|
|
|
if (colon) |
|
|
|
*colon = '\0'; |
|
|
|
*colon = '\0'; |
|
|
|
applog(LOG_WARNING, "API invalid group name '%s'", ptr); |
|
|
|
quit(1, "API invalid group name '%s'", ptr); |
|
|
|
quit(1, INVAPIGROUPS); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
group = GROUP(*ptr); |
|
|
|
group = GROUP(*ptr); |
|
|
|
if (!VALIDGROUP(group)) { |
|
|
|
if (!VALIDGROUP(group)) |
|
|
|
applog(LOG_WARNING, "API invalid group name '%c'", *ptr); |
|
|
|
quit(1, "API invalid group name '%c'", *ptr); |
|
|
|
quit(1, INVAPIGROUPS); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (group == PRIVGROUP) { |
|
|
|
if (group == PRIVGROUP) |
|
|
|
applog(LOG_WARNING, "API group name can't be '%c'", PRIVGROUP); |
|
|
|
quit(1, "API group name can't be '%c'", PRIVGROUP); |
|
|
|
quit(1, INVAPIGROUPS); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (group == NOPRIVGROUP) { |
|
|
|
if (group == NOPRIVGROUP) |
|
|
|
applog(LOG_WARNING, "API group name can't be '%c'", NOPRIVGROUP); |
|
|
|
quit(1, "API group name can't be '%c'", NOPRIVGROUP); |
|
|
|
quit(1, INVAPIGROUPS); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (apigroups[GROUPOFFSET(group)].commands != NULL) { |
|
|
|
if (apigroups[GROUPOFFSET(group)].commands != NULL) |
|
|
|
applog(LOG_WARNING, "API duplicate group name '%c'", *ptr); |
|
|
|
quit(1, "API duplicate group name '%c'", *ptr); |
|
|
|
quit(1, INVAPIGROUPS); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ptr += 2; |
|
|
|
ptr += 2; |
|
|
|
|
|
|
|
|
|
|
@ -3644,8 +3634,7 @@ static void setup_groups() |
|
|
|
*cmd = '\0'; |
|
|
|
*cmd = '\0'; |
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
applog(LOG_WARNING, "API unknown command '%s' in group '%c'", ptr, group); |
|
|
|
quit(1, "API unknown command '%s' in group '%c'", ptr, group); |
|
|
|
quit(1, INVAPIGROUPS); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|