summaryrefslogtreecommitdiff
path: root/misc.h
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2017-08-18 05:48:04 +0000
committerDamien Miller <djm@mindrot.org>2017-08-23 19:47:06 +1000
commitb074c3c3f820000a21953441cea7699c4b17d72f (patch)
tree9304faf8fcaef5893524a7283450de2b75b1d8ea /misc.h
parentde4ae07f12dabf8815ecede54235fce5d22e3f63 (diff)
upstream commit
add a "quiet" flag to exited_cleanly() that supresses errors about exit status (failure due to signal is still reported) Upstream-ID: db85c39c3aa08e6ff67fc1fb4ffa89f807a9d2f0
Diffstat (limited to 'misc.h')
-rw-r--r--misc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/misc.h b/misc.h
index 617f87675..153d11375 100644
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.h,v 1.62 2017/08/18 05:36:45 djm Exp $ */ 1/* $OpenBSD: misc.h,v 1.63 2017/08/18 05:48:04 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -138,7 +138,7 @@ void child_set_env(char ***envp, u_int *envsizep, const char *name,
138 138
139int argv_split(const char *, int *, char ***); 139int argv_split(const char *, int *, char ***);
140char *argv_assemble(int, char **argv); 140char *argv_assemble(int, char **argv);
141int exited_cleanly(pid_t, const char *, const char *); 141int exited_cleanly(pid_t, const char *, const char *, int);
142 142
143#define SSH_SUBPROCESS_STDOUT_DISCARD (1) /* Discard stdout */ 143#define SSH_SUBPROCESS_STDOUT_DISCARD (1) /* Discard stdout */
144#define SSH_SUBPROCESS_STDOUT_CAPTURE (1<<1) /* Redirect stdout */ 144#define SSH_SUBPROCESS_STDOUT_CAPTURE (1<<1) /* Redirect stdout */