summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2012-03-14 13:30:36 +0100
committerJohn Johansen <john.johansen@canonical.com>2012-03-14 19:09:13 -0700
commit2d4cee7e3a2b9f9c3237672cc136e20dbad0e2ce (patch)
tree5ec9bd7d6e135ace242941d51ab1f80478e1293f /security
parentad5ff3db53c68c2f12936bc74ea5dfe0af943592 (diff)
downloadlinux-2d4cee7e3a2b9f9c3237672cc136e20dbad0e2ce.tar.bz2
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')
-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 61344b56722e..5ff67776a5ad 100644
--- a/security/apparmor/audit.c
+++ b/security/apparmor/audit.c
@@ -19,7 +19,7 @@
#include "include/audit.h"
#include "include/policy.h"
-const char *op_table[] = {
+const char *const op_table[] = {
"null",
"sysctl",
@@ -73,7 +73,7 @@ const char *op_table[] = {
"profile_remove"
};
-const char *audit_mode_names[] = {
+const char *const audit_mode_names[] = {
"normal",
"quiet_denied",
"quiet",
@@ -81,7 +81,7 @@ const char *audit_mode_names[] = {
"all"
};
-static char *aa_audit_type[] = {
+static const char *const aa_audit_type[] = {
"AUDIT",
"ALLOWED",
"DENIED",
diff --git a/security/apparmor/include/audit.h b/security/apparmor/include/audit.h
index 9317cd81416c..4ba78c203af1 100644
--- a/security/apparmor/include/audit.h
+++ b/security/apparmor/include/audit.h
@@ -25,7 +25,7 @@
struct aa_profile;
-extern const char *audit_mode_names[];
+extern const char *const audit_mode_names[];
#define AUDIT_MAX_INDEX 5
enum audit_mode {
@@ -47,7 +47,7 @@ enum audit_type {
AUDIT_APPARMOR_AUTO
};
-extern const char *op_table[];
+extern const char *const op_table[];
enum aa_ops {
OP_NULL,
diff --git a/security/apparmor/include/policy.h b/security/apparmor/include/policy.h
index 9e18e9609e24..bda4569fdd83 100644
--- a/security/apparmor/include/policy.h
+++ b/security/apparmor/include/policy.h
@@ -29,7 +29,7 @@
#include "file.h"
#include "resource.h"
-extern const char *profile_mode_names[];
+extern const char *const profile_mode_names[];
#define APPARMOR_NAMES_MAX_INDEX 3
#define COMPLAIN_MODE(_profile) \
diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
index 73288d0b541f..906414383022 100644
--- a/security/apparmor/policy.c
+++ b/security/apparmor/policy.c
@@ -93,7 +93,7 @@
/* root profile namespace */
struct aa_namespace *root_ns;
-const char *profile_mode_names[] = {
+const char *const profile_mode_names[] = {
"enforce",
"complain",
"kill",