upstream commit

move subprocess() so scp/sftp do not need uidswap.o; ok
djm@

OpenBSD-Commit-ID: 6601b8360388542c2e5fef0f4085f8e54750bea8

1 files changed, 1 insertions, 7 deletions

diff --git a/misc.h b/misc.h
index e8e6a18d1..8f7780675 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);