Rename mac_check_socket_receive() to mac_check_socket_deliver() so that

we can use the names _receive() and _send() for the receive() and send()
checks.  Rename related constants, policy implementations, etc.

Obtained from:	TrustedBSD Project
Sponsored by:	DARPA, NAI Labs

1 files changed, 6 insertions, 6 deletions

diff --git a/sys/security/mac_stub/mac_stub.c b/sys/security/mac_stub/mac_stub.c
index 8174c2a..b1f154e 100644
--- a/sys/security/mac_stub/mac_stub.c
+++ b/sys/security/mac_stub/mac_stub.c
@@ -654,16 +654,16 @@ mac_none_check_socket_connect(struct ucred *cred, struct socket *socket,
 }
 
 static int
-mac_none_check_socket_listen(struct ucred *cred, struct vnode *vp,
-    struct label *socketlabel)
+mac_none_check_socket_deliver(struct socket *so, struct label *socketlabel,
+    struct mbuf *m, struct label *mbuflabel)
 {
 
 	return (0);
 }
 
 static int
-mac_none_check_socket_receive(struct socket *so, struct label *socketlabel,
-    struct mbuf *m, struct label *mbuflabel)
+mac_none_check_socket_listen(struct ucred *cred, struct vnode *vp,
+    struct label *socketlabel)
 {
 
 	return (0);
@@ -1042,10 +1042,10 @@ static struct mac_policy_op_entry mac_none_ops[] =
 	    (macop_t)mac_none_check_socket_bind },
 	{ MAC_CHECK_SOCKET_CONNECT,
 	    (macop_t)mac_none_check_socket_connect },
+	{ MAC_CHECK_SOCKET_DELIVER,
+	    (macop_t)mac_none_check_socket_deliver },
 	{ MAC_CHECK_SOCKET_LISTEN,
 	    (macop_t)mac_none_check_socket_listen },
-	{ MAC_CHECK_SOCKET_RECEIVE,
-	    (macop_t)mac_none_check_socket_receive },
 	{ MAC_CHECK_SOCKET_RELABEL,
 	    (macop_t)mac_none_check_socket_relabel },
 	{ MAC_CHECK_SOCKET_VISIBLE,