repair missing paths on unveil failure

diff --git a/usr.sbin/ldpd/ldpd.c b/usr.sbin/ldpd/ldpd.c
index 58f7826..2110bea 100644 (file)
--- a/usr.sbin/ldpd/ldpd.c
+++ b/usr.sbin/ldpd/ldpd.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ldpd.c,v 1.67 2021/03/01 09:50:40 jsg Exp $ */
+/*     $OpenBSD: ldpd.c,v 1.68 2021/09/06 13:32:18 deraadt Exp $ */
 
 /*
  * Copyright (c) 2013, 2016 Renato Westphal <renato@openbsd.org>
@@ -224,7 +224,7 @@ main(int argc, char *argv[])
            sockname);
 
        if (unveil("/", "r") == -1)
-               fatal("unveil");
+               fatal("unveil /");
        if (unveil(NULL, NULL) == -1)
                fatal("unveil");
 

diff --git a/usr.sbin/ospf6d/ospf6d.c b/usr.sbin/ospf6d/ospf6d.c
index 40732a4..b1193ea 100644 (file)
--- a/usr.sbin/ospf6d/ospf6d.c
+++ b/usr.sbin/ospf6d/ospf6d.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ospf6d.c,v 1.50 2021/01/19 09:54:08 claudio Exp $ */
+/*     $OpenBSD: ospf6d.c,v 1.51 2021/09/06 13:32:18 deraadt Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -277,7 +277,7 @@ main(int argc, char *argv[])
 
        /* no filesystem visibility */
        if (unveil("/", "") == -1)
-               fatal("unveil");
+               fatal("unveil /");
        if (unveil(NULL, NULL) == -1)
                fatal("unveil");
 

diff --git a/usr.sbin/ospfd/ospfd.c b/usr.sbin/ospfd/ospfd.c
index 1c76190..0b38f63 100644 (file)
--- a/usr.sbin/ospfd/ospfd.c
+++ b/usr.sbin/ospfd/ospfd.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ospfd.c,v 1.115 2021/01/19 09:37:53 claudio Exp $ */
+/*     $OpenBSD: ospfd.c,v 1.116 2021/09/06 13:32:18 deraadt Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -282,7 +282,7 @@ main(int argc, char *argv[])
        main_imsg_compose_ospfe_fd(IMSG_CONTROLFD, 0, control_fd);
 
        if (unveil("/", "r") == -1)
-               fatal("unveil");
+               fatal("unveil /");
        if (unveil(NULL, NULL) == -1)
                fatal("unveil");
 

diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index d56d2e3..7eff3d3 100644 (file)
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rarpd.c,v 1.77 2020/12/29 19:47:40 benno Exp $ */
+/*     $OpenBSD: rarpd.c,v 1.78 2021/09/06 13:32:18 deraadt Exp $ */
 /*     $NetBSD: rarpd.c,v 1.25 1998/04/23 02:48:33 mrg Exp $   */
 
 /*
@@ -83,9 +83,9 @@ void   rarp_reply(struct if_info *, struct if_addr *,
            struct ether_header *, u_int32_t, struct hostent *);
 void   arptab_init(void);
 int    arptab_set(u_char *, u_int32_t);
-__dead void   error(const char *,...);
-void   warning(const char *,...);
-void   debug(const char *,...);
+__dead void   error(const char *, ...);
+void   warning(const char *, ...);
+void   debug(const char *, ...);
 u_int32_t ipaddrtonetmask(u_int32_t);
 int    rarp_bootable(u_int32_t);
 
@@ -341,9 +341,9 @@ rarp_loop(void)
        arptab_init();
 
        if (unveil(TFTP_DIR, "r") == -1)
-               error("unveil");
+               error("unveil %s", TFTP_DIR);
        if (unveil("/etc/ethers", "r") == -1)
-               error("unveil");
+               error("unveil /etc/ethers");
        if (pledge("stdio rpath dns", NULL) == -1)
                error("pledge");
 

diff --git a/usr.sbin/ripd/ripd.c b/usr.sbin/ripd/ripd.c
index 472cb6d..f09b60e 100644 (file)
--- a/usr.sbin/ripd/ripd.c
+++ b/usr.sbin/ripd/ripd.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ripd.c,v 1.35 2021/01/19 10:20:47 claudio Exp $ */
+/*     $OpenBSD: ripd.c,v 1.36 2021/09/06 13:32:18 deraadt Exp $ */
 
 /*
  * Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
@@ -212,7 +212,7 @@ main(int argc, char *argv[])
 
        /* no filesystem visibility */
        if (unveil("/", "") == -1)
-               fatal("unveil");
+               fatal("unveil /");
        if (unveil(NULL, NULL) == -1)
                fatal("unveil");
 

diff --git a/usr.sbin/snmpd/snmpe.c b/usr.sbin/snmpd/snmpe.c
index 5d8c7ab..026cfd3 100644 (file)
--- a/usr.sbin/snmpd/snmpe.c
+++ b/usr.sbin/snmpd/snmpe.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: snmpe.c,v 1.75 2021/09/02 05:41:02 martijn Exp $      */
+/*     $OpenBSD: snmpe.c,v 1.76 2021/09/06 13:32:18 deraadt Exp $      */
 
 /*
  * Copyright (c) 2007, 2008, 2012 Reyk Floeter <reyk@openbsd.org>
@@ -116,7 +116,7 @@ snmpe_init(struct privsep *ps, struct privsep_proc *p, void *arg)
 
        /* no filesystem visibility */
        if (unveil("/", "") == -1)
-               fatal("unveil");
+               fatal("unveil /");
        if (unveil(NULL, NULL) == -1)
                fatal("unveil");
 

diff --git a/usr.sbin/switchd/switchd.c b/usr.sbin/switchd/switchd.c
index 9908557..f1410c3 100644 (file)
--- a/usr.sbin/switchd/switchd.c
+++ b/usr.sbin/switchd/switchd.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: switchd.c,v 1.19 2021/01/27 07:21:54 deraadt Exp $    */
+/*     $OpenBSD: switchd.c,v 1.20 2021/09/06 13:32:18 deraadt Exp $    */
 
 /*
  * Copyright (c) 2013-2016 Reyk Floeter <reyk@openbsd.org>
@@ -194,7 +194,7 @@ main(int argc, char *argv[])
        log_procinit("parent");
 
        if (unveil("/", "r") == -1)
-               fatal("unveil");
+               fatal("unveil /");
        if (unveil("/dev", "rw") == -1)
                fatal("unveil");
        /*