Mailing List Archive

commit d2c1b12b2b81cc16338698efb018c3633e7cadcc
Author: Nils Goroll <nils.goroll@uplex.de>
Date: Fri May 29 13:37:42 2020 +0200

jail_subproc_e and jail_master_e to use distinct values

this is to allow a follow-up simplification in the solaris to use a
single array for privileges.

diff --git a/bin/varnishd/mgt/mgt.h b/bin/varnishd/mgt/mgt.h
index 0456d84b4..a2b3a3d56 100644
--- a/bin/varnishd/mgt/mgt.h
+++ b/bin/varnishd/mgt/mgt.h
@@ -102,21 +102,23 @@ void mgt_cli_init_cls(void);

/* mgt_jail.c */

-enum jail_subproc_e {
- JAIL_SUBPROC_VCC,
- JAIL_SUBPROC_CC,
- JAIL_SUBPROC_VCLLOAD,
- JAIL_SUBPROC_WORKER,
-};
-
enum jail_master_e {
- JAIL_MASTER_LOW,
+ JAIL_MASTER_LOW = 0,
JAIL_MASTER_FILE,
JAIL_MASTER_STORAGE,
JAIL_MASTER_PRIVPORT,
JAIL_MASTER_KILL,
};

+enum jail_subproc_e {
+ JAIL_SUBPROC_VCC = JAIL_MASTER_KILL + 1,
+ JAIL_SUBPROC_CC,
+ JAIL_SUBPROC_VCLLOAD,
+ JAIL_SUBPROC_WORKER,
+};
+
+#define JAIL_LIMIT (JAIL_SUBPROC_WORKER + 1)
+
enum jail_fixfd_e {
JAIL_FIXFD_FILE,
JAIL_FIXFD_VSMMGT,
_______________________________________________
varnish-commit mailing list
varnish-commit@varnish-cache.org
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit