svn commit: r339045 - stable/11/contrib/traceroute

[Mariusz Zaborski]

Author: oshogbo
Date: Mon Oct  1 14:39:59 2018
New Revision: 339045
URL: https://svnweb.freebsd.org/changeset/base/339045

Log:
  MFC r315411 (mmel):
    Unbreak traceroute on system built without CAPSICUM

Modified:
  stable/11/contrib/traceroute/traceroute.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/contrib/traceroute/traceroute.c
==============================================================================
--- stable/11/contrib/traceroute/traceroute.c	Mon Oct  1 14:27:53 2018	(r339044)
+++ stable/11/contrib/traceroute/traceroute.c	Mon Oct  1 14:39:59 2018	(r339045)
@@ -1021,8 +1021,13 @@ main(int argc, char **argv)
 	 * We must connect(2) our socket before this point.
 	 */
 	if (cansandbox && cap_enter() < 0) {
-		Fprintf(stderr, "%s: cap_enter: %s\n", prog, strerror(errno));
-		exit(1);
+		if (errno != ENOSYS) {
+			Fprintf(stderr, "%s: cap_enter: %s\n", prog,
+			    strerror(errno));
+			exit(1);
+		} else {
+			cansandbox = false;
+		}
 	}
 
 	cap_rights_init(&rights, CAP_SEND, CAP_SETSOCKOPT);