finally get MySQL locking working for ICRADIUS export

[freeside.git] / bin / svc_acct.export

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 8bec4aa..1e1a163 100755 (executable)
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
-#!/usr/bin/perl -Tw
+#!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.4 2000-03-06 14:19:15 ivan Exp $
+# $Id: svc_acct.export,v 1.10 2000-03-06 15:59:19 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,8 +38,8 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.4  2000-03-06 14:19:15  ivan
-# ICRADIUS export bugfix
+# Revision 1.10  2000-03-06 15:59:19  ivan
+# finally get MySQL locking working for ICRADIUS export
 #
 # Revision 1.2  1998/12/10 07:23:15  ivan
 # use FS::Conf, need user (for datasrc)
@@ -50,7 +50,7 @@ use vars qw($conf);
 use Fcntl qw(:flock);
 use IO::Handle;
 use FS::Conf;
-use FS::SSH qw(scp ssh sshopen2);
+use FS::SSH qw(scp ssh sshopen3);
 use FS::UID qw(adminsuidsetup datasrc dbh);
 use FS::Record qw(qsearch fields);
 use FS::svc_acct;
@@ -78,7 +78,7 @@ my @radiusmachines = $conf->config('radiusmachines')
 my $icradiusmachines = $conf->exists('icradiusmachines');
 my @icradiusmachines = $conf->config('icradiusmachines') if $icradiusmachines;
 my $icradius_mysqldest =
-  $conf->config('icradius_mysqldest') || "/usr/local/var/radius"
+  $conf->config('icradius_mysqldest') || "/usr/local/var/"
     if $icradiusmachines;
 my $icradius_mysqlsource =
   $conf->config('icradius_mysqlsource') || "/usr/local/var/freeside"
@@ -251,11 +251,11 @@ foreach $svc_acct (@svc_acct) {
     if ( $icradiusmachines ) {
       my $sth = $icradius_dbh->prepare(
         "INSERT INTO radcheck ( id, UserName, Attribute, Value ) VALUES ( ".
-        join(", ", map { $icradius_dbh->quote( $_ ) } qw (
-          $svc_acct->svcnum
-          $svc_acct->username
-          "Password"
-          $svc_acct->_password
+        join(", ", map { $icradius_dbh->quote( $_ ) } (
+          $svc_acct->svcnum,
+          $svc_acct->username,
+          "Password",
+          $svc_acct->_password,
         ) ). " )"
       );
       $sth->execute or die "Can't insert into radcheck table: ". $sth->errstr;
@@ -356,14 +356,14 @@ foreach $radiusmachine (@radiusmachines) {
 foreach my $icradiusmachine ( @icradiusmachines ) {
   my( $machine, $db, $user, $pass ) = split(/\s+/, $icradiusmachine);
   chdir $icradius_mysqlsource or die "Can't cd $icradius_mysqlsource: $!";
-  my($reader,$writer)=(new IO::Handle, new IO::Handle);
-  sshopen2("root\@$machine", $reader, $writer, "mysql --user=$user -p $db");
-  print $writer "$pass\nLOCK TABLES radcheck WRITE;\n";
+  my($reader,$writer,$error)=(new IO::Handle, new IO::Handle, new IO::Handle);
+  open(WRITER,"|ssh root\@$machine mysql -v --user=$user -p $db");
+  my $oldfh = select WRITER; $|=1; select $oldfh;
+  print WRITER "$pass\n"; sleep 2; print WRITER "LOCK TABLES radcheck WRITE;\n";
   foreach my $file ( glob("radcheck.*") ) {
-    scp($file,"root\@$icradiusmachine:$icradius_mysqldest/$db/$file");
+    scp($file,"root\@$machine:$icradius_mysqldest/$db/$file");
   }
-  close $writer;
-  close $reader;
+  close WRITER;
 }
 
 unlink $spoollock;