From: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Sat, 7 Aug 2021 01:57:08 +0000 (+0000)
Subject: upstream: Fix prototype mismatch for do_cmd. ok djm@
X-Git-Tag: V_8_7_P1~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf27810a649c5cfae60f8ce66eeb25caa53b13bc;p=thirdparty%2Fopenssh-portable.git

upstream: Fix prototype mismatch for do_cmd. ok djm@

OpenBSD-Commit-ID: 1c1598bb5237a7ae0be99152f185e0071163714d
---

diff --git a/scp.c b/scp.c
index 3eb0212b9..fc97e1e7f 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.221 2021/08/07 00:12:09 djm Exp $ */
+/* $OpenBSD: scp.c,v 1.222 2021/08/07 01:57:08 dtucker Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -271,7 +271,7 @@ do_local_cmd(arglist *a)
 
 int
 do_cmd(char *program, char *host, char *remuser, int port, char *cmd,
-    int *fdin, int *fdout, int *pid)
+    int *fdin, int *fdout, pid_t *pid)
 {
 	int pin[2], pout[2], reserved[2];