X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fvserver.h;h=1d553f4bc1f7402c29b01df7576923b853b92ce1;hb=148ab3024621f97b9cf95091657db2448098bc66;hp=a1ba744e5025af84036c6e34db28887f75fd1aaf;hpb=277c13c20771c27b03fe35a58bad0df69561b042;p=util-vserver.git diff --git a/lib/vserver.h b/lib/vserver.h index a1ba744..1d553f4 100644 --- a/lib/vserver.h +++ b/lib/vserver.h @@ -141,6 +141,9 @@ #define VC_CAP_LEASE 28 #define VC_CAP_AUDIT_WRITE 29 #define VC_CAP_AUDIT_CONTROL 30 +#define VC_CAP_SETFCAP 31 +#define VC_CAP_MAC_OVERRIDE 32 +#define VC_CAP_MAC_ADMIN 33 #define VC_IMMUTABLE_FILE_FL 0x0000010lu #define VC_IMMUTABLE_LINK_FL 0x0008000lu @@ -157,6 +160,7 @@ #define VC_IATTR_BARRIER 0x00010000u #define VC_IATTR_IUNLINK 0x00020000u #define VC_IATTR_IMMUTABLE 0x00040000u +#define VC_IATTR_COW 0x00080000u // the flags @@ -201,9 +205,13 @@ // the ccapabilities #define VC_VXC_SET_UTSNAME 0x00000001ull #define VC_VXC_SET_RLIMIT 0x00000002ull +#define VC_VXC_FS_SECURITY 0x00000004ull +#define VC_VXC_TIOCSTI 0x00000010ull #define VC_VXC_RAW_ICMP 0x00000100ull #define VC_VXC_SYSLOG 0x00001000ull +#define VC_VXC_OOM_ADJUST 0x00002000ull +#define VC_VXC_AUDIT_CONTROL 0x00004000ull #define VC_VXC_SECURE_MOUNT 0x00010000ull #define VC_VXC_SECURE_REMOUNT 0x00020000ull @@ -214,6 +222,7 @@ #define VC_VXC_ADMIN_CLOOP 0x00400000ull #define VC_VXC_KTHREAD 0x01000000ull +#define VC_VXC_NAMESPACE 0x02000000ull // the scheduler flags @@ -272,8 +281,18 @@ // the VCI bit values #define VC_VCI_NO_DYNAMIC (1 << 0) +#define VC_VCI_PROC_SECURE (1 << 4) +#define VC_VCI_HARDCPU (1 << 5) +#define VC_VCI_IDLELIMIT (1 << 6) +#define VC_VCI_IDLETIME (1 << 7) +#define VC_VCI_COWBL (1 << 8) +#define VC_VCI_FULLCOWBL (1 << 9) #define VC_VCI_SPACES (1 << 10) #define VC_VCI_NETV2 (1 << 11) +#define VC_VCI_MEMCG (1 << 12) +#define VC_VCI_DEBUG (1 << 16) +#define VC_VCI_HISTORY (1 << 20) +#define VC_VCI_TAGGED (1 << 24) #define VC_VCI_PPTAG (1 << 28) @@ -373,6 +392,8 @@ extern "C" { */ vc_vci_t vc_get_vci(); + int vc_get_kernel(); + /** \brief Moves current process into a context * \ingroup syscalls * @@ -761,8 +782,8 @@ extern "C" { char *val, size_t len) VC_ATTR_NONNULL((3)); /* namespace related functions */ - int vc_enter_namespace(xid_t xid, uint_least64_t mask); - int vc_set_namespace(xid_t xid, uint_least64_t mask); + int vc_enter_namespace(xid_t xid, uint_least64_t mask, uint32_t index); + int vc_set_namespace(xid_t xid, uint_least64_t mask, uint32_t index); int vc_cleanup_namespace(void); uint_least64_t vc_get_space_mask(void); uint_least64_t vc_get_space_default(void); @@ -943,7 +964,7 @@ extern "C" { uint_least64_t vc_get_insecurebcaps() VC_ATTR_CONST; inline static uint_least64_t vc_get_insecureccaps() { - return ~(VC_VXC_SET_UTSNAME|VC_VXC_RAW_ICMP); + return ~(VC_VXC_SET_UTSNAME|VC_VXC_RAW_ICMP|VC_VXC_AUDIT_CONTROL); } inline static int vc_setfilecontext(char const *filename, xid_t xid) { @@ -971,6 +992,8 @@ extern "C" { vcFEATURE_VSHELPER0, vcFEATURE_VSHELPER, vcFEATURE_VWAIT, vcFEATURE_VNET, vcFEATURE_VSTAT, vcFEATURE_PPTAG, vcFEATURE_PIDSPACE, vcFEATURE_SPACES, vcFEATURE_PERSISTENT, + vcFEATURE_PIVOT_ROOT, vcFEATURE_MEMCG, vcFEATURE_DYNAMIC, + vcFEATURE_BME, } vcFeatureSet;