File tree Expand file tree Collapse file tree 2 files changed +7
-1
lines changed Expand file tree Collapse file tree 2 files changed +7
-1
lines changed Original file line number Diff line number Diff line change @@ -492,8 +492,10 @@ fio_disconnect(void)
492
492
Assert (hdr .cop == FIO_DISCONNECTED );
493
493
SYS_CHECK (close (fio_stdin ));
494
494
SYS_CHECK (close (fio_stdout ));
495
+ SYS_CHECK (close (fio_stderr ));
495
496
fio_stdin = 0 ;
496
497
fio_stdout = 0 ;
498
+ fio_stderr = 0 ;
497
499
wait_ssh ();
498
500
}
499
501
}
@@ -3505,7 +3507,8 @@ fio_communicate(int in, int out)
3505
3507
case FIO_DISCONNECT :
3506
3508
hdr .cop = FIO_DISCONNECTED ;
3507
3509
IO_CHECK (fio_write_all (out , & hdr , sizeof (hdr )), sizeof (hdr ));
3508
- break ;
3510
+ free (buf );
3511
+ return ;
3509
3512
case FIO_GET_ASYNC_ERROR :
3510
3513
fio_get_async_error_impl (out );
3511
3514
break ;
Original file line number Diff line number Diff line change @@ -147,6 +147,9 @@ bool launch_agent(void)
147
147
ssh_argv [ssh_argc ++ ] = "-o" ;
148
148
ssh_argv [ssh_argc ++ ] = "Compression=no" ;
149
149
150
+ ssh_argv [ssh_argc ++ ] = "-o" ;
151
+ ssh_argv [ssh_argc ++ ] = "ControlMaster=no" ;
152
+
150
153
ssh_argv [ssh_argc ++ ] = "-o" ;
151
154
ssh_argv [ssh_argc ++ ] = "LogLevel=error" ;
152
155
You can’t perform that action at this time.
0 commit comments