Normalize TCP syncache-related MAC Framework entry points to match most

other entry points in the form mac_<object>_method().

Discussed with:	csjp
Obtained from:	TrustedBSD Project

3 files changed, 20 insertions, 20 deletions

diff --git a/sys/security/mac/mac_framework.h b/sys/security/mac/mac_framework.h
index 098d503..c3c0b1e 100644
--- a/sys/security/mac/mac_framework.h
+++ b/sys/security/mac/mac_framework.h
@@ -205,10 +205,10 @@ void	mac_netinet_tcp_reply(struct mbuf *m);
 void	mac_ipq_update(struct mbuf *m, struct ipq *ipq);
 void	mac_inpcb_sosetlabel(struct socket *so, struct inpcb *inp);
 void	mac_mbuf_create_from_firewall(struct mbuf *m);
-void	mac_destroy_syncache(struct label **l);
-int	mac_init_syncache(struct label **l);
-void	mac_init_syncache_from_inpcb(struct label *l, struct inpcb *inp);
-void	mac_create_mbuf_from_syncache(struct label *l, struct mbuf *m);
+void	mac_syncache_destroy(struct label **l);
+int	mac_syncache_init(struct label **l);
+void	mac_syncache_create(struct label *l, struct inpcb *inp);
+void	mac_syncache_create_mbuf(struct label *l, struct mbuf *m);
 
 /*
  * Labeling event operations: processes.
diff --git a/sys/security/mac/mac_inet.c b/sys/security/mac/mac_inet.c
index 001be116..c5f6403 100644
--- a/sys/security/mac/mac_inet.c
+++ b/sys/security/mac/mac_inet.c
@@ -295,16 +295,16 @@ mac_mbuf_create_from_firewall(struct mbuf *m)
  * the syncache code might create.
  */
 void
-mac_destroy_syncache(struct label **label)
+mac_syncache_destroy(struct label **label)
 {
 
-	MAC_PERFORM(destroy_syncache_label, *label);
+	MAC_PERFORM(syncache_destroy_label, *label);
 	mac_labelzone_free(*label);
 	*label = NULL;
 }
 
 int
-mac_init_syncache(struct label **label)
+mac_syncache_init(struct label **label)
 {
 	int error;
 
@@ -317,24 +317,24 @@ mac_init_syncache(struct label **label)
 	 * MAC_CHECK instead of the typical MAC_PERFORM so we can propagate
 	 * allocation failures back to the syncache code.
 	 */
-	MAC_CHECK(init_syncache_label, *label, M_NOWAIT);
+	MAC_CHECK(syncache_init_label, *label, M_NOWAIT);
 	return (error);
 }
 
 void
-mac_init_syncache_from_inpcb(struct label *label, struct inpcb *inp)
+mac_syncache_create(struct label *label, struct inpcb *inp)
 {
 
 	INP_LOCK_ASSERT(inp);
-	MAC_PERFORM(init_syncache_from_inpcb, label, inp);
+	MAC_PERFORM(syncache_create, label, inp);
 }
 
 void
-mac_create_mbuf_from_syncache(struct label *sc_label, struct mbuf *m)
+mac_syncache_create_mbuf(struct label *sc_label, struct mbuf *m)
 {
 	struct label *mlabel;
 
 	M_ASSERTPKTHDR(m);
 	mlabel = mac_mbuf_to_label(m);
-	MAC_PERFORM(create_mbuf_from_syncache, sc_label, m, mlabel);
+	MAC_PERFORM(syncache_create_mbuf, sc_label, m, mlabel);
 }
diff --git a/sys/security/mac/mac_policy.h b/sys/security/mac/mac_policy.h
index a4eff3d..0cf8c87 100644
--- a/sys/security/mac/mac_policy.h
+++ b/sys/security/mac/mac_policy.h
@@ -328,11 +328,11 @@ typedef void	(*mpo_inpcb_sosetlabel_t)(struct socket *so,
 
 typedef	void	(*mpo_mbuf_create_from_firewall_t)(struct mbuf *m,
 		    struct label *label);
-typedef void	(*mpo_destroy_syncache_label_t)(struct label *label);
-typedef int	(*mpo_init_syncache_label_t)(struct label *label, int flag);
-typedef void	(*mpo_init_syncache_from_inpcb_t)(struct label *label,
+typedef void	(*mpo_syncache_destroy_label_t)(struct label *label);
+typedef int	(*mpo_syncache_init_label_t)(struct label *label, int flag);
+typedef void	(*mpo_syncache_create_t)(struct label *label,
 		    struct inpcb *inp);
-typedef void	(*mpo_create_mbuf_from_syncache_t)(struct label *sc_label,
+typedef void	(*mpo_syncache_create_mbuf_t)(struct label *sc_label,
 		    struct mbuf *m, struct label *mlabel);
 /*
  * Labeling event operations: processes.
@@ -900,10 +900,10 @@ struct mac_policy_ops {
 	mpo_vnode_check_unlink_t		mpo_vnode_check_unlink;
 	mpo_vnode_check_write_t			mpo_vnode_check_write;
 	mpo_mbuf_create_from_firewall_t		mpo_mbuf_create_from_firewall;
-	mpo_init_syncache_label_t		mpo_init_syncache_label;
-	mpo_destroy_syncache_label_t		mpo_destroy_syncache_label;
-	mpo_init_syncache_from_inpcb_t		mpo_init_syncache_from_inpcb;
-	mpo_create_mbuf_from_syncache_t		mpo_create_mbuf_from_syncache;
+	mpo_syncache_init_label_t		mpo_syncache_init_label;
+	mpo_syncache_destroy_label_t		mpo_syncache_destroy_label;
+	mpo_syncache_create_t			mpo_syncache_create;
+	mpo_syncache_create_mbuf_t		mpo_syncache_create_mbuf;
 	mpo_priv_check_t			mpo_priv_check;
 	mpo_priv_grant_t			mpo_priv_grant;
 };