From 7c2ea22e3c5463627ca98924cd65cb9e480dc29c Mon Sep 17 00:00:00 2001 From: Tetsuo Handa Date: Thu, 17 Jun 2010 16:55:58 +0900 Subject: TOMOYO: Merge path_group and number_group. Use common code for "path_group" and "number_group". Signed-off-by: Tetsuo Handa Signed-off-by: James Morris --- security/tomoyo/util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'security/tomoyo/util.c') 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, if (!tomoyo_correct_word(filename)) return false; if (filename[0] == '@') { - ptr->group = tomoyo_get_path_group(filename + 1); + ptr->group = tomoyo_get_group(filename + 1, TOMOYO_PATH_GROUP); ptr->is_group = true; return ptr->group != NULL; } @@ -117,7 +117,7 @@ bool tomoyo_parse_number_union(char *data, struct tomoyo_number_union *num) if (data[0] == '@') { if (!tomoyo_correct_word(data)) return false; - num->group = tomoyo_get_number_group(data + 1); + num->group = tomoyo_get_group(data + 1, TOMOYO_NUMBER_GROUP); num->is_group = true; return num->group != NULL; } -- cgit v1.2.1