8895 libtsol man pages are out of step with reality

Reviewed by: Ken Mays <maybird1776@yahoo.com>
Reviewed by: Yuri Pankov <yuripv@gmx.com>
Approved by: Dan McDonald <danmcd@joyent.com>

8 files changed, 22 insertions, 739 deletions

diff --git a/usr/src/man/man2/Makefile b/usr/src/man/man2/Makefile
index c4a4411877..05f38f9f24 100644
--- a/usr/src/man/man2/Makefile
+++ b/usr/src/man/man2/Makefile
@@ -14,6 +14,7 @@
 # Copyright 2013, OmniTI Computer Consulting, Inc
 # Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
 # Copyright (c) 2015, Joyent, Inc.  All rights reserved.
+# Copyright 2017 Peter Tribble
 #
 
 include		$(SRC)/Makefile.master
@@ -58,7 +59,6 @@ MANFILES=	Intro.2			\
 	 	getgroups.2		\
 	 	getisax.2		\
 	 	getitimer.2		\
-	 	getlabel.2		\
 	 	getmsg.2		\
 	 	getpflags.2		\
 	 	getpid.2		\
@@ -188,7 +188,6 @@ MANLINKS=	_Exit.2				\
 	 	fchown.2			\
 	 	fchownat.2			\
 	 	fchroot.2			\
-	 	fgetlabel.2			\
 	 	fork1.2				\
 	 	forkall.2			\
 	 	forkallx.2			\
@@ -322,8 +321,6 @@ setgroups.2			:= LINKSRC = getgroups.2
 
 setitimer.2			:= LINKSRC = getitimer.2
 
-fgetlabel.2			:= LINKSRC = getlabel.2
-
 getpmsg.2			:= LINKSRC = getmsg.2
 
 setpflags.2			:= LINKSRC = getpflags.2
diff --git a/usr/src/man/man3lib/libtsol.3lib b/usr/src/man/man3lib/libtsol.3lib
index 30992f1458..119e57212e 100644
--- a/usr/src/man/man3lib/libtsol.3lib
+++ b/usr/src/man/man3lib/libtsol.3lib
@@ -1,9 +1,10 @@
 '\" te
+.\" Copyright (c) 2017 Peter Tribble.
 .\" Copyright (c) 2007, Sun Microsystems, Inc. All rights reserved.
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH LIBTSOL 3LIB "Jul 20, 2007"
+.TH LIBTSOL 3LIB "Dec 3, 2017"
 .SH NAME
 libtsol \- Solaris Trusted Extensions library
 .SH SYNOPSIS
@@ -14,41 +15,33 @@ libtsol \- Solaris Trusted Extensions library
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 Functions in this library provide programmatic access to Solaris Trusted
 Extensions features such as labels and Mandatory Access Policy (MAC) on systems
 that are configured with Trusted Extensions software.
 .SH INTERFACES
-.sp
 .LP
 The shared object \fBlibtsol.so.2\fR provides the public interfaces that are
 defined below. See \fBIntro\fR(3) for additional information on shared object
 interfaces.
 .SS "Committed Functions"
-.sp
-
-.sp
 .TS
 l l
 l l .
 \fBbldominates\fR	\fBblequal\fR
-\fBblstrictdom\fR	\fBgetpathbylabel\fR
+\fBblstrictdom\fR	\fBfgetlabel\fR
+\fBgetlabel\fR	\fBgetpathbylabel\fR
 \fBgetplabel\fR	\fBgetdevicerange\fR
 \fBgetuserrange\fR	\fBgetzoneidbylabel\fR
-\fBgetzonelabelbyid\fR	\fBgetzonerootbyid\fR
-\fBgetzonerootbylabel\fR	\fBgetzonerootbyname\fR
-\fBlabel_to_str\fR	\fBlabelbuilder\fR
-\fBlabelclipping\fR	\fBm_label_alloc\fR
-\fBm_label_dup\fR	\fBm_label_free\fR
-\fBsetflabel\fR	\fBstr_to_label\fR
-\fBtsol_lbuild_create\fR	\fBtsol_lbuild_destroy\fR
-\fBtsol_lbuild_get\fR	\fBtsol_lbuild_set\fR
-\fBXbcleartos\fR	\fBXbsltos\fR
+\fBgetzonelabelbyid\fR	\fBgetzonelabelbyname\fR
+\fBgetzonerootbyid\fR	\fBgetzonerootbylabel\fR
+\fBgetzonerootbyname\fR	\fBlabel_to_str\fR
+\fBm_label_alloc\fR	\fBm_label_dup\fR
+\fBm_label_free\fR	\fBsetflabel\fR
+\fBstr_to_label\fR
 .TE
 
 .SS "Obsolete Functions"
