summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/kern/uipc_socket.c16
-rw-r--r--sys/kern/uipc_usrreq.c2
2 files changed, 9 insertions, 9 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 4084cb1..e07e581 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1265,7 +1265,7 @@ sosetopt(so, sopt)
u_long val;
#ifdef MAC
struct mac extmac;
-#endif /* MAC */
+#endif
error = 0;
if (sopt->sopt_level != SOL_SOCKET) {
@@ -1400,9 +1400,9 @@ sosetopt(so, sopt)
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 @@ sogetopt(so, sopt)
#endif
#ifdef MAC
struct mac extmac;
-#endif /* MAC */
+#endif
error = 0;
if (sopt->sopt_level != SOL_SOCKET) {
@@ -1551,9 +1551,9 @@ integer:
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 @@ integer:
if (error)
return (error);
error = sooptcopyout(sopt, &extmac, sizeof extmac);
-#else /* MAC */
+#else
error = EOPNOTSUPP;
-#endif /* MAC */
+#endif
break;
default:
error = ENOPROTOOPT;
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 5bbb35c..844d03d 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -644,7 +644,7 @@ restart:
#ifdef MAC
error = mac_check_vnode_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd,
&vattr);
-#endif /* MAC */
+#endif
if (error == 0) {
VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE);
error = VOP_CREATE(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr);
OpenPOWER on IntegriCloud