aboutsummaryrefslogtreecommitdiffstats
path: root/security/tomoyo/util.c
diff options
context:
space:
mode:
authorTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>2010-06-17 03:55:58 -0400
committerJames Morris <jmorris@namei.org>2010-08-02 01:34:42 -0400
commit7c2ea22e3c5463627ca98924cd65cb9e480dc29c (patch)
tree3a105a08cf75c77689bdfe890c64f9ae433748b9 /security/tomoyo/util.c
parent31845e8c6d3f4f26702e567c667277f9fd1f73a3 (diff)
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/util.c')
-rw-r--r--security/tomoyo/util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/tomoyo/util.c b/security/tomoyo/util.c
index 945eeefbbdfe..20abba22af42 100644
--- a/security/tomoyo/util.c
+++ b/security/tomoyo/util.c
@@ -92,7 +92,7 @@ bool tomoyo_parse_name_union(const char *filename,
92 if (!tomoyo_correct_word(filename)) 92 if (!tomoyo_correct_word(filename))
93 return false; 93 return false;
94 if (filename[0] == '@') { 94 if (filename[0] == '@') {
95 ptr->group = tomoyo_get_path_group(filename + 1); 95 ptr->group = tomoyo_get_group(filename + 1, TOMOYO_PATH_GROUP);
96 ptr->is_group = true; 96 ptr->is_group = true;
97 return ptr->group != NULL; 97 return ptr->group != NULL;
98 } 98 }
@@ -117,7 +117,7 @@ bool tomoyo_parse_number_union(char *data, struct tomoyo_number_union *num)
117 if (data[0] == '@') { 117 if (data[0] == '@') {
118 if (!tomoyo_correct_word(data)) 118 if (!tomoyo_correct_word(data))
119 return false; 119 return false;
120 num->group = tomoyo_get_number_group(data + 1); 120 num->group = tomoyo_get_group(data + 1, TOMOYO_NUMBER_GROUP);
121 num->is_group = true; 121 num->is_group = true;
122 return num->group != NULL; 122 return num->group != NULL;
123 } 123 }