depend on Net::SSH 0.08 for non-blocking STDERR read

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

diff --git a/FS/FS/part_export/www_shellcommands.pm b/FS/FS/part_export/www_shellcommands.pm
index 84c1627..3e00874 100644 (file)
--- a/FS/FS/part_export/www_shellcommands.pm
+++ b/FS/FS/part_export/www_shellcommands.pm
@@ -23,17 +23,13 @@ sub _export_command {
   my $command = $self->option($action);
 
   #set variable for the command
+  no strict 'vars';
   {
     no strict 'refs';
     ${$_} = $svc_www->getfield($_) foreach $svc_www->fields;
   }
   my $domain_record = $svc_www->domain_record; # or die ?
-  my $zone = $domain_record->reczone; # or die ?
-  unless ( $zone =~ /\.$/ ) {
-    my $svc_domain = $domain_record->svc_domain; # or die ?
-    $zone .= '.'. $svc_domain->domain;
-  }
-
+  my $zone = $domain_record->zone; # or die ?
   my $svc_acct = $svc_www->svc_acct; # or die ?
   my $username = $svc_acct->username;
   my $homedir = $svc_acct->dir; # or die ?
@@ -52,6 +48,7 @@ sub _export_replace {
   my $command = $self->option('usermod');
   
   #set variable for the command
+  no strict 'vars';
   {
     no strict 'refs';
     ${"old_$_"} = $old->getfield($_) foreach $old->fields;
@@ -99,7 +96,7 @@ sub shellcommands_queue {
 }
 
 sub ssh_cmd { #subroutine, not method
-  use Net::SSH '0.06';
+  use Net::SSH '0.08';
   &Net::SSH::ssh_cmd( { @_ } );
 }