diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-10-09 01:37:11 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-10-09 01:37:11 +0000 |
| commit | 7a01108f60e58c5683c269bbbb884090b5a0620f (patch) | |
| tree | d28dc1713411066fb4ced6b7bb3fe35eb3a43955 /usr.sbin/tcpdump | |
| parent | 76228dc5f1e37f76feb11003febafceed8e121f0 (diff) | |
Change all tame callers to namechange to pledge(2).
Diffstat (limited to 'usr.sbin/tcpdump')
| -rw-r--r-- | usr.sbin/tcpdump/privsep.c | 6 | ||||
| -rw-r--r-- | usr.sbin/tcpdump/tcpdump.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/tcpdump/privsep.c b/usr.sbin/tcpdump/privsep.c index c57053e68ef..5c780990433 100644 --- a/usr.sbin/tcpdump/privsep.c +++ b/usr.sbin/tcpdump/privsep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: privsep.c,v 1.37 2015/10/06 15:39:44 deraadt Exp $ */ +/* $OpenBSD: privsep.c,v 1.38 2015/10/09 01:37:09 deraadt Exp $ */ /* * Copyright (c) 2003 Can Erkin Acar @@ -281,8 +281,8 @@ priv_init(int argc, char **argv) case PRIV_INIT_DONE: test_state(cmd, STATE_RUN); impl_init_done(socks[0], &bpfd); - if (tame("stdio rpath inet unix ioctl dns recvfd", NULL) == -1) - err(1, "tame"); + if (pledge("stdio rpath inet unix ioctl dns recvfd", NULL) == -1) + err(1, "pledge"); break; case PRIV_GETHOSTBYADDR: test_state(cmd, STATE_RUN); diff --git a/usr.sbin/tcpdump/tcpdump.c b/usr.sbin/tcpdump/tcpdump.c index d32f0a25e1c..98d729b1cd1 100644 --- a/usr.sbin/tcpdump/tcpdump.c +++ b/usr.sbin/tcpdump/tcpdump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcpdump.c,v 1.73 2015/10/03 00:51:08 deraadt Exp $ */ +/* $OpenBSD: tcpdump.c,v 1.74 2015/10/09 01:37:09 deraadt Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -490,8 +490,8 @@ main(int argc, char **argv) if (tflag > 0) thiszone = gmt2local(0); - if (tame("stdio", NULL) == -1) - err(1, "tame"); + if (pledge("stdio", NULL) == -1) + err(1, "pledge"); if (pcap_loop(pd, cnt, printer, pcap_userdata) < 0) { (void)fprintf(stderr, "%s: pcap_loop: %s\n", |