summaryrefslogtreecommitdiff
path: root/misc.h
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2018-01-08 15:21:49 +0000
committerDamien Miller <djm@mindrot.org>2018-01-23 16:32:57 +1100
commit25cf9105b849932fc3b141590c009e704f2eeba6 (patch)
tree304d9af800f3450993741611dd28712928e61792 /misc.h
parentb0d34132b3ca26fe94013f01d7b92101e70b68bb (diff)
upstream commit
move subprocess() so scp/sftp do not need uidswap.o; ok djm@ OpenBSD-Commit-ID: 6601b8360388542c2e5fef0f4085f8e54750bea8
Diffstat (limited to 'misc.h')
-rw-r--r--misc.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/misc.h b/misc.h
index e8e6a18d..8f778067 100644
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.h,v 1.69 2017/12/05 23:59:47 dtucker Exp $ */
+/* $OpenBSD: misc.h,v 1.70 2018/01/08 15:21:49 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -149,12 +149,6 @@ int argv_split(const char *, int *, char ***);
char *argv_assemble(int, char **argv);
int exited_cleanly(pid_t, const char *, const char *, int);
-#define SSH_SUBPROCESS_STDOUT_DISCARD (1) /* Discard stdout */
-#define SSH_SUBPROCESS_STDOUT_CAPTURE (1<<1) /* Redirect stdout */
-#define SSH_SUBPROCESS_STDERR_DISCARD (1<<2) /* Discard stderr */
-pid_t subprocess(const char *, struct passwd *,
- const char *, int, char **, FILE **, u_int flags);
-
struct stat;
int safe_path(const char *, struct stat *, const char *, uid_t,
char *, size_t);