PERFORCE change 177191 for review

[Jonathan Anderson]

http://p4web.freebsd.org/@@177191?ac=10

Change 177191 by jona at jona-belle-freebsd8 on 2010/04/21 20:10:35

	Let's talk about the 'executable' rather than the 'binary' in the FD list

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#18 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#18 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#17 $
+ * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#18 $
  */
 
 #include <sys/param.h>
@@ -143,7 +143,7 @@
 	                     fd_rtld, LIBCAPSICUM_CAPMASK_LDSO) < 0)
 		err(-1, "Error in lc_fdlist_addcap(fd_rtld)");
 
-	if (lc_fdlist_addcap(fds, RTLD_CAP_FQNAME, "binary", "",
+	if (lc_fdlist_addcap(fds, RTLD_CAP_FQNAME, "Executable", binname,
 	                     fd_binary, LIBCAPSICUM_CAPMASK_SANDBOX) < 0)
 		err(-1, "Error in lc_fdlist_addcap(fd_binary)");
 
@@ -219,9 +219,9 @@
 	/*
 	 * Find the binary for RTLD.
 	 */
-	if (lc_fdlist_lookup(fds, RTLD_CAP_FQNAME, "binary", NULL,
+	if (lc_fdlist_lookup(fds, RTLD_CAP_FQNAME, "Executable", NULL,
 	    &fd_binary, NULL) < 0)
-		err(-1, "Error in lc_fdlist_lookup(RTLD binary)");
+		err(-1, "Error in lc_fdlist_lookup(Executable)");
 
 	sprintf(tmp, "%d", fd_binary);
 	if (setenv("LD_BINARY", tmp, 1) != 0)