summaryrefslogtreecommitdiffstats
path: root/client.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2017-01-23 12:27:58 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2017-01-23 12:27:58 +0000
commita3d5bfcecec49bf197157bae4bee520e613c2efc (patch)
tree9515be36c8afabaaf70cfffe6e77915720cde44b /client.c
parent1ebe79dd628f009108c3d6dbdbfbfc69b7a6933d (diff)
Define away pledge() on !OpenBSD.
Diffstat (limited to 'client.c')
-rw-r--r--client.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/client.c b/client.c
index ea84d645..9be2934c 100644
--- a/client.c
+++ b/client.c
@@ -289,7 +289,6 @@ client_main(struct event_base *base, int argc, char **argv, int flags,
if ((ttynam = ttyname(STDIN_FILENO)) == NULL)
ttynam = "";
-#ifdef __OpenBSD__
/*
* Drop privileges for client. "proc exec" is needed for -c and for
* locking (which uses system(3)).
@@ -301,7 +300,6 @@ client_main(struct event_base *base, int argc, char **argv, int flags,
*/
if (pledge("stdio unix sendfd proc exec tty", NULL) != 0)
fatal("pledge failed");
-#endif
/* Free stuff that is not used in the client. */
if (ptm_fd != -1)
@@ -563,7 +561,6 @@ client_dispatch_wait(struct imsg *imsg, const char *shellcmd)
struct msg_stdout_data stdoutdata;
struct msg_stderr_data stderrdata;
int retval;
-#ifdef __OpenBSD__
static int pledge_applied;
/*
@@ -577,7 +574,6 @@ client_dispatch_wait(struct imsg *imsg, const char *shellcmd)
fatal("pledge failed");
pledge_applied = 1;
};
-#endif
data = imsg->data;
datalen = imsg->hdr.len - IMSG_HEADER_SIZE;