-.sp
 .LP
 The following functions are preserved to aid porting.
 .sp
@@ -77,7 +70,6 @@ Function	Committed Replacement
 .TE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/lib/libtsol.so.2\fR\fR
@@ -96,7 +88,6 @@ shared object
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -116,11 +107,9 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBIntro\fR(3), \fBlibtsnet\fR(3LIB), \fBattributes\fR(5)
 .SH NOTES
-.sp
 .LP
 The functionality described on this manual page is available only if the system
 has been configured with Trusted Extensions.
diff --git a/usr/src/man/man3tsol/Makefile b/usr/src/man/man3tsol/Makefile
index 73cad27dd3..2efc676a12 100644
--- a/usr/src/man/man3tsol/Makefile
+++ b/usr/src/man/man3tsol/Makefile
@@ -12,6 +12,7 @@
 #
 # Copyright 2011, Richard Lowe
 # Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+# Copyright 2017 Peter Tribble
 #
 
 include		$(SRC)/Makefile.master
@@ -24,6 +25,7 @@ MANFILES=	blcompare.3tsol		\
 	 	bltos.3tsol		\
 	 	btohex.3tsol		\
 	 	getdevicerange.3tsol	\
+	 	getlabel.3tsol		\
 	 	getpathbylabel.3tsol	\
 	 	getplabel.3tsol		\
 	 	getuserrange.3tsol	\
@@ -31,8 +33,6 @@ MANFILES=	blcompare.3tsol		\
 	 	getzonerootbyid.3tsol	\
 	 	hextob.3tsol		\
 	 	label_to_str.3tsol	\
-	 	labelbuilder.3tsol	\
-	 	labelclipping.3tsol	\
 	 	m_label.3tsol		\
 	 	sbltos.3tsol		\
 	 	setflabel.3tsol		\
@@ -40,9 +40,7 @@ MANFILES=	blcompare.3tsol		\
 	 	str_to_label.3tsol	\
 	 	tsol_getrhtype.3tsol
 
-MANLINKS=	Xbcleartos.3tsol		\
-		Xbsltos.3tsol			\
-		bcleartoh.3tsol			\
+MANLINKS=	bcleartoh.3tsol			\
 		bcleartoh_r.3tsol		\
 		bcleartos.3tsol			\
 		bldominates.3tsol		\
@@ -55,6 +53,7 @@ MANLINKS=	Xbcleartos.3tsol		\
 		bsltoh.3tsol			\
 		bsltoh_r.3tsol			\
 		bsltos.3tsol			\
+	 	fgetlabel.3tsol			\
 		getzoneidbylabel.3tsol		\
 		getzonelabelbyname.3tsol	\
 		getzonerootbylabel.3tsol	\
@@ -91,6 +90,8 @@ bsltoh_r.3tsol			:= LINKSRC = btohex.3tsol
 h_alloc.3tsol			:= LINKSRC = btohex.3tsol
 h_free.3tsol			:= LINKSRC = btohex.3tsol
 
+fgetlabel.3tsol			:= LINKSRC = getlabel.3tsol
+
 getzoneidbylabel.3tsol		:= LINKSRC = getzonelabelbyid.3tsol
 getzonelabelbyname.3tsol	:= LINKSRC = getzonelabelbyid.3tsol
 
@@ -100,9 +101,6 @@ getzonerootbyname.3tsol		:= LINKSRC = getzonerootbyid.3tsol
 htobclear.3tsol			:= LINKSRC = hextob.3tsol
 htobsl.3tsol			:= LINKSRC = hextob.3tsol
 
-Xbcleartos.3tsol		:= LINKSRC = labelclipping.3tsol
-Xbsltos.3tsol			:= LINKSRC = labelclipping.3tsol
-
 m_label_alloc.3tsol		:= LINKSRC = m_label.3tsol
 m_label_dup.3tsol		:= LINKSRC = m_label.3tsol
 m_label_free.3tsol		:= LINKSRC = m_label.3tsol
