TOMOYO: Cleanup part 1.

[deliverable/linux.git] / security / tomoyo / domain.c

diff --git a/security/tomoyo/domain.c b/security/tomoyo/domain.c
index 35388408e475470b6c2467db248a05b1b01c2ca7..355b536262b125268295dfef50ce932f96c794cb 100644 (file)
--- a/security/tomoyo/domain.c
+++ b/security/tomoyo/domain.c
@@ -510,17 +510,8 @@ int tomoyo_find_next_domain(struct linux_binprm *bprm)
        if (domain || strlen(tmp) >= TOMOYO_EXEC_TMPSIZE - 10)
                goto done;
        domain = tomoyo_find_domain(tmp);
-       if (domain)
-               goto done;
-       if (is_enforce) {
-               int error = tomoyo_supervisor(&r, "# wants to create domain\n"
-                                             "%s\n", tmp);
-               if (error == TOMOYO_RETRY_REQUEST)
-                       goto retry;
-               if (error < 0)
-                       goto done;
-       }
-       domain = tomoyo_assign_domain(tmp, old_domain->profile);
+       if (!domain)
+               domain = tomoyo_assign_domain(tmp, old_domain->profile);
  done:
        if (domain)
                goto out;