X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fshellcommands.pm;h=869544da53732f97b65780a95969e84cdbf8a9aa;hb=22abdc37d4ec5699b62d295dc7ec1e41a8daf23b;hp=870d7f1ee4e759ee852b44a260d725f4395676b9;hpb=cf6020a0c273d549d33f3e9999bd8b68d9b6d133;p=freeside.git

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 870d7f1ee..869544da5 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -1,10 +1,13 @@
 package FS::part_export::shellcommands;
 
-use vars qw(@ISA);
+use vars qw(@ISA @saltset);
+use String::ShellQuote;
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
+
 sub rebless { shift; }
 
 sub _export_insert {
@@ -21,11 +24,18 @@ sub _export_command {
   my ( $self, $action, $svc_acct) = (shift, shift, shift);
   my $command = $self->option($action);
   my $stdin = $self->option($action."_stdin");
-  no strict 'refs';
-  ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
+  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))] );
   $self->shellcommands_queue( $svc_acct->svcnum,
-    user         => $self->options('user')||'root',
-    host         => $self->options('machine'),
+    user         => $self->option('user')||'root',
+    host         => $self->machine,
     command      => eval(qq("$command")),
     stdin_string => eval(qq("$stdin")),
   );
@@ -35,12 +45,19 @@ sub _export_replace {
   my($self, $new, $old ) = (shift, shift, shift);
   my $command = $self->option('usermod');
   my $stdin = $self->option('usermod_stdin');
-  no strict 'refs';
-  ${"old_$_"} = $old->getfield($_) foreach $old->fields;
-  ${"new_$_"} = $new->getfield($_) foreach $new->fields;
+  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))]);
   $self->shellcommands_queue( $new->svcnum,
-    user         => $self->options('user')||'root',
-    host         => $self->options('machine'),
+    user         => $self->option('user')||'root',
+    host         => $self->machine,
     command      => eval(qq("$command")),
     stdin_string => eval(qq("$stdin")),
   );
@@ -57,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( { @_ } );
 }