diff --git a/usr/src/man/man2/getlabel.2 b/usr/src/man/man3tsol/getlabel.3tsol
index d0412a2e0b..3eb47754fd 100644
--- a/usr/src/man/man2/getlabel.2
+++ b/usr/src/man/man3tsol/getlabel.3tsol
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH GETLABEL 2 "Jul 20, 2007"
+.TH GETLABEL 3TSOL "Dec 3, 2017"
 .SH NAME
 getlabel, fgetlabel \- get file sensitivity label
 .SH SYNOPSIS
@@ -25,7 +25,6 @@ getlabel, fgetlabel \- get file sensitivity label
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBgetlabel()\fR function obtains the sensitivity label of the file that is
 named by \fIpath\fR. Discretionary read, write or execute permission to the
@@ -42,12 +41,10 @@ The \fIlabel_p\fR argument is a pointer to an opaque label structure. The
 caller must allocate space for \fIlabel_p\fR by using
 \fBm_label_alloc\fR(3TSOL).
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, \fBgetlabel()\fR and \fBfgetlabel()\fR return 0.
 Otherwise they return \(mi1 and set \fBerrno\fR to indicate the error.
 .SH ERRORS
-.sp
 .LP
 The \fBgetlabel()\fR function will fail if:
 .sp
@@ -148,7 +145,6 @@ An \fBI/O\fR error occurred while reading from or writing to the file system.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -164,7 +160,6 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBopen\fR(2), \fBpathconf\fR(2), \fBm_label_alloc\fR(3TSOL),
 \fBattributes\fR(5), \fBlabels\fR(5)
@@ -173,7 +168,6 @@ Interface Stability	Committed
 \fIObtaining a File Label\fR in \fISolaris Trusted Extensions Developer\&'s
 Guide\fR
 .SH NOTES
-.sp
 .LP
 The functionality described on this manual page is available only if the system
 is configured with Trusted Extensions.
diff --git a/usr/src/man/man3tsol/labelbuilder.3tsol b/usr/src/man/man3tsol/labelbuilder.3tsol
deleted file mode 100644
index 989b486e9e..0000000000
--- a/usr/src/man/man3tsol/labelbuilder.3tsol
+++ /dev/null
@@ -1,505 +0,0 @@
-'\" te
-.\" Copyright (c) 2007, Sun Microsystems, Inc. All Rights Reserved.
-.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
-.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
-.\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH LABELBUILDER 3TSOL "Jul 20, 2007"
-.SH NAME
-labelbuilder, tsol_lbuild_create, tsol_lbuild_get, tsol_lbuild_set,
-tsol_lbuild_destroy \- create a Motif-based user interface for interactively
-building a valid label or clearance
-.SH SYNOPSIS
-.LP
-.nf
-\fBcc\fR [\fIflag\fR...] \fIfile\fR... \fB-ltsol\fR \fB-lDtTsol\fR [\fIlibrary\fR...]
-.fi
-
-.LP
-.nf
-#include <Dt/ModLabel.h>
-
-\fBModLabelData *tsol_lbuild_create\fR(\fBWidget\fR \fIwidget\fR,
-     void \fI(*event_handler)\fR() \fIok_callback\fR,
-     \fBlbuild_attributes\fR \fIextended_operation\fR, ..., \fBNULL\fR);
-.fi
-
-.LP
-.nf
-\fBvoid *tsol_lbuild_get\fR(\fBModLabelData *\fR\fIdata\fR,
-     \fBlbuild_attributes\fR \fIextended_operation\fR);
-.fi
-
-.LP
-.nf
-\fBvoid tsol_lbuild_set\fR(\fBModLabelData *\fR\fIdata\fR,
-     \fBlbuild_attributes\fR \fIextended_operation\fR, ..., \fBNULL\fR);
-.fi
-
-.LP
-.nf
-\fBvoid tsol_lbuild_destroy\fR(\fBModLabelData *\fR\fIdata\fR);
-.fi
-
-.SH DESCRIPTION
-.sp
-.LP
-The label builder user interface prompts the end user for information and
-generates a valid sensitivity label or clearance from the user input based on
-specifications in the \fBlabel_encodings\fR(4) file on the system where the
-application runs. The end user can build the label or clearance by typing a
-text value or by interactively choosing options.
-.sp
-.LP
-Application-specific functionality is implemented in the callback for the OK
-pushbutton. This callback is passed to the \fBtsol_lbuild_create()\fR call
-where it is mapped to the OK pushbutton widget.
-.sp
-.LP
-When choosing options, the label builder shows the user only those
-classifications (and related compartments and markings) dominated by the
-workspace sensitivity label unless the executable has the
-\fBPRIV_SYS_TRANS_LABEL\fR privilege in its effective set.
-.sp
-.LP
-If the end user does not have the authorization to upgrade or downgrade labels,
-or if the user-built label is out of the user's accreditation range, the OK and
-Reset pushbuttons are grayed. There are no privileges to override these
-restrictions.
-.sp
-.LP
-\fBtsol_lbuild_create()\fR creates the graphical user interface and returns a
-pointer variable of type \fBModLabeldata*\fR that contains information on the
-user interface. This information is a combination of values passed in the
-\fBtsol_lbuild_create()\fR input parameter list, default values for information
-not provided, and information on the widgets used by the label builder to
-create the user interface. All information except the widget information should
-be accessed with the \fBtsol_lbuild_get()\fR and \fBtsol_lbuild_set()\fR
-routines.
-.sp
-.LP
-The widget information is accessed directly by referencing the following fields
-of the \fBModLabelData\fR structure.
-.sp
-.ne 2
-.na
-\fB\fBlbuild_dialog\fR\fR
-.ad
-.RS 17n
-The label builder dialog box.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBok\fR\fR
-.ad
-.RS 17n
-The OK pushbutton.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBcancel\fR\fR
-.ad
-.RS 17n
-The Cancel pushbutton.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBreset\fR\fR
-.ad
-.RS 17n
-The Reset pushbutton.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBhelp\fR\fR
-.ad
-.RS 17n
-The Help pushbutton.
-.RE
-
-.sp
-.LP
-The \fBtsol_lbuild_create()\fR parameter list takes the following values:
-.sp
-.ne 2
-.na
-\fBwidget\fR
-.ad
-.RS 15n
-The widget from which the dialog box is created. Any Motif widget can be
-passed.
-.RE
-
-.sp
-.ne 2
-.na
-\fBok_callback\fR
-.ad
-.RS 15n
-A callback function that implements the behavior of the OK pushbutton on the
-dialog box.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB\&..., NULL\fR\fR
-.ad
-.RS 15n
-A \fINULL\fR terminated list of extended operations and value pairs that define
-the characteristics and behavior of the label builder dialog box.
-.RE
-
-.sp
-.LP
-\fBtsol_lbuild_destroy()\fR destroys the \fBModLabelData\fR structure returned
-by \fBtsol_lbuild_create()\fR.
-.sp
-.LP
-\fBtsol_lbuild_get()\fR and \fBtsol_lbuild_set()\fR access the information
-stored in the \fBModLabelData\fR structure returned by
-\fBtsol_lbuild_create()\fR.
-.sp
-.LP
-The following extended operations can be passed to \fBtsol_lbuild_create()\fR
-to build the user interface, to \fBtsol_lbuild_get()\fR to retrieve information
-on the user interface, and to \fBtsol_lbuild_set()\fR to change the user
-interface information. All extended operations are valid for
-\fBtsol_lbuild_get()\fR, but the \fB*WORK*\fR operations are not valid for
-\fBtsol_lbuild_set()\fR or \fBtsol_lbuild_create()\fR because these values are
-set from input supplied by the end user. These exceptions are noted in the
-descriptions.
-.sp
-.ne 2
-.na
-\fB\fBLBUILD_MODE\fR\fR
-.ad
-.RS 22n
-Create a user interface to build a sensitivity label or a clearance. Value is
-\fBLBUILD_MODE_SL\fR by default.
-.sp
-.ne 2
-.na
-\fB\fBLBUILD_MODE_SL\fR\fR
-.ad
-.RS 19n
-Build a sensitivity label.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBLBUILD_MODE_CLR\fR\fR
-.ad
-.RS 19n
-Build a clearance.
-.RE
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBLBUILD_VALUE_SL\fR\fR
-.ad
-.RS 22n
-The starting sensitivity label. This value is \fBADMIN_LOW\fR by default and is
-used when the mode is \fBLBUILD_MODE_SL\fR.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBLBUILD_VALUE_CLR\fR\fR
-.ad
-.RS 22n
-The starting clearance. This value is \fBADMIN_LOW\fR by default and is used
-when the mode is \fBLBUILD_MODE_CLR\fR.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBLBUILD_USERFIELD\fR\fR
-.ad
-.RS 22n
-A character string prompt that displays at the top of the label builder dialog
-box. Value is \fINULL\fR by default.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBLBUILD_SHOW\fR\fR
-.ad
-.RS 22n
-Show or hide the label builder dialog box. Value is \fBFALSE\fR by default.
-.sp
-.ne 2
-.na
-\fB\fBTRUE\fR\fR
-.ad
-.RS 9n
-Show the label builder dialog box.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBFALSE\fR\fR
-.ad
-.RS 9n
-Hide the label builder dialog box.
-.RE
-
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBLBUILD_TITLE\fR\fR
-.ad
-.RS 22n
-A character string title that appears at the top of the label builder dialog
-box. Value is \fINULL\fR by default.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBLBUILD_WORK_SL\fR\fR
-.ad
-.RS 22n
-Not valid for \fBtsol_lbuild_set()\fR or \fBtsol_lbuild_create()\fR. The
-sensitivity label the end user is building. Value is updated to the end user's
-input when the end user selects the Update pushbutton or interactively chooses
-an option.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBLBUILD_WORK_CLR\fR\fR
-.ad
-.RS 22n
-Not valid for \fBtsol_lbuild_set()\fR or \fBtsol_lbuild_create()\fR. The
-clearance the end user is building. Value is updated to the end user's input
-when the end user selects the Update pushbutton or interactively chooses an
-option.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBLBUILD_X\fR\fR
-.ad
-.RS 22n
-The X position in pixels of the top-left corner of the label builder dialog box
-in relation to the top-left corner of the screen. By default the label builder
-dialog box is positioned in the middle of the screen.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBLBUILD_Y\fR\fR
-.ad
-.RS 22n
-The Y position in pixels of the top-left corner of the label builder dialog box
-in relation to the top-left corner of the screen. By default the label builder
-dialog box is positioned in the middle of the screen.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBLBUILD_LOWER_BOUND\fR\fR
-.ad
-.RS 22n
-The lowest classification (and related compartments and markings) available to
-the user as radio buttons for interactively building a label or clearance. This
-value is the user's minimum label.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBLBUILD_UPPER_BOUND\fR\fR
-.ad
-.RS 22n
-The highest classification (and related compartments and markings) available to
-the user as radio buttons for interactively building a label or clearance. A
-supplied value should be within the user's accreditation range.  If no value is
-specified, the value is the user's workspace sensitivity label, or if the
-executable has the \fBPRIV_SYS_TRANS_LABEL\fR privilege, the value is the
-user's clearance.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBLBUILD_CHECK_AR\fR\fR
-.ad
-.RS 22n
-Check that the user-built label entered in the Update With field is within the
-user's accreditation range. A value of 1 means check, and a value of 0 means do
-not check. If checking is on and the label is out of range, an error message is
-raised to the end user.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBLBUILD_VIEW\fR\fR
-.ad
-.RS 22n
-Use the internal or external label representation. Value is
-\fBLBUILD_VIEW_EXTERNAL\fR by default.
-.sp
-.ne 2
-.na
-\fB\fBLBUILD_VIEW_INTERNAL\fR\fR
-.ad
-.sp .6
-.RS 4n
-Use the internal names for the highest and lowest labels in the system:
-\fBADMIN_HIGH\fR and \fBADMIN_LOW\fR.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fBLBUILD_VIEW_EXTERNAL\fR\fR
-.ad
-.sp .6
-.RS 4n
-Promote an \fBADMIN_LOW\fR label to the next highest label, and demote an
-\fBADMIN_HIGH\fR label to the next lowest label.
-.RE
-
-.RE
-
-.SH RETURN VALUES
-.sp
-.LP
-The \fBtsol_lbuild_get()\fR function returns \fB\(mi1\fR if it is unable to get
-the value.
-.sp
-.LP
-The \fBtsol_lbuild_create()\fR function returns a variable of type
-\fBModLabelData\fR that contains the information provided in the
-\fBtsol_lbuild_create()\fR input parameter list, default values for information
-not provided, and information on the widgets used by the label builder to
-create the user interface.
-.SH EXAMPLES
-.LP
-\fBExample 1 \fRCreate a Label Builder.
-.sp
-.in +2
-.nf
-(ModLabelData *)lbldata = tsol_lbuild_create(widget0, callback_function,
-     LBUILD_MODE, LBUILD_MODE_SL,
-     LBUILD_TITLE, "Setting Sensitivity Label",
-     LBUILD_VIEW, LBUILD_VIEW_INTERNAL,
-     LBUILD_X, 200,
-     LBUILD_Y, 200,
-     LBUILD_USERFIELD, "Pathname:",
-     LBUILD_SHOW, FALSE,
-  NULL);
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 2 \fRQuery the Mode and Display the Label Builder.
-.sp
-.LP
-These examples call the \fBtsol_lbuild_get()\fR function to query the mode
-being used, and call the \fBtsol_lbuild_set()\fR function so the label builder
-dialog box displays.
-
-.sp
-.in +2
-.nf
-mode = (int)tsol_lbuild_get(lbldata, LBUILD_MODE );
-
-tsol_lbuild_set(lbldata, LBUILD_SHOW, TRUE, NULL);
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 3 \fRDestroy the ModLabelData Variable.
-.sp
-.LP
-This example destroys the \fBModLabelData\fR variable returned in the call to
-\fBtsol_lbuild_create()\fR.
-
-.sp
-.in +2
-.nf
-tsol_lbuild_destroy(lbldata);
-.fi
-.in -2
-.sp
-
-.SH FILES
-.sp
-.ne 2
-.na
-\fB\fB/usr/dt/include/Dt/ModLabel.h\fR\fR
-.ad
-.sp .6
-.RS 4n
-Header file for label builder functions
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/etc/security/tsol/label_encodings\fR\fR
-.ad
-.sp .6
-.RS 4n
-The label encodings file contains the classification names, words, constraints,
-and values for the defined labels of this system.
-.RE
-
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-box;
-c | c
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-_
-Interface Stability	Committed
-_
-MT-Level	MT-Safe
-.TE
-
-.SH SEE ALSO
-.sp
-.LP
-\fBlibtsol\fR(3LIB), \fBlabel_encodings\fR(4), \fBattributes\fR(5)
-.sp
-.LP
-\fILabel Builder APIs\fR in \fISolaris Trusted Extensions Developer\&'s
-Guide\fR
-.SH NOTES
-.sp
-.LP
-The functionality described on this manual page is available only if the system
-is configured with Trusted Extensions.
diff --git a/usr/src/man/man3tsol/labelclipping.3tsol b/usr/src/man/man3tsol/labelclipping.3tsol
deleted file mode 100644
index 2dd0508a35..0000000000
--- a/usr/src/man/man3tsol/labelclipping.3tsol
+++ /dev/null
@@ -1,188 +0,0 @@
-'\" te
-.\" Copyright (c) 2007, Sun Microsystems, Inc. All Rights Reserved.
-.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
-.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
-.\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH LABELCLIPPING 3TSOL "Jul 20, 2007"
-.SH NAME
-labelclipping, Xbsltos, Xbcleartos \- translate a binary label and clip to the
-specified width
-.SH SYNOPSIS
-.LP
-.nf
-\fBcc\fR [\fIflag\fR...] \fIfile\fR... \fB-ltsol\fR \fB-lDtTsol\fR [\fIlibrary\fR...]
-.fi
-
-.LP
-.nf
-#include <Dt/label_clipping.h>
-
-\fBXmString\fR \fBXbsltos\fR(\fBDisplay *\fR\fIdisplay\fR, \fBconst m_label_t *\fR\fIsenslabel\fR,
-     \fBDimension\fR \fIwidth\fR, \fBconst XmFontList\fR \fIfontlist\fR, \fBconst int\fR \fIflags\fR);
-.fi
-
-.LP
-.nf
-\fBXmString\fR \fBXbcleartos\fR(\fBDisplay *\fR\fIdisplay\fR, \fBconst m_label_t *\fR\fIclearance\fR,
-     \fBDimension\fR \fIwidth\fR, \fBconst XmFontList\fR \fIfontlist\fR, \fBconst int\fR \fIflags\fR);
-.fi
-
-.SH DESCRIPTION
-.sp
-.LP
-The calling process must have \fBPRIV_SYS_TRANS_LABEL\fR in its set of
-effective privileges to translate labels or clearances that dominate the
-current process' sensitivity label.
-.sp
-.ne 2
-.na
-\fB\fIdisplay\fR\fR
-.ad
-.RS 13n
-The structure controlling the connection to an X Window System display.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fIsenslabel\fR\fR
-.ad
-.RS 13n
-The sensitivity label to be translated.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fIclearance\fR\fR
-.ad
-.RS 13n
-The clearance to be translated.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fIwidth\fR\fR
-.ad
-.RS 13n
-The width of the translated label or clearance in pixels. If the specified
-width is shorter than the full label, the label is clipped and the presence of
-clipped letters is indicated by an arrow. In this example, letters have been
-clipped to the right of: TS<-. See the \fBsbltos\fR(3TSOL) manual page for more
-information on the clipped indicator. If the specified width is equal to the
-display width (\fIdisplay\fR), the label is not truncated, but word-wrapped
-using a width of half the display width.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fIfontlist\fR\fR
-.ad
-.RS 13n
-A list of fonts and character sets where each font is associated with a
-character set.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fIflags\fR\fR
-.ad
-.RS 13n
-The value of flags indicates which words in the \fBlabel_encodings\fR(4) file
-are used for the translation. See the \fBbltos\fR(3TSOL) manual page for a
-description of the flag values: \fBLONG_WORDS\fR, \fBSHORT_WORDS\fR,
-\fBLONG_CLASSIFICATION\fR, \fBSHORT_CLASSIFICATION\fR, \fBALL_ENTRIES,\fR
-\fBACCESS_RELATED,\fR \fBVIEW_EXTERNAL\fR, \fBVIEW_INTERNAL\fR,
-\fBNO_CLASSIFICATION\fR. \fBBRACKETED\fR is an additional flag that can be used
-with \fBXbsltos()\fR only. It encloses the sensitivity label in square brackets
-as follows: [C].
-.RE
-
-.SH RETURN VALUES
-.sp
-.LP
-These functions return a compound string that represents the character-coded
-form of the sensitivity label or clearance that is translated. The compound
-string uses the language and fonts specified in \fIfontlist\fR and is clipped
-to \fIwidth\fR. These functions return \fINULL\fR if the label or clearance is
-not a valid, required type as defined in the \fBlabel_encodings\fR(4) file, or
-not dominated by the process' sensitivity label and the
-\fBPRIV_SYS_TRANS_LABEL\fR privilege is not asserted.
-.SH FILES
-.sp
-.ne 2
-.na
-\fB\fB/usr/dt/include/Dt/label_clipping.h\fR\fR
-.ad
-.sp .6
-.RS 4n
-Header file for label clipping functions
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB/etc/security/tsol/label_encodings\fR\fR
-.ad
-.sp .6
-.RS 4n
-The label encodings file contains the classification names, words, constraints,
-and values for the defined labels of this system.
-.RE
-
-.SH EXAMPLES
-.LP
-\fBExample 1 \fRTranslate and Clip a Clearance.
-.sp
-.LP
-This example translates a clearance to text using the long words specified in
-the \fBlabel_encodings\fR(4) file, a font list, and clips the translated
-clearance to a width of 72 pixels.
-
-.sp
-.in +2
-.nf
-xmstr = Xbcleartos(XtDisplay(topLevel),
-&clearance, 72, fontlist, LONG_WORDS
-.fi
-.in -2
-
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-box;
-c | c
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-_
-Interface Stability	Obsolete
-_
-MT-Level	MT-Safe
-.TE
-
-.sp
-.LP
-The labelclipping functions, \fBXbsltos()\fR and \fBXbcleartos()\fR, are
-obsolete. Use the \fBlabel_to_str\fR(3TSOL) function instead.
-.SH SEE ALSO
-.sp
-.LP
-\fBbltos\fR(3TSOL),  \fBlabel_to_str\fR(3TSOL),  \fBlibtsol\fR(3LIB),
-\fBlabel_encodings\fR(4), \fBattributes\fR(5)
-.sp
-.LP
-See \fBXmStringDraw\fR(3) and \fBFontList\fR(3) for information on the creation
-and structure of a font list.
-.SH NOTES
-.sp
-.LP
-The functionality described on this manual page is available only if the system
-is configured with Trusted Extensions.
diff --git a/usr/src/pkg/manifests/system-kernel.man2.inc b/usr/src/pkg/manifests/system-kernel.man2.inc
index 3f85767644..73e95bd241 100644
--- a/usr/src/pkg/manifests/system-kernel.man2.inc
+++ b/usr/src/pkg/manifests/system-kernel.man2.inc
@@ -13,6 +13,7 @@
 # Copyright 2011, Richard Lowe
 # Copyright 2012 Nexenta Systems, Inc. All rights reserved.
 # Copyright 2013, OmniTI Computer Consulting, Inc.
+# Copyright 2017 Peter Tribble
 #
 
 file path=usr/share/man/man2/Intro.2
@@ -53,7 +54,6 @@ file path=usr/share/man/man2/getdents.2
 file path=usr/share/man/man2/getgroups.2
 file path=usr/share/man/man2/getisax.2
 file path=usr/share/man/man2/getitimer.2
-file path=usr/share/man/man2/getlabel.2
 file path=usr/share/man/man2/getmsg.2
 file path=usr/share/man/man2/getpflags.2
 file path=usr/share/man/man2/getpid.2
@@ -182,7 +182,6 @@ link path=usr/share/man/man2/fchmodat.2 target=chmod.2
 link path=usr/share/man/man2/fchown.2 target=chown.2
 link path=usr/share/man/man2/fchownat.2 target=chown.2
 link path=usr/share/man/man2/fchroot.2 target=chroot.2
-link path=usr/share/man/man2/fgetlabel.2 target=getlabel.2
 link path=usr/share/man/man2/fork1.2 target=fork.2
 link path=usr/share/man/man2/forkall.2 target=fork.2
 link path=usr/share/man/man2/forkallx.2 target=fork.2
diff --git a/usr/src/pkg/manifests/system-library.man3tsol.inc b/usr/src/pkg/manifests/system-library.man3tsol.inc
index 88320f9d28..20b7c25055 100644
--- a/usr/src/pkg/manifests/system-library.man3tsol.inc
+++ b/usr/src/pkg/manifests/system-library.man3tsol.inc
@@ -12,6 +12,7 @@
 #
 # Copyright 2011, Richard Lowe
 # Copyright 2012 Nexenta Systems, Inc. All rights reserved.
+# Copyright 2017 Peter Tribble
 #
 
 file path=usr/share/man/man3tsol/blcompare.3tsol
@@ -20,6 +21,7 @@ file path=usr/share/man/man3tsol/bltocolor.3tsol
 file path=usr/share/man/man3tsol/bltos.3tsol
 file path=usr/share/man/man3tsol/btohex.3tsol
 file path=usr/share/man/man3tsol/getdevicerange.3tsol
+file path=usr/share/man/man3tsol/getlabel.3tsol
 file path=usr/share/man/man3tsol/getpathbylabel.3tsol
 file path=usr/share/man/man3tsol/getplabel.3tsol
 file path=usr/share/man/man3tsol/getuserrange.3tsol
@@ -27,16 +29,12 @@ file path=usr/share/man/man3tsol/getzonelabelbyid.3tsol
 file path=usr/share/man/man3tsol/getzonerootbyid.3tsol
 file path=usr/share/man/man3tsol/hextob.3tsol
 file path=usr/share/man/man3tsol/label_to_str.3tsol
-file path=usr/share/man/man3tsol/labelbuilder.3tsol
-file path=usr/share/man/man3tsol/labelclipping.3tsol
 file path=usr/share/man/man3tsol/m_label.3tsol
 file path=usr/share/man/man3tsol/sbltos.3tsol
 file path=usr/share/man/man3tsol/setflabel.3tsol
 file path=usr/share/man/man3tsol/stobl.3tsol
 file path=usr/share/man/man3tsol/str_to_label.3tsol
 file path=usr/share/man/man3tsol/tsol_getrhtype.3tsol
-link path=usr/share/man/man3tsol/Xbcleartos.3tsol target=labelclipping.3tsol
-link path=usr/share/man/man3tsol/Xbsltos.3tsol target=labelclipping.3tsol
 link path=usr/share/man/man3tsol/bcleartoh.3tsol target=btohex.3tsol
 link path=usr/share/man/man3tsol/bcleartoh_r.3tsol target=btohex.3tsol
 link path=usr/share/man/man3tsol/bcleartos.3tsol target=bltos.3tsol
@@ -50,6 +48,7 @@ link path=usr/share/man/man3tsol/bltocolor_r.3tsol target=bltocolor.3tsol
 link path=usr/share/man/man3tsol/bsltoh.3tsol target=btohex.3tsol
 link path=usr/share/man/man3tsol/bsltoh_r.3tsol target=btohex.3tsol
 link path=usr/share/man/man3tsol/bsltos.3tsol target=bltos.3tsol
+link path=usr/share/man/man3tsol/fgetlabel.3tsol target=getlabel.3tsol
 link path=usr/share/man/man3tsol/getzoneidbylabel.3tsol \
     target=getzonelabelbyid.3tsol
 link path=usr/share/man/man3tsol/getzonelabelbyname.3tsol \