aboutsummaryrefslogtreecommitdiffstats
path: root/security/apparmor
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2012-03-14 08:30:36 -0400
committerJohn Johansen <john.johansen@canonical.com>2012-03-14 22:09:13 -0400
commit2d4cee7e3a2b9f9c3237672cc136e20dbad0e2ce (patch)
tree5ec9bd7d6e135ace242941d51ab1f80478e1293f /security/apparmor
parentad5ff3db53c68c2f12936bc74ea5dfe0af943592 (diff)
AppArmor: add const qualifiers to string arrays
Signed-off-by: Jan Engelhardt <jengelh@medozas.de> Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor')
-rw-r--r--security/apparmor/audit.c6
-rw-r--r--security/apparmor/include/audit.h4
-rw-r--r--security/apparmor/include/policy.h2
-rw-r--r--security/apparmor/policy.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/security/apparmor/audit.c b/security/apparmor/audit.c
index 61344b56722..5ff67776a5a 100644
--- a/security/apparmor/audit.c
+++ b/security/apparmor/audit.c
@@ -19,7 +19,7 @@
19#include "include/audit.h" 19#include "include/audit.h"
20#include "include/policy.h" 20#include "include/policy.h"
21 21
22const char *op_table[] = { 22const char *const op_table[] = {
23 "null", 23 "null",
24 24
25 "sysctl", 25 "sysctl",
@@ -73,7 +73,7 @@ const char *op_table[] = {
73 "profile_remove" 73 "profile_remove"
74}; 74};
75 75
76const char *audit_mode_names[] = { 76const char *const audit_mode_names[] = {
77 "normal", 77 "normal",
78 "quiet_denied", 78 "quiet_denied",
79 "quiet", 79 "quiet",
@@ -81,7 +81,7 @@ const char *audit_mode_names[] = {
81 "all" 81 "all"
82}; 82};
83 83
84static char *aa_audit_type[] = { 84static const char *const aa_audit_type[] = {
85 "AUDIT", 85 "AUDIT",
86 "ALLOWED", 86 "ALLOWED",
87 "DENIED", 87 "DENIED",
diff --git a/security/apparmor/include/audit.h b/security/apparmor/include/audit.h
index 9317cd81416..4ba78c203af 100644
--- a/security/apparmor/include/audit.h
+++ b/security/apparmor/include/audit.h
@@ -25,7 +25,7 @@
25 25
26struct aa_profile; 26struct aa_profile;
27 27
28extern const char *audit_mode_names[]; 28extern const char *const audit_mode_names[];
29#define AUDIT_MAX_INDEX 5 29#define AUDIT_MAX_INDEX 5
30 30
31enum audit_mode { 31enum audit_mode {
@@ -47,7 +47,7 @@ enum audit_type {
47 AUDIT_APPARMOR_AUTO 47 AUDIT_APPARMOR_AUTO
48}; 48};
49 49
50extern const char *op_table[]; 50extern const char *const op_table[];
51enum aa_ops { 51enum aa_ops {
52 OP_NULL, 52 OP_NULL,
53 53
diff --git a/security/apparmor/include/policy.h b/security/apparmor/include/policy.h
index 9e18e9609e2..bda4569fdd8 100644
--- a/security/apparmor/include/policy.h
+++ b/security/apparmor/include/policy.h
@@ -29,7 +29,7 @@
29#include "file.h" 29#include "file.h"
30#include "resource.h" 30#include "resource.h"
31 31
32extern const char *profile_mode_names[]; 32extern const char *const profile_mode_names[];
33#define APPARMOR_NAMES_MAX_INDEX 3 33#define APPARMOR_NAMES_MAX_INDEX 3
34 34
35#define COMPLAIN_MODE(_profile) \ 35#define COMPLAIN_MODE(_profile) \
diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
index 73288d0b541..90641438302 100644
--- a/security/apparmor/policy.c
+++ b/security/apparmor/policy.c
@@ -93,7 +93,7 @@
93/* root profile namespace */ 93/* root profile namespace */
94struct aa_namespace *root_ns; 94struct aa_namespace *root_ns;
95 95
96const char *profile_mode_names[] = { 96const char *const profile_mode_names[] = {
97 "enforce", 97 "enforce",
98 "complain", 98 "complain",
99 "kill", 99 "kill",