.. | .. |
---|
24 | 24 | static int __init tomoyo_loader_setup(char *str) |
---|
25 | 25 | { |
---|
26 | 26 | tomoyo_loader = str; |
---|
27 | | - return 0; |
---|
| 27 | + return 1; |
---|
28 | 28 | } |
---|
29 | 29 | |
---|
30 | 30 | __setup("TOMOYO_loader=", tomoyo_loader_setup); |
---|
.. | .. |
---|
37 | 37 | static bool tomoyo_policy_loader_exists(void) |
---|
38 | 38 | { |
---|
39 | 39 | struct path path; |
---|
| 40 | + |
---|
40 | 41 | if (!tomoyo_loader) |
---|
41 | 42 | tomoyo_loader = CONFIG_SECURITY_TOMOYO_POLICY_LOADER; |
---|
42 | 43 | if (kern_path(tomoyo_loader, LOOKUP_FOLLOW, &path)) { |
---|
43 | | - printk(KERN_INFO "Not activating Mandatory Access Control " |
---|
44 | | - "as %s does not exist.\n", tomoyo_loader); |
---|
| 44 | + pr_info("Not activating Mandatory Access Control as %s does not exist.\n", |
---|
| 45 | + tomoyo_loader); |
---|
45 | 46 | return false; |
---|
46 | 47 | } |
---|
47 | 48 | path_put(&path); |
---|
.. | .. |
---|
63 | 64 | static int __init tomoyo_trigger_setup(char *str) |
---|
64 | 65 | { |
---|
65 | 66 | tomoyo_trigger = str; |
---|
66 | | - return 0; |
---|
| 67 | + return 1; |
---|
67 | 68 | } |
---|
68 | 69 | |
---|
69 | 70 | __setup("TOMOYO_trigger=", tomoyo_trigger_setup); |
---|
.. | .. |
---|
96 | 97 | if (!tomoyo_policy_loader_exists()) |
---|
97 | 98 | return; |
---|
98 | 99 | done = true; |
---|
99 | | - printk(KERN_INFO "Calling %s to load policy. Please wait.\n", |
---|
100 | | - tomoyo_loader); |
---|
| 100 | + pr_info("Calling %s to load policy. Please wait.\n", tomoyo_loader); |
---|
101 | 101 | argv[0] = (char *) tomoyo_loader; |
---|
102 | 102 | argv[1] = NULL; |
---|
103 | 103 | envp[0] = "HOME=/"; |
---|