X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fshellcommands.pm;h=4e943605f07f8af5c8f7d8e39c13611cf1219686;hp=ccde72a6835cfb720f6af511f7627058141ab410;hb=cd5d6c049041ee198e38687e7dd0a63f3d21b2ef;hpb=0eb4dc23ad6d145ee394884a95bad09e2668e74d

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index ccde72a68..4e943605f 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -1,10 +1,12 @@
 package FS::part_export::shellcommands;
 
-use vars qw(@ISA);
+use vars qw(@ISA @saltset);
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
+
 sub rebless { shift; }
 
 sub _export_insert {
@@ -20,23 +22,33 @@ sub _export_delete {
 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;
-  $self->shellcommands_queue(
-    $self->options('user')||'root'. "\@". $self->options('machine'),
-    eval(qq("$command"))
+  $crypt_password = crypt( $svc_acct->_password,
+                           $saltset[int(rand(64))].$saltset[int(rand(64))] );
+  $self->shellcommands_queue( $svc_acct->svcnum,
+    user         => $self->option('user')||'root',
+    host         => $self->machine,
+    command      => eval(qq("$command")),
+    stdin_string => eval(qq("$stdin")),
   );
 }
 
 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;
-  $self->shellcommands_queue(
-    $self->options('user')||'root'. "\@". $self->options('machine'),
-    eval(qq("$command"))
+  $new_crypt_password = crypt( $svc_acct->_password,
+                               $saltset[int(rand(64))].$saltset[int(rand(64))]);
+  $self->shellcommands_queue( $new->svcnum,
+    user         => $self->option('user')||'root',
+    host         => $self->machine,
+    command      => eval(qq("$command")),
+    stdin_string => eval(qq("$stdin")),
   );
 }
 
@@ -45,11 +57,16 @@ sub shellcommands_queue {
   my( $self, $svcnum ) = (shift, shift);
   my $queue = new FS::queue {
     'svcnum' => $svcnum,
-    'job'    => "Net::SSH::ssh_cmd", #freeside-queued pre-uses...
+    'job'    => "FS::part_export::shellcommands::ssh_cmd",
   };
   $queue->insert( @_ );
 }
 
+sub ssh_cmd { #subroutine, not method
+  use Net::SSH '0.06';
+  &Net::SSH::ssh_cmd( { @_ } );
+}
+
 #sub shellcommands_insert { #subroutine, not method
 #}
 #sub shellcommands_replace { #subroutine, not method