mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-31 06:16:03 +00:00
Code Issues Releases Wiki Activity

parser: rename rules.h perms_t to perm32_t

Browse Source 
There are two distinct declarations of perms_t.
  rule.h: typedef uint32_t perms_t
  hfa.h: class perms_t

these definitions clash when the front end and backend share more info.
To avoid this rename rule.h to perm32_t, and move the definition into
perms.h and use it in struct aa_perms.

Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen
2023-08-02 02:07:36 -07:00
parent e29f5ce5f3
commit 2e18cb9aed
25 changed files with 83 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
parser/signal.h
View File

@@ -32,7 +32,7 @@
typedef set<int> Signals;
int find_signal_mapping(const char *sig);
int parse_signal_perms(const char *str_perms, perms_t *perms, int fail);
int parse_signal_perms(const char *str_perms, perm32_t *perms, int fail);
class signal_rule: public perms_rule_t {
void extract_sigs(struct value_list **list);
@@ -41,7 +41,7 @@ public:
Signals signals;
char *peer_label;
signal_rule(perms_t perms, struct cond_entry *conds);
signal_rule(perm32_t perms, struct cond_entry *conds);
virtual ~signal_rule() {
signals.clear();
free(peer_label);