diff options
| author |   benno <benno@openbsd.org> | 2015-11-01 21:20:46 +0000 |
|---|---|---|
| committer | benno <benno@openbsd.org> | 2015-11-01 21:20:46 +0000 |
| commit | bf641d7b55ae377fbc66e6cd50357b29d24a5066 (patch) | |
| tree | dc3d1e1630636db03c4d4f7c546942feed2b0fdf | |
| parent | Remove the definition of USRTEXT. It has no relevance outside of the non-PIE (diff) | |
| download | wireguard-openbsd-bf641d7b55ae377fbc66e6cd50357b29d24a5066.tar.xz wireguard-openbsd-bf641d7b55ae377fbc66e6cd50357b29d24a5066.zip | |
pledge in bgpctl.
ok deraadt
| -rw-r--r-- | usr.sbin/bgpctl/bgpctl.c | 11 | ||||
| -rw-r--r-- | usr.sbin/bgpctl/irrfilter.c | 5 |
2 files changed, 14 insertions, 2 deletions
diff --git a/usr.sbin/bgpctl/bgpctl.c b/usr.sbin/bgpctl/bgpctl.c index d779f772fc3..23e6fdd049d 100644 --- a/usr.sbin/bgpctl/bgpctl.c +++ b/usr.sbin/bgpctl/bgpctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpctl.c,v 1.185 2015/10/24 11:54:50 claudio Exp $ */ +/* $OpenBSD: bgpctl.c,v 1.186 2015/11/01 21:20:46 benno Exp $ */ /* * Copyright (c) 2003 Henning Brauer <henning@openbsd.org> @@ -124,6 +124,9 @@ main(int argc, char *argv[]) char *sockname; enum imsg_type type; + if (pledge("stdio rpath wpath cpath unix inet dns", NULL) == -1) + err(1, "pledge"); + sockname = SOCKET_NAME; while ((ch = getopt(argc, argv, "ns:")) != -1) { switch (ch) { @@ -151,6 +154,9 @@ main(int argc, char *argv[]) irr_main(res->as.as, res->flags, res->irr_outdir); } + if (pledge("stdio rpath wpath unix", NULL) == -1) + err(1, "pledge"); + memcpy(&neighbor.addr, &res->peeraddr, sizeof(neighbor.addr)); strlcpy(neighbor.descr, res->peerdesc, sizeof(neighbor.descr)); @@ -165,6 +171,9 @@ main(int argc, char *argv[]) if (connect(fd, (struct sockaddr *)&sun, sizeof(sun)) == -1) err(1, "connect: %s", sockname); + if (pledge("stdio rpath wpath", NULL) == -1) + err(1, "pledge"); + if ((ibuf = malloc(sizeof(struct imsgbuf))) == NULL) err(1, NULL); imsg_init(ibuf, fd); diff --git a/usr.sbin/bgpctl/irrfilter.c b/usr.sbin/bgpctl/irrfilter.c index 0873586dfb8..550d692eed2 100644 --- a/usr.sbin/bgpctl/irrfilter.c +++ b/usr.sbin/bgpctl/irrfilter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: irrfilter.c,v 1.5 2015/01/16 06:40:15 deraadt Exp $ */ +/* $OpenBSD: irrfilter.c,v 1.6 2015/11/01 21:20:46 benno Exp $ */ /* * Copyright (c) 2007 Henning Brauer <henning@openbsd.org> @@ -31,6 +31,9 @@ irr_main(u_int32_t AS, int flags, char *outdir) char *query; int r; + if (pledge("stdio rpath wpath cpath inet dns", NULL) == -1) + err(1, "pledge"); + fprintf(stderr, "irrfilter for: %u, writing to %s\n", AS, outdir); irrflags = flags; |