projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e4ad23d
)
fix SSH export, from #831
author
mark
<mark>
Thu, 6 Oct 2011 05:51:00 +0000
(
05:51
+0000)
committer
mark
<mark>
Thu, 6 Oct 2011 05:51:00 +0000
(
05:51
+0000)
FS/FS/part_export/shellcommands.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_export/shellcommands.pm
b/FS/FS/part_export/shellcommands.pm
index
4d603cb
..
6fe4254
100644
(file)
--- a/
FS/FS/part_export/shellcommands.pm
+++ b/
FS/FS/part_export/shellcommands.pm
@@
-475,12
+475,16
@@
sub shellcommands_queue {
sub ssh_cmd { #subroutine, not method
use Net::OpenSSH;
my $opt = { @_ };
sub ssh_cmd { #subroutine, not method
use Net::OpenSSH;
my $opt = { @_ };
- my $ssh = Net::OpenSSH->new($opt->{'user'}.'@'.$opt->{'host'});
+ open my $def_in, '<', '/dev/null' or die "unable to open /dev/null\n";
+ my $ssh = Net::OpenSSH->new(
+ $opt->{'user'}.'@'.$opt->{'host'},
+ 'default_stdin_fh' => $def_in
+ );
die "Couldn't establish SSH connection: ". $ssh->error if $ssh->error;
my $ssh_opt = {};
$ssh_opt->{'stdin_data'} = $opt->{'stdin_string'}
die "Couldn't establish SSH connection: ". $ssh->error if $ssh->error;
my $ssh_opt = {};
$ssh_opt->{'stdin_data'} = $opt->{'stdin_string'}
- if exists($opt->{'stdin_string'});
+ if exists($opt->{'stdin_string'})
and length($opt->{'stdin_string'})
;
my ($output, $errput) = $ssh->capture2($ssh_opt, $opt->{'command'});
die "Error running SSH command: ". $ssh->error if $ssh->error;
my ($output, $errput) = $ssh->capture2($ssh_opt, $opt->{'command'});
die "Error running SSH command: ". $ssh->error if $ssh->error;