From f07c38e84aa87001718dc3e4625bc30c9af3be89 Mon Sep 17 00:00:00 2001 From: rwatson Date: Fri, 13 Jun 2008 22:14:15 +0000 Subject: The TrustedBSD MAC Framework named struct ipq instances 'ipq', which is the same as the global variable defined in ip_input.c. Instead, adopt the name 'q' as found in about 1/2 of uses in ip_input.c, preventing a collision on the name. This is non-harmful, but means that search and replace on the global works less well (as in the virtualization work), as well as indexing tools. MFC after: 1 week Reported by: julian --- sys/security/mac_biba/mac_biba.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'sys/security/mac_biba') diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c index 052e8f3..08b735f 100644 --- a/sys/security/mac_biba/mac_biba.c +++ b/sys/security/mac_biba/mac_biba.c @@ -1155,36 +1155,36 @@ biba_inpcb_sosetlabel(struct socket *so, struct label *solabel, } static void -biba_ipq_create(struct mbuf *m, struct label *mlabel, struct ipq *ipq, - struct label *ipqlabel) +biba_ipq_create(struct mbuf *m, struct label *mlabel, struct ipq *q, + struct label *qlabel) { struct mac_biba *source, *dest; source = SLOT(mlabel); - dest = SLOT(ipqlabel); + dest = SLOT(qlabel); biba_copy_effective(source, dest); } static int -biba_ipq_match(struct mbuf *m, struct label *mlabel, struct ipq *ipq, - struct label *ipqlabel) +biba_ipq_match(struct mbuf *m, struct label *mlabel, struct ipq *q, + struct label *qlabel) { struct mac_biba *a, *b; - a = SLOT(ipqlabel); + a = SLOT(qlabel); b = SLOT(mlabel); return (biba_equal_effective(a, b)); } static void -biba_ipq_reassemble(struct ipq *ipq, struct label *ipqlabel, struct mbuf *m, +biba_ipq_reassemble(struct ipq *q, struct label *qlabel, struct mbuf *m, struct label *mlabel) { struct mac_biba *source, *dest; - source = SLOT(ipqlabel); + source = SLOT(qlabel); dest = SLOT(mlabel); /* Just use the head, since we require them all to match. */ @@ -1192,8 +1192,8 @@ biba_ipq_reassemble(struct ipq *ipq, struct label *ipqlabel, struct mbuf *m, } static void -biba_ipq_update(struct mbuf *m, struct label *mlabel, struct ipq *ipq, - struct label *ipqlabel) +biba_ipq_update(struct mbuf *m, struct label *mlabel, struct ipq *q, + struct label *qlabel) { /* NOOP: we only accept matching labels, so no need to update */ -- cgit v1.1