diff options
author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-06-29 11:34:13 +0000 |
---|---|---|
committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-06-29 11:34:13 +0000 |
commit | ee21a45f81a0d84007f4e9b4175b9eb4727a96ee (patch) | |
tree | 8238d8d0755b8c75c2f77d82c8f96d4360c7ee11 /crypto/openssh/sftp.c | |
parent | 83d2307d00b1f24dddf918c6651fb440d6863bf9 (diff) | |
download | src-ee21a45f81a0d84007f4e9b4175b9eb4727a96ee.tar.gz src-ee21a45f81a0d84007f4e9b4175b9eb4727a96ee.zip |
Vendor import of OpenSSH 3.4p1.
Notes
Notes:
svn path=/vendor-crypto/openssh/dist/; revision=99060
Diffstat (limited to 'crypto/openssh/sftp.c')
-rw-r--r-- | crypto/openssh/sftp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/openssh/sftp.c b/crypto/openssh/sftp.c index f941d18faae5..fac2564ded5d 100644 --- a/crypto/openssh/sftp.c +++ b/crypto/openssh/sftp.c @@ -24,7 +24,7 @@ #include "includes.h" -RCSID("$OpenBSD: sftp.c,v 1.29 2002/04/02 17:37:48 markus Exp $"); +RCSID("$OpenBSD: sftp.c,v 1.30 2002/06/23 09:30:14 deraadt Exp $"); /* XXX: short-form remote directory listings (like 'ls -C') */ @@ -53,8 +53,10 @@ static void connect_to_server(char *path, char **args, int *in, int *out, pid_t *sshpid) { int c_in, c_out; + #ifdef USE_PIPES int pin[2], pout[2]; + if ((pipe(pin) == -1) || (pipe(pout) == -1)) fatal("pipe: %s", strerror(errno)); *in = pin[0]; @@ -63,6 +65,7 @@ connect_to_server(char *path, char **args, int *in, int *out, pid_t *sshpid) c_out = pin[1]; #else /* USE_PIPES */ int inout[2]; + if (socketpair(AF_UNIX, SOCK_STREAM, 0, inout) == -1) fatal("socketpair: %s", strerror(errno)); *in = *out = inout[0]; |