From b7ebd38698c35c23492857f50cbcc6bf124e2757 Mon Sep 17 00:00:00 2001 From: "C. McEnroe" Date: Tue, 10 Nov 2020 15:15:13 -0500 Subject: Refactor unveil calls so errors can be reported properly --- daemon.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/daemon.c b/daemon.c index 15c278d..cf7f805 100644 --- a/daemon.c +++ b/daemon.c @@ -216,19 +216,23 @@ int main(int argc, char *argv[]) { } #ifdef __OpenBSD__ - if (pidPath) { - error = unveil(pidPath, "cw"); - if (error) err(EX_OSERR, "unveil"); + struct { + const char *path; + const char *mode; + } paths[] = { + { fifoPath, "crw" }, + { configPath, "r" }, + { "/", "r" }, + { "/dev/null", "rw" }, + { serviceDir, "r" }, + { _PATH_BSHELL, "x" }, + { pidPath, "cw" }, + { NULL, NULL }, + }; + for (size_t i = 0; paths[i].path; ++i) { + error = unveil(paths[i].path, paths[i].mode); + if (error) err(EX_CANTCREAT, "%s", paths[i].path); } - error = unveil(fifoPath, "crw") - || unveil(configPath, "r") - || unveil("/", "r") - || unveil("/dev/null", "rw") - || unveil(serviceDir, "r") - || unveil(_PATH_BSHELL, "x") - || unveil(NULL, NULL); - if (error) err(EX_OSERR, "unveil"); - error = pledge( "stdio cpath dpath rpath wpath flock getpw proc exec id", NULL ); -- cgit 1.4.1 7031e1f&follow=1'>commit diff
path: root/port/file2c/.gitignore (unfollow)
Commit message (Expand)Author
2019-07-08Document lack of window size propagationJune McEnroe
2019-07-08Add pteeJune McEnroe
2019-07-08Add Wild SeedJune McEnroe
2019-07-06Add common includes to AGPL templateJune McEnroe
2019-07-06Remove redundant includeJune McEnroe
2019-07-06Add CSS output to schemeJune McEnroe
2019-07-01Add diff syntax to hiJune McEnroe
2019-07-01Use env.sh as 1sh todo listJune McEnroe
2019-06-29Clean up 1sh prompt settingJune McEnroe
2019-06-29Add Parable of the TalentsJune McEnroe
2019-06-28Rename catsh to 1shJune McEnroe
2019-06-28Set HISTSIZE in catshJune McEnroe
2019-06-28Unset iflag when exiting catshJune McEnroe
2019-06-24Consolidate catsh history documentationJune McEnroe
2019-06-19Set LESS=FRXJune McEnroe
2019-06-16Alias date=ddateJune McEnroe
2019-06-15Set sensitivity by slot in TF2June McEnroe
2019-06-15Add AcceptanceJune McEnroe
2019-06-07Add variables to bitJune McEnroe
2019-06-05Add A Closed and Common OrbitJune McEnroe
2019-06-02Add RebornJune McEnroe
2019-05-30Add bit to bin.7June McEnroe
2019-05-30Simplify and build bitJune McEnroe
2019-05-29Add xx -p optionJune McEnroe
2019-05-27Add FrontierJune McEnroe
2019-05-27Break nicks with ZWNJJune McEnroe
2019-05-26Add DawnJune McEnroe
2019-05-20Declare vasprintf(3) for GNUJune McEnroe
2019-05-20Fix comparison warning in ttpreJune McEnroe
2019-05-20Add AuthorityJune McEnroe
2019-05-19Specify precedence of unary versions of operatorsJune McEnroe
2019-05-18Add compound assignment operators to orderJune McEnroe
2019-05-15Support simple assignment in orderJune McEnroe
2019-05-15Implement sizeof in orderJune McEnroe
2019-05-15Add orderJune McEnroe
2019-05-12Add T suffix in bitJune McEnroe
2019-05-10Highlight yacc and lex files as CJune McEnroe
2019-05-10Use val instead of suboptargJune McEnroe
2019-05-09Add Parable of the SowerJune McEnroe
2019-05-07Add bit without buildJune McEnroe
2019-05-04Fix MANDIR typoJune McEnroe
2019-05-04Move relay to binJune McEnroe