- depend on Net::SSH 0.07, for OpenSSH -T fix

[freeside.git] / FS / FS / part_export / shellcommands.pm

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 56cd569..869544d 100644 (file)
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -1,6 +1,7 @@
 package FS::part_export::shellcommands;
 
 use vars qw(@ISA @saltset);
+use String::ShellQuote;
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
@@ -23,10 +24,12 @@ sub _export_command {
   my ( $self, $action, $svc_acct) = (shift, shift, shift);
   my $command = $self->option($action);
   my $stdin = $self->option($action."_stdin");
+  no strict 'vars';
   {
     no strict 'refs';
     ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
   }
+  $finger = shell_quote $finger;
   $crypt_password = ''; #surpress "used only once" warnings
   $crypt_password = crypt( $svc_acct->_password,
                              $saltset[int(rand(64))].$saltset[int(rand(64))] );
@@ -42,11 +45,13 @@ sub _export_replace {
   my($self, $new, $old ) = (shift, shift, shift);
   my $command = $self->option('usermod');
   my $stdin = $self->option('usermod_stdin');
+  no strict 'vars';
   {
     no strict 'refs';
     ${"old_$_"} = $old->getfield($_) foreach $old->fields;
     ${"new_$_"} = $new->getfield($_) foreach $new->fields;
   }
+  $new_finger = shell_quote $new_finger;
   $new_crypt_password = ''; #surpress "used only once" warnings
   $new_crypt_password = crypt( $new->_password,
                                $saltset[int(rand(64))].$saltset[int(rand(64))]);
@@ -69,7 +74,7 @@ sub shellcommands_queue {
 }
 
 sub ssh_cmd { #subroutine, not method
-  use Net::SSH '0.06';
+  use Net::SSH '0.07';
   &Net::SSH::ssh_cmd( { @_ } );
 }