upstream commit

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

OpenBSD-Commit-ID: 6601b8360388542c2e5fef0f4085f8e54750bea8

1 files changed, 7 insertions, 1 deletions

diff --git a/auth.h b/auth.h
index 29835ae92..64f3c2eb5 100644
--- a/auth.h
+++ b/auth.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.h,v 1.93 2017/08/18 05:36:45 djm Exp $ */
+/* $OpenBSD: auth.h,v 1.94 2018/01/08 15:21:49 markus Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -221,6 +221,12 @@ void	 auth_debug_reset(void);
 
 struct passwd *fakepw(void);
 
+#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);
+
 int      sys_auth_passwd(Authctxt *, const char *);
 
 #define SKEY_PROMPT "\nS/Key Password: "