diff options
| author | James Bottomley <[email protected]> | 2006-09-24 02:03:52 +0000 |
|---|---|---|
| committer | James Bottomley <[email protected]> | 2006-09-24 02:03:52 +0000 |
| commit | 1aedf2ccc60fade26c46fae12e28664d0da3f199 (patch) | |
| tree | d91083e3079f1ddb942a382ac2b5a7525570ad59 /security/selinux/include/av_perm_to_string.h | |
| parent | [SCSI] SPI transport class: misc DV fixes (diff) | |
| parent | Merge git://git.infradead.org/mtd-2.6 (diff) | |
| download | kernel-1aedf2ccc60fade26c46fae12e28664d0da3f199.tar.gz kernel-1aedf2ccc60fade26c46fae12e28664d0da3f199.zip | |
Merge mulgrave-w:git/linux-2.6
Conflicts:
include/linux/blkdev.h
Trivial merge to incorporate tag prototypes.
Diffstat (limited to 'security/selinux/include/av_perm_to_string.h')
| -rw-r--r-- | security/selinux/include/av_perm_to_string.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/selinux/include/av_perm_to_string.h b/security/selinux/include/av_perm_to_string.h index 7c9b58380833..09fc8a2345eb 100644 --- a/security/selinux/include/av_perm_to_string.h +++ b/security/selinux/include/av_perm_to_string.h @@ -241,6 +241,7 @@ S_(SECCLASS_ASSOCIATION, ASSOCIATION__SENDTO, "sendto") S_(SECCLASS_ASSOCIATION, ASSOCIATION__RECVFROM, "recvfrom") S_(SECCLASS_ASSOCIATION, ASSOCIATION__SETCONTEXT, "setcontext") + S_(SECCLASS_ASSOCIATION, ASSOCIATION__POLMATCH, "polmatch") S_(SECCLASS_PACKET, PACKET__SEND, "send") S_(SECCLASS_PACKET, PACKET__RECV, "recv") S_(SECCLASS_PACKET, PACKET__RELABELTO, "relabelto") |