From owner-p4-projects@FreeBSD.ORG Thu Jun 12 19:57:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62774106567C; Thu, 12 Jun 2008 19:57:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 244DA1065672 for ; Thu, 12 Jun 2008 19:57:00 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 123888FC1B for ; Thu, 12 Jun 2008 19:57:00 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5CJuxp8099316 for ; Thu, 12 Jun 2008 19:56:59 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5CJuxJq099314 for perforce@freebsd.org; Thu, 12 Jun 2008 19:56:59 GMT (envelope-from julian@freebsd.org) Date: Thu, 12 Jun 2008 19:56:59 GMT Message-Id: <200806121956.m5CJuxJq099314@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143391 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jun 2008 19:57:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=143391 Change 143391 by julian@julian_trafmon1 on 2008/06/12 19:56:24 remove script overenthusiasm Affected files ... .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_inet.c#3 edit .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_policy.h#3 edit .. //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#3 edit .. //depot/projects/vimage-commit2/src/sys/security/mac_lomac/mac_lomac.c#3 edit .. //depot/projects/vimage-commit2/src/sys/security/mac_mls/mac_mls.c#3 edit .. //depot/projects/vimage-commit2/src/sys/security/mac_stub/mac_stub.c#3 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/security/mac/mac_inet.c#3 (text+ko) ==== @@ -57,7 +57,6 @@ #include #include #include -#include #include #include @@ -118,11 +117,11 @@ } int -mac_ipq_init(struct ipq *V_ipq, int flag) +mac_ipq_init(struct ipq *ipq, int flag) { - V_ipq->ipq_label = mac_ipq_label_alloc(flag); - if (V_ipq->ipq_label == NULL) + ipq->ipq_label = mac_ipq_label_alloc(flag); + if (ipq->ipq_label == NULL) return (ENOMEM); return (0); } @@ -152,11 +151,11 @@ } void -mac_ipq_destroy(struct ipq *V_ipq) +mac_ipq_destroy(struct ipq *ipq) { - mac_ipq_label_free(V_ipq->ipq_label); - V_ipq->ipq_label = NULL; + mac_ipq_label_free(ipq->ipq_label); + ipq->ipq_label = NULL; } void @@ -167,13 +166,13 @@ } void -mac_ipq_reassemble(struct ipq *V_ipq, struct mbuf *m) +mac_ipq_reassemble(struct ipq *ipq, struct mbuf *m) { struct label *label; label = mac_mbuf_to_label(m); - MAC_PERFORM(ipq_reassemble, V_ipq, V_ipq->ipq_label, m, label); + MAC_PERFORM(ipq_reassemble, ipq, ipq->ipq_label, m, label); } void @@ -188,13 +187,13 @@ } void -mac_ipq_create(struct mbuf *m, struct ipq *V_ipq) +mac_ipq_create(struct mbuf *m, struct ipq *ipq) { struct label *label; label = mac_mbuf_to_label(m); - MAC_PERFORM(ipq_create, m, label, V_ipq, V_ipq->ipq_label); + MAC_PERFORM(ipq_create, m, label, ipq, ipq->ipq_label); } void @@ -209,7 +208,7 @@ } int -mac_ipq_match(struct mbuf *m, struct ipq *V_ipq) +mac_ipq_match(struct mbuf *m, struct ipq *ipq) { struct label *label; int result; @@ -217,7 +216,7 @@ label = mac_mbuf_to_label(m); result = 1; - MAC_BOOLEAN(ipq_match, &&, m, label, V_ipq, V_ipq->ipq_label); + MAC_BOOLEAN(ipq_match, &&, m, label, ipq, ipq->ipq_label); return (result); } @@ -279,13 +278,13 @@ } void -mac_ipq_update(struct mbuf *m, struct ipq *V_ipq) +mac_ipq_update(struct mbuf *m, struct ipq *ipq) { struct label *label; label = mac_mbuf_to_label(m); - MAC_PERFORM(ipq_update, m, label, V_ipq, V_ipq->ipq_label); + MAC_PERFORM(ipq_update, m, label, ipq, ipq->ipq_label); } int ==== //depot/projects/vimage-commit2/src/sys/security/mac/mac_policy.h#3 (text+ko) ==== @@ -199,16 +199,16 @@ struct label *inplabel); typedef void (*mpo_ipq_create_t)(struct mbuf *m, struct label *mlabel, - struct ipq *V_ipq, struct label *ipqlabel); + struct ipq *ipq, struct label *ipqlabel); typedef void (*mpo_ipq_destroy_label_t)(struct label *label); typedef int (*mpo_ipq_init_label_t)(struct label *label, int flag); typedef int (*mpo_ipq_match_t)(struct mbuf *m, struct label *mlabel, - struct ipq *V_ipq, struct label *ipqlabel); -typedef void (*mpo_ipq_reassemble)(struct ipq *V_ipq, + struct ipq *ipq, struct label *ipqlabel); +typedef void (*mpo_ipq_reassemble)(struct ipq *ipq, struct label *ipqlabel, struct mbuf *m, struct label *mlabel); typedef void (*mpo_ipq_update_t)(struct mbuf *m, struct label *mlabel, - struct ipq *V_ipq, struct label *ipqlabel); + struct ipq *ipq, struct label *ipqlabel); typedef int (*mpo_kenv_check_dump_t)(struct ucred *cred); typedef int (*mpo_kenv_check_get_t)(struct ucred *cred, char *name); ==== //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#3 (text+ko) ==== @@ -69,7 +69,6 @@ #include #include #include -#include #include @@ -1193,7 +1192,7 @@ } static void -biba_ipq_update(struct mbuf *m, struct label *mlabel, struct ipq *V_ipq, +biba_ipq_update(struct mbuf *m, struct label *mlabel, struct ipq *ipq, struct label *ipqlabel) { ==== //depot/projects/vimage-commit2/src/sys/security/mac_lomac/mac_lomac.c#3 (text+ko) ==== @@ -68,7 +68,6 @@ #include #include #include -#include #include @@ -1321,7 +1320,7 @@ } static void -lomac_ipq_update(struct mbuf *m, struct label *mlabel, struct ipq *V_ipq, +lomac_ipq_update(struct mbuf *m, struct label *mlabel, struct ipq *ipq, struct label *ipqlabel) { ==== //depot/projects/vimage-commit2/src/sys/security/mac_mls/mac_mls.c#3 (text+ko) ==== @@ -70,7 +70,6 @@ #include #include #include -#include #include @@ -1076,7 +1075,7 @@ } static void -mls_ipq_create(struct mbuf *m, struct label *mlabel, struct ipq *V_ipq, +mls_ipq_create(struct mbuf *m, struct label *mlabel, struct ipq *ipq, struct label *ipqlabel) { struct mac_mls *source, *dest; @@ -1088,7 +1087,7 @@ } static int -mls_ipq_match(struct mbuf *m, struct label *mlabel, struct ipq *V_ipq, +mls_ipq_match(struct mbuf *m, struct label *mlabel, struct ipq *ipq, struct label *ipqlabel) { struct mac_mls *a, *b; @@ -1100,7 +1099,7 @@ } static void -mls_ipq_reassemble(struct ipq *V_ipq, struct label *ipqlabel, struct mbuf *m, +mls_ipq_reassemble(struct ipq *ipq, struct label *ipqlabel, struct mbuf *m, struct label *mlabel) { struct mac_mls *source, *dest; @@ -1113,7 +1112,7 @@ } static void -mls_ipq_update(struct mbuf *m, struct label *mlabel, struct ipq *V_ipq, +mls_ipq_update(struct mbuf *m, struct label *mlabel, struct ipq *ipq, struct label *ipqlabel) { ==== //depot/projects/vimage-commit2/src/sys/security/mac_stub/mac_stub.c#3 (text+ko) ==== @@ -67,7 +67,6 @@ #include #include #include -#include #include @@ -308,14 +307,14 @@ } static void -stub_ipq_create(struct mbuf *m, struct label *mlabel, struct ipq *V_ipq, +stub_ipq_create(struct mbuf *m, struct label *mlabel, struct ipq *ipq, struct label *ipqlabel) { } static int -stub_ipq_match(struct mbuf *m, struct label *mlabel, struct ipq *V_ipq, +stub_ipq_match(struct mbuf *m, struct label *mlabel, struct ipq *ipq, struct label *ipqlabel) { @@ -323,14 +322,14 @@ } static void -stub_ipq_reassemble(struct ipq *V_ipq, struct label *ipqlabel, +stub_ipq_reassemble(struct ipq *ipq, struct label *ipqlabel, struct mbuf *m, struct label *mlabel) { } static void -stub_ipq_update(struct mbuf *m, struct label *mlabel, struct ipq *V_ipq, +stub_ipq_update(struct mbuf *m, struct label *mlabel, struct ipq *ipq, struct label *ipqlabel) {