get rid of FS::SSH.pm (became Net::SSH and Net::SCP on CPAN)

[freeside.git] / bin / svc_acct.export

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 57be2dd..0733595 100755 (executable)
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.15 2000-07-06 08:57:28 ivan Exp $
+# $Id: svc_acct.export,v 1.18 2001-04-22 01:56:15 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,7 +38,17 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.15  2000-07-06 08:57:28  ivan
+# Revision 1.18  2001-04-22 01:56:15  ivan
+# get rid of FS::SSH.pm (became Net::SSH and Net::SCP on CPAN)
+#
+# Revision 1.17  2001/02/21 23:48:19  ivan
+# add icradius_secrets config file to export to a non-Freeside MySQL database for
+# ICRADIUS
+#
+# Revision 1.16  2000/07/06 13:23:29  ivan
+# tyop
+#
+# Revision 1.15  2000/07/06 08:57:28  ivan
 # support for radius check attributes (except importing).  poorly documented.
 #
 # Revision 1.14  2000/06/29 15:01:25  ivan
@@ -61,8 +71,10 @@ use strict;
 use vars qw($conf);
 use Fcntl qw(:flock);
 use IO::Handle;
+use DBI;
 use FS::Conf;
-use FS::SSH qw(scp ssh);
+use Net::SSH qw(ssh);
+use Net::SCP qw(scp);
 use FS::UID qw(adminsuidsetup datasrc dbh);
 use FS::Record qw(qsearch fields);
 use FS::svc_acct;
@@ -95,8 +107,13 @@ my $icradius_mysqldest =
 my $icradius_mysqlsource =
   $conf->config('icradius_mysqlsource') || "/usr/local/var/freeside"
     if $icradiusmachines;
-my $icradius_dbh = dbh; #could eventually get it from a config file if you're
-                        #not running MySQL for your Freeside database
+my $icradius_dbh;
+if ( $icradiusmachines && $conf->exists('icradius_secrets') ) {
+  $icradius_dbh = DBI->connect($conf->config('icradius_secrets'))
+    or die $DBI::errstr;;
+} else {
+  $icradius_dbh = dbh;
+}
 
 my $textradiusprepend = $conf->config('textradiusprepend');
 
@@ -286,7 +303,7 @@ foreach $svc_acct (@svc_acct) {
           join(", ", map { $icradius_dbh->quote( $_ ) } (
             '',
             $svc_acct->username,
-            $attribute
+            $attribute,
             $radcheck{$attribute},
           ) ). " )"
         );