diff --git a/apparmor.d/tunables/multiarch.d/system b/apparmor.d/tunables/multiarch.d/system index 95e42888c..40f56216d 100644 --- a/apparmor.d/tunables/multiarch.d/system +++ b/apparmor.d/tunables/multiarch.d/system @@ -5,17 +5,20 @@ # To allow extended personalisation without breaking everything. # All apparmor profiles should always use the variables defined here. -# Single hexadecimal character -@{h}=[0-9a-fA-F] +# Any digit +@{d}=[0-9] + +# Any letter +@{l}=[a-zA-Z] # Single alphanumeric character @{c}=[0-9a-zA-Z] -# Word character. Matches any letter, digit or underscore. +# Word character: matches any letter, digit or underscore. @{w}=[a-zA-Z0-9_] -# Any digit -@{d}=[0-9] +# Single hexadecimal character +@{h}=[0-9a-fA-F] # Integer up to 10 digits (0-9999999999) @{int}=@{d}{@{d},}{@{d},}{@{d},}{@{d},}{@{d},}{@{d},}{@{d},}{@{d},}{@{d},} @@ -37,7 +40,10 @@ @{int4}=@{int2}@{int2} @{int6}=@{int4}@{int2} @{int8}=@{int4}@{int4} +@{int9}=@{int8}@{d} @{int10}=@{int8}@{int2} +@{int12}=@{int8}@{int4} +@{int15}=@{int8}@{int4}@{int2}@{d} @{int16}=@{int8}@{int8} @{int32}=@{int16}@{int16} @{int64}=@{int32}@{int32}