diff options
author | John Johansen <john.johansen@canonical.com> | 2017-10-11 04:04:48 -0400 |
---|---|---|
committer | John Johansen <john.johansen@canonical.com> | 2018-02-09 14:30:01 -0500 |
commit | d8889d49e414b371eb235c08c3a759ab3e0cfa51 (patch) | |
tree | 962ba2bf8a36f2553948abe8237bbcabe0f766e6 /security | |
parent | de62de59c27881c59c7df2e535cb9e1275cd52cc (diff) |
apparmor: move context.h to cred.h
Now that file contexts have been moved into file, and task context
fns() and data have been split from the context, only the cred context
remains in context.h so rename to cred.h to better reflect what it
deals with.
Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security')
-rw-r--r-- | security/apparmor/apparmorfs.c | 2 | ||||
-rw-r--r-- | security/apparmor/capability.c | 2 | ||||
-rw-r--r-- | security/apparmor/domain.c | 2 | ||||
-rw-r--r-- | security/apparmor/file.c | 2 | ||||
-rw-r--r-- | security/apparmor/include/cred.h (renamed from security/apparmor/include/context.h) | 0 | ||||
-rw-r--r-- | security/apparmor/ipc.c | 2 | ||||
-rw-r--r-- | security/apparmor/label.c | 2 | ||||
-rw-r--r-- | security/apparmor/lsm.c | 2 | ||||
-rw-r--r-- | security/apparmor/mount.c | 2 | ||||
-rw-r--r-- | security/apparmor/policy.c | 2 | ||||
-rw-r--r-- | security/apparmor/policy_ns.c | 2 | ||||
-rw-r--r-- | security/apparmor/policy_unpack.c | 2 | ||||
-rw-r--r-- | security/apparmor/procattr.c | 2 | ||||
-rw-r--r-- | security/apparmor/resource.c | 2 | ||||
-rw-r--r-- | security/apparmor/task.c | 2 |
15 files changed, 14 insertions, 14 deletions
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c index 00fc4f9f7f14..874c1bf6b84a 100644 --- a/security/apparmor/apparmorfs.c +++ b/security/apparmor/apparmorfs.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include "include/apparmor.h" | 30 | #include "include/apparmor.h" |
31 | #include "include/apparmorfs.h" | 31 | #include "include/apparmorfs.h" |
32 | #include "include/audit.h" | 32 | #include "include/audit.h" |
33 | #include "include/context.h" | 33 | #include "include/cred.h" |
34 | #include "include/crypto.h" | 34 | #include "include/crypto.h" |
35 | #include "include/ipc.h" | 35 | #include "include/ipc.h" |
36 | #include "include/label.h" | 36 | #include "include/label.h" |
diff --git a/security/apparmor/capability.c b/security/apparmor/capability.c index 67e347192a55..253ef6e9d445 100644 --- a/security/apparmor/capability.c +++ b/security/apparmor/capability.c | |||
@@ -19,7 +19,7 @@ | |||
19 | 19 | ||
20 | #include "include/apparmor.h" | 20 | #include "include/apparmor.h" |
21 | #include "include/capability.h" | 21 | #include "include/capability.h" |
22 | #include "include/context.h" | 22 | #include "include/cred.h" |
23 | #include "include/policy.h" | 23 | #include "include/policy.h" |
24 | #include "include/audit.h" | 24 | #include "include/audit.h" |
25 | 25 | ||
diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c index 56d080a6d774..cd58eef4eb8d 100644 --- a/security/apparmor/domain.c +++ b/security/apparmor/domain.c | |||
@@ -22,7 +22,7 @@ | |||
22 | 22 | ||
23 | #include "include/audit.h" | 23 | #include "include/audit.h" |
24 | #include "include/apparmorfs.h" | 24 | #include "include/apparmorfs.h" |
25 | #include "include/context.h" | 25 | #include "include/cred.h" |
26 | #include "include/domain.h" | 26 | #include "include/domain.h" |
27 | #include "include/file.h" | 27 | #include "include/file.h" |
28 | #include "include/ipc.h" | 28 | #include "include/ipc.h" |
diff --git a/security/apparmor/file.c b/security/apparmor/file.c index e79bf44396a3..9a67a33904b3 100644 --- a/security/apparmor/file.c +++ b/security/apparmor/file.c | |||
@@ -18,7 +18,7 @@ | |||
18 | 18 | ||
19 | #include "include/apparmor.h" | 19 | #include "include/apparmor.h" |
20 | #include "include/audit.h" | 20 | #include "include/audit.h" |
21 | #include "include/context.h" | 21 | #include "include/cred.h" |
22 | #include "include/file.h" | 22 | #include "include/file.h" |
23 | #include "include/match.h" | 23 | #include "include/match.h" |
24 | #include "include/path.h" | 24 | #include "include/path.h" |
diff --git a/security/apparmor/include/context.h b/security/apparmor/include/cred.h index e287b7d0d4be..e287b7d0d4be 100644 --- a/security/apparmor/include/context.h +++ b/security/apparmor/include/cred.h | |||
diff --git a/security/apparmor/ipc.c b/security/apparmor/ipc.c index d7b137d4eb74..527ea1557120 100644 --- a/security/apparmor/ipc.c +++ b/security/apparmor/ipc.c | |||
@@ -17,7 +17,7 @@ | |||
17 | 17 | ||
18 | #include "include/audit.h" | 18 | #include "include/audit.h" |
19 | #include "include/capability.h" | 19 | #include "include/capability.h" |
20 | #include "include/context.h" | 20 | #include "include/cred.h" |
21 | #include "include/policy.h" | 21 | #include "include/policy.h" |
22 | #include "include/ipc.h" | 22 | #include "include/ipc.h" |
23 | #include "include/sig_names.h" | 23 | #include "include/sig_names.h" |
diff --git a/security/apparmor/label.c b/security/apparmor/label.c index 69c7451becef..523250e34837 100644 --- a/security/apparmor/label.c +++ b/security/apparmor/label.c | |||
@@ -16,7 +16,7 @@ | |||
16 | #include <linux/sort.h> | 16 | #include <linux/sort.h> |
17 | 17 | ||
18 | #include "include/apparmor.h" | 18 | #include "include/apparmor.h" |
19 | #include "include/context.h" | 19 | #include "include/cred.h" |
20 | #include "include/label.h" | 20 | #include "include/label.h" |
21 | #include "include/policy.h" | 21 | #include "include/policy.h" |
22 | #include "include/secid.h" | 22 | #include "include/secid.h" |
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index 7577cd982230..ef6334e11597 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include "include/apparmorfs.h" | 30 | #include "include/apparmorfs.h" |
31 | #include "include/audit.h" | 31 | #include "include/audit.h" |
32 | #include "include/capability.h" | 32 | #include "include/capability.h" |
33 | #include "include/context.h" | 33 | #include "include/cred.h" |
34 | #include "include/file.h" | 34 | #include "include/file.h" |
35 | #include "include/ipc.h" | 35 | #include "include/ipc.h" |
36 | #include "include/path.h" | 36 | #include "include/path.h" |
diff --git a/security/apparmor/mount.c b/security/apparmor/mount.c index 8c558cbce930..6e8c7ac0b33d 100644 --- a/security/apparmor/mount.c +++ b/security/apparmor/mount.c | |||
@@ -18,7 +18,7 @@ | |||
18 | 18 | ||
19 | #include "include/apparmor.h" | 19 | #include "include/apparmor.h" |
20 | #include "include/audit.h" | 20 | #include "include/audit.h" |
21 | #include "include/context.h" | 21 | #include "include/cred.h" |
22 | #include "include/domain.h" | 22 | #include "include/domain.h" |
23 | #include "include/file.h" | 23 | #include "include/file.h" |
24 | #include "include/match.h" | 24 | #include "include/match.h" |
diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c index a158af1f1b38..a8e096a88e62 100644 --- a/security/apparmor/policy.c +++ b/security/apparmor/policy.c | |||
@@ -82,7 +82,7 @@ | |||
82 | 82 | ||
83 | #include "include/apparmor.h" | 83 | #include "include/apparmor.h" |
84 | #include "include/capability.h" | 84 | #include "include/capability.h" |
85 | #include "include/context.h" | 85 | #include "include/cred.h" |
86 | #include "include/file.h" | 86 | #include "include/file.h" |
87 | #include "include/ipc.h" | 87 | #include "include/ipc.h" |
88 | #include "include/match.h" | 88 | #include "include/match.h" |
diff --git a/security/apparmor/policy_ns.c b/security/apparmor/policy_ns.c index b1e629cba70b..b0f9dc3f765a 100644 --- a/security/apparmor/policy_ns.c +++ b/security/apparmor/policy_ns.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <linux/string.h> | 21 | #include <linux/string.h> |
22 | 22 | ||
23 | #include "include/apparmor.h" | 23 | #include "include/apparmor.h" |
24 | #include "include/context.h" | 24 | #include "include/cred.h" |
25 | #include "include/policy_ns.h" | 25 | #include "include/policy_ns.h" |
26 | #include "include/label.h" | 26 | #include "include/label.h" |
27 | #include "include/policy.h" | 27 | #include "include/policy.h" |
diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c index ece0c246cfe6..40c8dc617b13 100644 --- a/security/apparmor/policy_unpack.c +++ b/security/apparmor/policy_unpack.c | |||
@@ -23,7 +23,7 @@ | |||
23 | 23 | ||
24 | #include "include/apparmor.h" | 24 | #include "include/apparmor.h" |
25 | #include "include/audit.h" | 25 | #include "include/audit.h" |
26 | #include "include/context.h" | 26 | #include "include/cred.h" |
27 | #include "include/crypto.h" | 27 | #include "include/crypto.h" |
28 | #include "include/match.h" | 28 | #include "include/match.h" |
29 | #include "include/path.h" | 29 | #include "include/path.h" |
diff --git a/security/apparmor/procattr.c b/security/apparmor/procattr.c index d81617379d63..80c34ed373c3 100644 --- a/security/apparmor/procattr.c +++ b/security/apparmor/procattr.c | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "include/apparmor.h" | 15 | #include "include/apparmor.h" |
16 | #include "include/context.h" | 16 | #include "include/cred.h" |
17 | #include "include/policy.h" | 17 | #include "include/policy.h" |
18 | #include "include/policy_ns.h" | 18 | #include "include/policy_ns.h" |
19 | #include "include/domain.h" | 19 | #include "include/domain.h" |
diff --git a/security/apparmor/resource.c b/security/apparmor/resource.c index cf4d234febe9..d022137143b9 100644 --- a/security/apparmor/resource.c +++ b/security/apparmor/resource.c | |||
@@ -16,7 +16,7 @@ | |||
16 | #include <linux/security.h> | 16 | #include <linux/security.h> |
17 | 17 | ||
18 | #include "include/audit.h" | 18 | #include "include/audit.h" |
19 | #include "include/context.h" | 19 | #include "include/cred.h" |
20 | #include "include/resource.h" | 20 | #include "include/resource.h" |
21 | #include "include/policy.h" | 21 | #include "include/policy.h" |
22 | 22 | ||
diff --git a/security/apparmor/task.c b/security/apparmor/task.c index 36eb8707ad89..44b9b938e06d 100644 --- a/security/apparmor/task.c +++ b/security/apparmor/task.c | |||
@@ -16,7 +16,7 @@ | |||
16 | * should return to the previous cred if it has not been modified. | 16 | * should return to the previous cred if it has not been modified. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include "include/context.h" | 19 | #include "include/cred.h" |
20 | #include "include/task.h" | 20 | #include "include/task.h" |
21 | 21 | ||
22 | /** | 22 | /** |