From: Willy Tarreau Date: Thu, 24 Oct 2019 11:50:48 +0000 (+0200) Subject: REORG: move CLI access level definitions to cli.h X-Git-Tag: v2.1-dev3~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86bfe146c9cccb318ee3a7be5f22b9d753195e59;p=thirdparty%2Fhaproxy.git REORG: move CLI access level definitions to cli.h These ones were still in global.h which is misplaced. --- diff --git a/include/types/cli.h b/include/types/cli.h index d6932f4092..3dee3f830d 100644 --- a/include/types/cli.h +++ b/include/types/cli.h @@ -23,6 +23,17 @@ #include #include +/* Access level for a stats socket */ +#define ACCESS_LVL_NONE 0 +#define ACCESS_LVL_USER 1 +#define ACCESS_LVL_OPER 2 +#define ACCESS_LVL_ADMIN 3 +#define ACCESS_LVL_MASK 0x3 + +#define ACCESS_FD_LISTENERS 0x4 /* expose listeners FDs on stats socket */ +#define ACCESS_MASTER 0x8 /* works with the master (and every other processes) */ +#define ACCESS_MASTER_ONLY 0x10 /* only works with the worker */ + struct cli_kw { const char *str_kw[5]; /* keywords ended by NULL, limited to 5 separated keywords combination */ diff --git a/include/types/global.h b/include/types/global.h index e9cbf3fca4..df6614eb16 100644 --- a/include/types/global.h +++ b/include/types/global.h @@ -75,17 +75,6 @@ #define GTUNE_USE_EVPORTS (1<<14) -/* Access level for a stats socket */ -#define ACCESS_LVL_NONE 0 -#define ACCESS_LVL_USER 1 -#define ACCESS_LVL_OPER 2 -#define ACCESS_LVL_ADMIN 3 -#define ACCESS_LVL_MASK 0x3 - -#define ACCESS_FD_LISTENERS 0x4 /* expose listeners FDs on stats socket */ -#define ACCESS_MASTER 0x8 /* works with the master (and every other processes) */ -#define ACCESS_MASTER_ONLY 0x10 /* only works with the worker */ - /* SSL server verify mode */ enum { SSL_SERVER_VERIFY_NONE = 0,