=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sftp.c,v retrieving revision 1.29 retrieving revision 1.29.2.2 diff -u -r1.29 -r1.29.2.2 --- src/usr.bin/ssh/sftp.c 2002/04/02 17:37:48 1.29 +++ src/usr.bin/ssh/sftp.c 2002/10/11 14:51:52 1.29.2.2 @@ -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.29.2.2 2002/10/11 14:51:52 miod Exp $"); /* XXX: short-form remote directory listings (like 'ls -C') */ @@ -47,8 +47,10 @@ 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]; @@ -57,6 +59,7 @@ 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]; @@ -112,7 +115,6 @@ args.list = NULL; addargs(&args, "ssh"); /* overwritten with ssh_program */ - addargs(&args, "-oFallBackToRsh no"); addargs(&args, "-oForwardX11 no"); addargs(&args, "-oForwardAgent no"); addargs(&args, "-oClearAllForwardings yes");