diff options
author | Paul Moore <paul.moore@hp.com> | 2007-02-28 15:14:23 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2007-04-26 01:35:50 -0400 |
commit | c60475bf35fc5fa10198df89187ab148527e72f7 (patch) | |
tree | 5f8081082c8be5865049c2c446583b67a9c786b3 /security | |
parent | 5778eabd9cdbf16ea3e40248c452b4fd25554d11 (diff) |
SELinux: rename selinux_netlabel.h to netlabel.h
In the beginning I named the file selinux_netlabel.h to avoid potential
namespace colisions. However, over time I have realized that there are several
other similar cases of multiple header files with the same name so I'm changing
the name to something which better fits with existing naming conventions.
Signed-off-by: Paul Moore <paul.moore@hp.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
-rw-r--r-- | security/selinux/hooks.c | 2 | ||||
-rw-r--r-- | security/selinux/include/netlabel.h (renamed from security/selinux/include/selinux_netlabel.h) | 0 | ||||
-rw-r--r-- | security/selinux/ss/services.c | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index d41e24d6ae..7f8d0b1ee0 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
@@ -77,7 +77,7 @@ | |||
77 | #include "objsec.h" | 77 | #include "objsec.h" |
78 | #include "netif.h" | 78 | #include "netif.h" |
79 | #include "xfrm.h" | 79 | #include "xfrm.h" |
80 | #include "selinux_netlabel.h" | 80 | #include "netlabel.h" |
81 | 81 | ||
82 | #define XATTR_SELINUX_SUFFIX "selinux" | 82 | #define XATTR_SELINUX_SUFFIX "selinux" |
83 | #define XATTR_NAME_SELINUX XATTR_SECURITY_PREFIX XATTR_SELINUX_SUFFIX | 83 | #define XATTR_NAME_SELINUX XATTR_SECURITY_PREFIX XATTR_SELINUX_SUFFIX |
diff --git a/security/selinux/include/selinux_netlabel.h b/security/selinux/include/netlabel.h index 218e3f77c3..218e3f77c3 100644 --- a/security/selinux/include/selinux_netlabel.h +++ b/security/selinux/include/netlabel.h | |||
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index c8913c5dbe..f4129f5893 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c | |||
@@ -53,7 +53,7 @@ | |||
53 | #include "conditional.h" | 53 | #include "conditional.h" |
54 | #include "mls.h" | 54 | #include "mls.h" |
55 | #include "objsec.h" | 55 | #include "objsec.h" |
56 | #include "selinux_netlabel.h" | 56 | #include "netlabel.h" |
57 | #include "xfrm.h" | 57 | #include "xfrm.h" |
58 | #include "ebitmap.h" | 58 | #include "ebitmap.h" |
59 | 59 | ||