TOMOYO: Remove alias keyword.

[net-next-2.6.git] / security / tomoyo / common.c

diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c
index 183fe6513400d2ed5c36c05b8f3b2eeedadac6ee..0e6b1b598b860bb433fa20b5c11cae24da4bb51e 100644 (file)
--- a/security/tomoyo/common.c
+++ b/security/tomoyo/common.c
@@ -1177,8 +1177,6 @@ static int tomoyo_write_exception_policy(struct tomoyo_io_buffer *head)
                                                              is_delete);
        if (tomoyo_str_starts(&data, TOMOYO_KEYWORD_AGGREGATOR))
                return tomoyo_write_aggregator_policy(data, is_delete);
-       if (tomoyo_str_starts(&data, TOMOYO_KEYWORD_ALIAS))
-               return tomoyo_write_alias_policy(data, is_delete);
        if (tomoyo_str_starts(&data, TOMOYO_KEYWORD_ALLOW_READ))
                return tomoyo_write_globally_readable_policy(data, is_delete);
        if (tomoyo_str_starts(&data, TOMOYO_KEYWORD_FILE_PATTERN))
@@ -1334,16 +1332,6 @@ static bool tomoyo_read_policy(struct tomoyo_io_buffer *head, const int idx)
                                w[1] = ptr->filename->name;
                        }
                        break;
-               case TOMOYO_ID_ALIAS:
-                       {
-                               struct tomoyo_alias_entry *ptr =
-                                       container_of(acl, typeof(*ptr), head);
-                               w[0] = TOMOYO_KEYWORD_ALIAS;
-                               w[1] = ptr->original_name->name;
-                               w[2] = " ";
-                               w[3] = ptr->aliased_name->name;
-                       }
-                       break;
                case TOMOYO_ID_AGGREGATOR:
                        {
                                struct tomoyo_aggregator_entry *ptr =