diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 00:24:28 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 00:24:28 +0100 |
| commit | d8d8f6a4fd635dcc9e4f946394c1fbde85eeab66 (patch) | |
| tree | 0a1bc8ff40c12bb30066467e11ae9153f89514e7 /security/selinux/include/av_permissions.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild (diff) | |
| parent | [NET]: Endian-annotate in_aton() (diff) | |
| download | linux-d8d8f6a4fd635dcc9e4f946394c1fbde85eeab66.tar.xz linux-d8d8f6a4fd635dcc9e4f946394c1fbde85eeab66.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'security/selinux/include/av_permissions.h')
| -rw-r--r-- | security/selinux/include/av_permissions.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/security/selinux/include/av_permissions.h b/security/selinux/include/av_permissions.h index d1d0996049e3..d7f02edf3930 100644 --- a/security/selinux/include/av_permissions.h +++ b/security/selinux/include/av_permissions.h @@ -908,8 +908,7 @@ #define ASSOCIATION__SENDTO 0x00000001UL #define ASSOCIATION__RECVFROM 0x00000002UL -#define ASSOCIATION__RELABELFROM 0x00000004UL -#define ASSOCIATION__RELABELTO 0x00000008UL +#define ASSOCIATION__SETCONTEXT 0x00000004UL #define NETLINK_KOBJECT_UEVENT_SOCKET__IOCTL 0x00000001UL #define NETLINK_KOBJECT_UEVENT_SOCKET__READ 0x00000002UL |