From owner-p4-projects  Thu Jun 27 22:55:13 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9B74B37B408; Thu, 27 Jun 2002 22:54:56 -0700 (PDT)
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 0821E37B407
	for <perforce@FreeBSD.org>; Thu, 27 Jun 2002 22:54:55 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6CC9B43E13
	for <perforce@FreeBSD.org>; Thu, 27 Jun 2002 22:54:51 -0700 (PDT)
	(envelope-from amigus@FreeBSD.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5S5spJU034068
	for <perforce@FreeBSD.org>; Thu, 27 Jun 2002 22:54:51 -0700 (PDT)
	(envelope-from amigus@FreeBSD.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5S5spqt034065
	for perforce@freebsd.org; Thu, 27 Jun 2002 22:54:51 -0700 (PDT)
Date: Thu, 27 Jun 2002 22:54:51 -0700 (PDT)
Message-Id: <200206280554.g5S5spqt034065@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f
From: Adam Migus <amigus@FreeBSD.org>
Subject: PERFORCE change 13519 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13519

Change 13519 by amigus@amigus_vmganyopa on 2002/06/27 22:54:14

	It's probably better to return "operation not supported" than
	"protocol not available", if the user doesn't have MAC enabled
	but attempts to set the label anyway.  Unfortunately there is
	no EDUDEYOURESOINTHEBOX...

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#26 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#26 (text+ko) ====

@@ -1280,8 +1280,8 @@
 				break;
 			}
 			break;
+		case SO_LABEL:
 #ifdef MAC
-		case SO_LABEL:
 			error = sooptcopyin(sopt, &extmac, sizeof extmac,
 			    sizeof extmac);
 			if (error)
@@ -1290,8 +1290,10 @@
 			error = mac_setsockopt_label_set(
 			    sopt->sopt_td->td_ucred, so, &extmac);
 
+#else /* MAC */
+			error = EOPNOTSUPP;
+#endif /* MAC */
 			break;
-#endif /* MAC */
 		default:
 			error = ENOPROTOOPT;
 			break;
@@ -1431,22 +1433,28 @@
 			tv.tv_usec = (optval % hz) * tick;
 			error = sooptcopyout(sopt, &tv, sizeof tv);
 			break;
+		case SO_LABEL:
 #ifdef MAC
-		case SO_LABEL:
 			error = mac_getsockopt_label_get(
 			    sopt->sopt_td->td_ucred, so, &extmac);
 			if (error)
 				return (error);
 			error = sooptcopyout(sopt, &extmac, sizeof extmac);
+#else /* MAC */
+			error = EOPNOTSUPP;
+#endif /* MAC */
 			break;
 		case SO_PEERLABEL:
+#ifdef MAC
 			error = mac_getsockopt_peerlabel_get(
 			    sopt->sopt_td->td_ucred, so, &extmac);
 			if (error)
 				return (error);
 			error = sooptcopyout(sopt, &extmac, sizeof extmac);
+#else /* MAC */
+			error = EOPNOTSUPP;
+#endif /* MAC */
 			break;
-#endif /* MAC */
 		default:
 			error = ENOPROTOOPT;
 			break;

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message