vserver 2.0 rc7

[linux-2.6.git] / security / selinux / nlmsgtab.c

diff --git a/security/selinux/nlmsgtab.c b/security/selinux/nlmsgtab.c
index fa7fa03..b3adb48 100644 (file)
--- a/security/selinux/nlmsgtab.c
+++ b/security/selinux/nlmsgtab.c
@@ -91,13 +91,12 @@ static struct nlmsg_perm nlmsg_xfrm_perms[] =
 
 static struct nlmsg_perm nlmsg_audit_perms[] =
 {
-       { AUDIT_GET,            NETLINK_AUDIT_SOCKET__NLMSG_READ  },
-       { AUDIT_SET,            NETLINK_AUDIT_SOCKET__NLMSG_WRITE },
-       { AUDIT_LIST,           NETLINK_AUDIT_SOCKET__NLMSG_READ  },
-       { AUDIT_ADD,            NETLINK_AUDIT_SOCKET__NLMSG_WRITE },
-       { AUDIT_DEL,            NETLINK_AUDIT_SOCKET__NLMSG_WRITE },
-       { AUDIT_USER,           NETLINK_AUDIT_SOCKET__NLMSG_WRITE },
-       { AUDIT_LOGIN,          NETLINK_AUDIT_SOCKET__NLMSG_WRITE },
+       { AUDIT_GET,            NETLINK_AUDIT_SOCKET__NLMSG_READ     },
+       { AUDIT_SET,            NETLINK_AUDIT_SOCKET__NLMSG_WRITE    },
+       { AUDIT_LIST,           NETLINK_AUDIT_SOCKET__NLMSG_READPRIV },
+       { AUDIT_ADD,            NETLINK_AUDIT_SOCKET__NLMSG_WRITE    },
+       { AUDIT_DEL,            NETLINK_AUDIT_SOCKET__NLMSG_WRITE    },
+       { AUDIT_USER,           NETLINK_AUDIT_SOCKET__NLMSG_RELAY    },
 };
 
 
@@ -126,7 +125,7 @@ int selinux_nlmsg_lookup(u16 sclass, u16 nlmsg_type, u32 *perm)
                break;
 
        case SECCLASS_NETLINK_FIREWALL_SOCKET:
-       case NETLINK_IP6_FW:
+       case SECCLASS_NETLINK_IP6FW_SOCKET:
                err = nlmsg_perm(nlmsg_type, perm, nlmsg_firewall_perms,
                                 sizeof(nlmsg_firewall_perms));
                break;