1 files changed, 17 insertions, 17 deletions
diff --git a/security/selinux/include/class_to_string.h b/security/selinux/include/class_to_string.h
index 9f3ebb1bfae6..378799068441 100644
--- a/security/selinux/include/class_to_string.h
+++ b/security/selinux/include/class_to_string.h
@@ -2,7 +2,7 @@
 /*
 * Security object class definitions
 */
-    S_("null")
+    S_(NULL)
    S_("security")
    S_("process")
    S_("system")
@@ -32,19 +32,19 @@
    S_("msgq")
    S_("shm")
    S_("ipc")
-    S_("passwd")
+    S_(NULL)
-    S_("drawable")
+    S_(NULL)
-    S_("window")
+    S_(NULL)
-    S_("gc")
+    S_(NULL)
-    S_("font")
+    S_(NULL)
-    S_("colormap")
+    S_(NULL)
-    S_("property")
+    S_(NULL)
-    S_("cursor")
+    S_(NULL)
-    S_("xclient")
+    S_(NULL)
-    S_("xinput")
+    S_(NULL)
-    S_("xserver")
+    S_(NULL)
-    S_("xextension")
+    S_(NULL)
-    S_("pax")
+    S_(NULL)
    S_("netlink_route_socket")
    S_("netlink_firewall_socket")
    S_("netlink_tcpdiag_socket")
@@ -54,12 +54,12 @@
    S_("netlink_audit_socket")
    S_("netlink_ip6fw_socket")
    S_("netlink_dnrt_socket")
-    S_("dbus")
+    S_(NULL)
-    S_("nscd")
+    S_(NULL)
    S_("association")
    S_("netlink_kobject_uevent_socket")
    S_("appletalk_socket")
    S_("packet")
    S_("key")
-    S_("context")
+    S_(NULL)
    S_("dccp_socket")

diff --git a/security/selinux/include/class_to_string.h b/security/selinux/include/class_to_string.h index 9f3ebb1bfae6..378799068441 100644 --- a/security/selinux/include/class_to_string.h +++ b/security/selinux/include/class_to_string.h
@@ -2,7 +2,7 @@
2	/*	2	/*
3	* Security object class definitions	3	* Security object class definitions
4	*/	4	*/
5	S_("null")	5	S_(NULL)
6	S_("security")	6	S_("security")
7	S_("process")	7	S_("process")
8	S_("system")	8	S_("system")
@@ -32,19 +32,19 @@
32	S_("msgq")	32	S_("msgq")
33	S_("shm")	33	S_("shm")
34	S_("ipc")	34	S_("ipc")
35	S_("passwd")	35	S_(NULL)
36	S_("drawable")	36	S_(NULL)
37	S_("window")	37	S_(NULL)
38	S_("gc")	38	S_(NULL)
39	S_("font")	39	S_(NULL)
40	S_("colormap")	40	S_(NULL)
41	S_("property")	41	S_(NULL)
42	S_("cursor")	42	S_(NULL)
43	S_("xclient")	43	S_(NULL)
44	S_("xinput")	44	S_(NULL)
45	S_("xserver")	45	S_(NULL)
46	S_("xextension")	46	S_(NULL)
47	S_("pax")	47	S_(NULL)
48	S_("netlink_route_socket")	48	S_("netlink_route_socket")
49	S_("netlink_firewall_socket")	49	S_("netlink_firewall_socket")
50	S_("netlink_tcpdiag_socket")	50	S_("netlink_tcpdiag_socket")
@@ -54,12 +54,12 @@
54	S_("netlink_audit_socket")	54	S_("netlink_audit_socket")
55	S_("netlink_ip6fw_socket")	55	S_("netlink_ip6fw_socket")
56	S_("netlink_dnrt_socket")	56	S_("netlink_dnrt_socket")
57	S_("dbus")	57	S_(NULL)
58	S_("nscd")	58	S_(NULL)
59	S_("association")	59	S_("association")
60	S_("netlink_kobject_uevent_socket")	60	S_("netlink_kobject_uevent_socket")
61	S_("appletalk_socket")	61	S_("appletalk_socket")
62	S_("packet")	62	S_("packet")
63	S_("key")	63	S_("key")
64	S_("context")	64	S_(NULL)
65	S_("dccp_socket")	65	S_("dccp_socket")