svn commit: r358221 - stable/12/contrib/elftoolchain/addr2line

[Mark Johnston]

Author: markj
Date: Fri Feb 21 14:40:08 2020
New Revision: 358221
URL: https://svnweb.freebsd.org/changeset/base/358221

Log:
  Revert r350515 for now.
  
  It seems to cause build failures when Capsicum support is disabled in
  src.conf.
  
  PR:		244258
  Reported by:	rozhuk.im at gmail.com, Giacomo Olgeni <olgeni at olgeni.com>

Modified:
  stable/12/contrib/elftoolchain/addr2line/addr2line.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/contrib/elftoolchain/addr2line/addr2line.c
==============================================================================
--- stable/12/contrib/elftoolchain/addr2line/addr2line.c	Fri Feb 21 10:14:02 2020	(r358220)
+++ stable/12/contrib/elftoolchain/addr2line/addr2line.c	Fri Feb 21 14:40:08 2020	(r358221)
@@ -27,7 +27,6 @@
 #include <sys/param.h>
 #include <sys/tree.h>
 
-#include <capsicum_helpers.h>
 #include <dwarf.h>
 #include <err.h>
 #include <fcntl.h>
@@ -688,7 +687,6 @@ find_section_base(const char *exe, Elf *e, const char 
 int
 main(int argc, char **argv)
 {
-	cap_rights_t rights;
 	Elf *e;
 	Dwarf_Debug dbg;
 	Dwarf_Error de;
@@ -745,16 +743,6 @@ main(int argc, char **argv)
 
 	if ((fd = open(exe, O_RDONLY)) < 0)
 		err(EXIT_FAILURE, "%s", exe);
-
-	if (caph_rights_limit(fd, cap_rights_init(&rights, CAP_FSTAT,
-	    CAP_MMAP_R)) < 0)
-		errx(EXIT_FAILURE, "caph_rights_limit");
-
-	caph_cache_catpages();
-	if (caph_limit_stdio() < 0)
-		errx(EXIT_FAILURE, "failed to limit stdio rights");
-	if (caph_enter() < 0)
-		errx(EXIT_FAILURE, "failed to enter capability mode");
 
 	if (dwarf_init(fd, DW_DLC_READ, NULL, NULL, &dbg, &de))
 		errx(EXIT_FAILURE, "dwarf_init: %s", dwarf_errmsg(de));