From owner-p4-projects Mon Oct 28 13:16: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDE8E37B404; Mon, 28 Oct 2002 13:15:59 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 578CE37B401 for ; Mon, 28 Oct 2002 13:15:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F49F43E88 for ; Mon, 28 Oct 2002 13:15:59 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9SLEqmV029715 for ; Mon, 28 Oct 2002 13:14:52 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9SLEqs4029712 for perforce@freebsd.org; Mon, 28 Oct 2002 13:14:52 -0800 (PST) Date: Mon, 28 Oct 2002 13:14:52 -0800 (PST) Message-Id: <200210282114.g9SLEqs4029712@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 20309 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://perforce.freebsd.org/chv.cgi?CH=20309 Change 20309 by rwatson@rwatson_tislabs on 2002/10/28 13:14:25 style(9) Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#40 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#40 (text+ko) ==== @@ -1265,7 +1265,7 @@ u_long val; #ifdef MAC struct mac extmac; -#endif /* MAC */ +#endif error = 0; if (sopt->sopt_level != SOL_SOCKET) { @@ -1400,9 +1400,9 @@ error = mac_setsockopt_label_set( sopt->sopt_td->td_ucred, so, &extmac); -#else /* MAC */ +#else error = EOPNOTSUPP; -#endif /* MAC */ +#endif break; default: error = ENOPROTOOPT; @@ -1462,7 +1462,7 @@ #endif #ifdef MAC struct mac extmac; -#endif /* MAC */ +#endif error = 0; if (sopt->sopt_level != SOL_SOCKET) { @@ -1551,9 +1551,9 @@ if (error) return (error); error = sooptcopyout(sopt, &extmac, sizeof extmac); -#else /* MAC */ +#else error = EOPNOTSUPP; -#endif /* MAC */ +#endif break; case SO_PEERLABEL: #ifdef MAC @@ -1562,9 +1562,9 @@ if (error) return (error); error = sooptcopyout(sopt, &extmac, sizeof extmac); -#else /* MAC */ +#else error = EOPNOTSUPP; -#endif /* MAC */ +#endif break; default: error = ENOPROTOOPT; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message