From: Paul Moore Date: Wed, 28 Feb 2007 20:14:23 +0000 (-0500) Subject: SELinux: rename selinux_netlabel.h to netlabel.h X-Git-Tag: v2.6.22-rc1~1120^2~8 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c60475bf35fc5fa10198df89187ab148527e72f7;p=linux-2.6 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 Signed-off-by: James Morris --- 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 @@ #include "objsec.h" #include "netif.h" #include "xfrm.h" -#include "selinux_netlabel.h" +#include "netlabel.h" #define XATTR_SELINUX_SUFFIX "selinux" #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 similarity index 100% rename from security/selinux/include/selinux_netlabel.h rename to 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 @@ #include "conditional.h" #include "mls.h" #include "objsec.h" -#include "selinux_netlabel.h" +#include "netlabel.h" #include "xfrm.h" #include "ebitmap.h"