From owner-p4-projects Mon Mar 25 11: 8: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C155E37B417; Mon, 25 Mar 2002 11:07:15 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8495237B416 for ; Mon, 25 Mar 2002 11:07:14 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2PJ7EQ79331 for perforce@freebsd.org; Mon, 25 Mar 2002 11:07:14 -0800 (PST) (envelope-from green@freebsd.org) Date: Mon, 25 Mar 2002 11:07:14 -0800 (PST) Message-Id: <200203251907.g2PJ7EQ79331@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 8388 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8388 Change 8388 by green@green_laptop_2 on 2002/03/25 11:07:01 Fix whitespace. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#121 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#24 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#24 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.h#4 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#20 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#19 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#5 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#19 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#90 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac_constant.h#7 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#55 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#121 (text+ko) ==== @@ -636,7 +636,7 @@ MAC_PERFORM(create_proc0, cred); } -/* +/* * Initialize MAC label for the first userland process, from which other * userland processes and threads are spawned. */ @@ -927,7 +927,7 @@ mac_create_mbuf_datagram_from_mbuf_fragmentqueue(struct mbuf *fragmentqueue, struct mbuf *datagram) { - + MAC_PERFORM(create_mbuf_datagram_from_mbuf_fragmentqueue, fragmentqueue, datagram); } @@ -1147,7 +1147,7 @@ void mac_create_devfs_device(dev_t dev, struct mac *devicelabel) { - + mac_init_label(devicelabel); MAC_PERFORM(create_devfs_device, dev, devicelabel); } @@ -1182,7 +1182,7 @@ } mac_init_label(childlabel); MAC_PERFORM(create_vnode_from_vnode, cred, parent, &parentlabel, child, - childlabel); + childlabel); } int ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#24 (text+ko) ==== @@ -1062,6 +1062,6 @@ mac_biba_ifnet_check_send_mbuf, mac_biba_socket_check_receive_mbuf }; - + MAC_POLICY_SET(mac_biba_ops, trustedbsd_mac_biba, "TrustedBSD MAC/Biba", 1); #endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#24 (text+ko) ==== @@ -237,7 +237,7 @@ if (rule->mbr_object.mbi_flags & MBI_UID_DEFINED) { match = (rule->mbr_object.mbi_uid == object_uid); - if (rule->mbr_object.mbi_flags & MBI_NEGATED) + if (rule->mbr_object.mbi_flags & MBI_NEGATED) match = !match; if (!match) @@ -655,7 +655,7 @@ NULL, /* ifnet check send mbuf */ NULL, /* socket check receive mbuf */ }; - + MAC_POLICY_SET(mac_bsdextended_ops, trustedbsd_mac_bsdextended, "TrustedBSD MAC/BSD Extended", 0); #endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#20 (text+ko) ==== @@ -631,7 +631,7 @@ { printf("MLS label: "); - + if (label->m_mls.mm_flags & MAC_MLS_FLAG_SINGLE) printf("single: %u,%u ", label->m_mls.mm_single.mme_type, label->m_mls.mm_single.mme_level); @@ -641,7 +641,7 @@ label->m_mls.mm_rangelow.mme_level, label->m_mls.mm_rangehigh.mme_type, label->m_mls.mm_rangehigh.mme_level); - printf("\n"); + printf("\n"); } static int @@ -1031,6 +1031,6 @@ mac_mls_ifnet_check_send_mbuf, mac_mls_socket_check_receive_mbuf }; - + MAC_POLICY_SET(mac_mls_ops, trustedbsd_mac_mls, "TrustedBSD MAC/MLS", 1); #endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#19 (text+ko) ==== @@ -230,7 +230,7 @@ mac_none_create_mbuf_datagram_from_mbuf_fragmentqueue( struct mbuf *fragmentqueue, struct mbuf *datagram) { - + /* Initialize datagram here. */ } @@ -287,7 +287,7 @@ /* Initialize newmbuf here. */ } -static int +static int mac_none_mbuf_fragment_matches_mbuf_fragmentqueue(struct mbuf *fragment, struct mbuf *fragmentqueue) { @@ -297,7 +297,7 @@ } static void -mac_none_create_mbuf_from_socket(struct socket *so, struct mbuf *m) +mac_none_create_mbuf_from_socket(struct socket *so, struct mbuf *m) { /* Initialize mbuf here. */ @@ -344,7 +344,7 @@ static void mac_none_mountrootfs(struct ucred *cred, struct mount *mp) -{ +{ /* Initialize mp here. */ } @@ -652,7 +652,7 @@ mac_none_ifnet_check_send_mbuf, mac_none_socket_check_receive_mbuf }; - + MAC_POLICY_SET(mac_none_ops, trustedbsd_mac_none, "TrustedBSD MAC/None", 0); #endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#5 (text+ko) ==== @@ -223,6 +223,6 @@ NULL, NULL, }; - + MAC_POLICY_SET(mac_seeotheruids_ops, trustedbsd_mac_seeotheruids, "TrustedBSD MAC/seeotheruids", 0); ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#19 (text+ko) ==== @@ -305,7 +305,7 @@ subject->m_te.mt_type, mac_te_classop_to_string(object_class, operation), object->m_te.mt_type); - + return (0); } } @@ -570,7 +570,7 @@ mac_te_copy_label(&oldmbuf->m_pkthdr.label, &newmbuf->m_pkthdr.label); } -static int +static int mac_te_mbuf_fragment_matches_mbuf_fragmentqueue(struct mbuf *fragment, struct mbuf *fragmentqueue) { @@ -580,7 +580,7 @@ } static void -mac_te_create_mbuf_from_socket(struct socket *so, struct mbuf *m) +mac_te_create_mbuf_from_socket(struct socket *so, struct mbuf *m) { mac_te_copy_label(&so->so_label, &m->m_pkthdr.label); @@ -635,7 +635,7 @@ static void mac_te_mountrootfs(struct ucred *cred, struct mount *mp) -{ +{ mac_te_init_label_as(&mp->mnt_label, MAC_TE_TYPE_ROOTFS); } @@ -678,7 +678,7 @@ struct mac *dirlabel) { - mac_te_init_label_as(dirlabel, MAC_TE_TYPE_FS); + mac_te_init_label_as(dirlabel, MAC_TE_TYPE_FS); } static void @@ -794,7 +794,7 @@ mac_te_cred_check_debug_proc(struct ucred *cred, struct proc *proc) { - return (mac_te_check(&cred->cr_label, &proc->p_ucred->cr_label, + return (mac_te_check(&cred->cr_label, &proc->p_ucred->cr_label, MAC_TE_CLASS_PROC, MAC_TE_OPERATION_PROC_DEBUG)); } @@ -1105,7 +1105,7 @@ mac_te_ifnet_check_send_mbuf, mac_te_socket_check_receive_mbuf }; - + MAC_POLICY_SET(mac_te_ops, trustedbsd_mac_te, "TrustedBSD MAC/TE", 1); #endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#90 (text+ko) ==== @@ -41,7 +41,7 @@ * * The POSIX.1e implementation page may be reached at: * http://www.trustedbsd.org/ - */ + */ #ifndef _SYS_MAC_H #define _SYS_MAC_H ==== //depot/projects/trustedbsd/mac/sys/sys/mac_constant.h#7 (text+ko) ==== @@ -40,7 +40,7 @@ * Constant labels available in userland from MAC code in libc. This * will eventually go away and be replaced with some other way of * finding these labels. - */ + */ #ifndef _SYS_MAC_CONSTANT_H #define _SYS_MAC_CONSTANT_H ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#55 (text+ko) ==== @@ -38,7 +38,7 @@ */ /* * Kernel interface for MAC policy modules. - */ + */ #ifndef _SYS_MAC_POLICY_H #define _SYS_MAC_POLICY_H @@ -233,5 +233,5 @@ int mac_policy_modevent(module_t mod, int type, void *data); - + #endif /* !_SYS_MAC_POLICY_H */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message