summaryrefslogtreecommitdiff
path: root/contrib/traceroute
diff options
context:
space:
mode:
authorMichal Meloun <mmel@FreeBSD.org>2017-03-16 13:01:23 +0000
committerMichal Meloun <mmel@FreeBSD.org>2017-03-16 13:01:23 +0000
commit3c63fe7aa2f77883d634086c9766a34eb81f3020 (patch)
treead902835c26194413c5c717b7c535b43f13cb0a9 /contrib/traceroute
parentb8a8ed7c96498eeff9591916eb22ce261fc92c7a (diff)
downloadsrc-test-3c63fe7aa2f77883d634086c9766a34eb81f3020.tar.gz
src-test-3c63fe7aa2f77883d634086c9766a34eb81f3020.zip
Unbreak traceroute on system built without CAPSICUM
Notes
Notes: svn path=/head/; revision=315411
Diffstat (limited to 'contrib/traceroute')
-rw-r--r--contrib/traceroute/traceroute.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/contrib/traceroute/traceroute.c b/contrib/traceroute/traceroute.c
index 158ecd69ad8b4..a007d48d9dde3 100644
--- a/contrib/traceroute/traceroute.c
+++ b/contrib/traceroute/traceroute.c
@@ -1023,8 +1023,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);