diff options
| author | Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> | 2010-06-17 16:55:58 +0900 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-08-02 15:34:42 +1000 |
| commit | 7c2ea22e3c5463627ca98924cd65cb9e480dc29c (patch) | |
| tree | 3a105a08cf75c77689bdfe890c64f9ae433748b9 /security/tomoyo/common.h | |
| parent | 31845e8c6d3f4f26702e567c667277f9fd1f73a3 (diff) | |
| download | linux-7c2ea22e3c5463627ca98924cd65cb9e480dc29c.tar.gz linux-7c2ea22e3c5463627ca98924cd65cb9e480dc29c.tar.bz2 linux-7c2ea22e3c5463627ca98924cd65cb9e480dc29c.zip | |
TOMOYO: Merge path_group and number_group.
Use common code for "path_group" and "number_group".
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/tomoyo/common.h')
| -rw-r--r-- | security/tomoyo/common.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/security/tomoyo/common.h b/security/tomoyo/common.h index 21eb1e7885b8..ec3ed488ee30 100644 --- a/security/tomoyo/common.h +++ b/security/tomoyo/common.h @@ -838,12 +838,10 @@ int tomoyo_write_mount_policy(char *data, struct tomoyo_domain_info *domain, int tomoyo_write_no_rewrite_policy(char *data, const bool is_delete); /* Create "file_pattern" entry in exception policy. */ int tomoyo_write_pattern_policy(char *data, const bool is_delete); -/* Create "path_group" entry in exception policy. */ -int tomoyo_write_path_group_policy(char *data, const bool is_delete); +/* Create "path_group"/"number_group" entry in exception policy. */ +int tomoyo_write_group(char *data, const bool is_delete, const u8 type); int tomoyo_supervisor(struct tomoyo_request_info *r, const char *fmt, ...) __attribute__ ((format(printf, 2, 3))); -/* Create "number_group" entry in exception policy. */ -int tomoyo_write_number_group_policy(char *data, const bool is_delete); /* Find a domain by the given name. */ struct tomoyo_domain_info *tomoyo_find_domain(const char *domainname); /* Find or create a domain by the given name. */ @@ -851,9 +849,10 @@ struct tomoyo_domain_info *tomoyo_find_or_assign_new_domain(const char * domainname, const u8 profile); struct tomoyo_profile *tomoyo_profile(const u8 profile); -/* Allocate memory for "struct tomoyo_path_group". */ -struct tomoyo_group *tomoyo_get_path_group(const char *group_name); -struct tomoyo_group *tomoyo_get_number_group(const char *group_name); +/* + * Allocate memory for "struct tomoyo_path_group"/"struct tomoyo_number_group". + */ +struct tomoyo_group *tomoyo_get_group(const char *group_name, const u8 type); /* Check mode for specified functionality. */ unsigned int tomoyo_check_flags(const struct tomoyo_domain_info *domain, |