diff options
| author | kn <kn@cvs.openbsd.org> | 2021-03-02 09:17:11 +0000 |
|---|---|---|
| committer | kn <kn@cvs.openbsd.org> | 2021-03-02 09:17:11 +0000 |
| commit | f14bbcd1a39d51732a719dc41c390fe410acf850 (patch) | |
| tree | ea23bea8d6cc909ef2644761c07de6840c8b3365 /sbin | |
| parent | 7b42b31bd752a87f71747053912af16ebc9d8a34 (diff) | |
Do not unveil unused unwind socket under SMALL
Remove unused STARTUP_WAIT_TIMO (since import),
add missing space to error message.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/resolvd/resolvd.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sbin/resolvd/resolvd.c b/sbin/resolvd/resolvd.c index 0f73b8b7b04..96a5cd9fa6a 100644 --- a/sbin/resolvd/resolvd.c +++ b/sbin/resolvd/resolvd.c @@ -40,11 +40,12 @@ #define ROUTE_SOCKET_BUF_SIZE 16384 #define ASR_MAXNS 10 +#ifndef SMALL #define _PATH_UNWIND_SOCKET "/dev/unwind.sock" +#endif #define _PATH_RESCONF "/etc/resolv.conf" #define _PATH_RESCONF_NEW "/etc/resolv.conf.new" #define _PATH_LOCKFILE "/var/run/resolvd.lock" -#define STARTUP_WAIT_TIMO 1 #ifndef nitems #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0])) @@ -215,8 +216,10 @@ main(int argc, char *argv[]) if (unveil("/etc", "rwc") == -1) lerr(1, "unveil /etc"); +#ifndef SMALL if (unveil(_PATH_UNWIND_SOCKET, "r") == -1) - lerr(1, "unveil" _PATH_UNWIND_SOCKET); + lerr(1, "unveil " _PATH_UNWIND_SOCKET); +#endif if (pledge("stdio unix rpath wpath cpath", NULL) == -1) lerr(1, "pledge"); |