X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=bin%2Fsvc_acct.export;h=7e92c61e87721c72963b8aa8ec060c45f25a71ed;hb=a03e44937be8d6c2f99dc830ef2583cbbbb36dfc;hp=57be2ddb7aa61e4beb3728f65b6d94aa0a58316f;hpb=61fc4e61c6644d2e0abdffe8cbdfafd4b092e84b;p=freeside.git

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 57be2ddb7..7e92c61e8 100755
--- 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.21 2001-07-30 06:07:46 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,7 +38,27 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.15  2000-07-06 08:57:28  ivan
+# Revision 1.21  2001-07-30 06:07:46  ivan
+# allow !! for locked accounts instead of changing to *SUSPENDED*
+#
+# Revision 1.20  2001/06/20 08:33:42  ivan
+# >     Use of uninitialized value in concatenation (.) at svc_acct.export line
+# > 276.
+#
+# Revision 1.19  2001/05/08 10:44:17  ivan
+# fix for OO Net::SCP
+#
+# 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 +81,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,10 +117,18 @@ 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');
+my $textradiusprepend =
+  $conf->exists('textradiusprepend')
+    ? $conf->config('textradiusprepend')
+    : '';
 
 my(@saltset)= ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
 require 5.004; #srand(time|$$);
@@ -164,6 +194,7 @@ foreach $svc_acct (@svc_acct) {
   my($cpassword,$rpassword);
   if ( ( length($password) <= 8 )
        && ( $password ne '*' )
+       && ( $password ne '!!' )
        && ( $password ne '' )
      ) {
     $cpassword=crypt($password,
@@ -286,7 +317,7 @@ foreach $svc_acct (@svc_acct) {
           join(", ", map { $icradius_dbh->quote( $_ ) } (
             '',
             $svc_acct->username,
-            $attribute
+            $attribute,
             $radcheck{$attribute},
           ) ). " )"
         );
@@ -332,10 +363,11 @@ close USERS;
 
 my($shellmachine);
 foreach $shellmachine (@shellmachines) {
-  scp("$spooldir/passwd","root\@$shellmachine:/etc/passwd.new")
-    == 0 or die "scp error: $!";
-  scp("$spooldir/shadow","root\@$shellmachine:/etc/shadow.new")
-    == 0 or die "scp error: $!";
+  my $scp = new Net::SCP;
+  $scp->scp("$spooldir/passwd","root\@$shellmachine:/etc/passwd.new")
+    or die "scp error: ". $scp->{errstr};
+  $scp->scp("$spooldir/shadow","root\@$shellmachine:/etc/shadow.new")
+    or die "scp error: ". $scp->{errstr};
   ssh("root\@$shellmachine",
     "( ".
       "mv /etc/passwd.new /etc/passwd; ".
@@ -347,10 +379,11 @@ foreach $shellmachine (@shellmachines) {
 
 my($bsdshellmachine);
 foreach $bsdshellmachine (@bsdshellmachines) {
-  scp("$spooldir/passwd","root\@$bsdshellmachine:/etc/passwd.new")
-    == 0 or die "scp error: $!";
-  scp("$spooldir/master.passwd","root\@$bsdshellmachine:/etc/master.passwd.new")
-    == 0 or die "scp error: $!";
+  my $scp = new Net::SCP;
+  $scp->scp("$spooldir/passwd","root\@$bsdshellmachine:/etc/passwd.new")
+    or die "scp error: ". $scp->{errstr};
+  $scp->scp("$spooldir/master.passwd","root\@$bsdshellmachine:/etc/master.passwd.new")
+    or die "scp error: ". $scp->{errstr};
   ssh("root\@$bsdshellmachine",
     "( ".
       "mv /etc/passwd.new /etc/passwd; ".
@@ -362,10 +395,11 @@ foreach $bsdshellmachine (@bsdshellmachines) {
 
 my($nismachine);
 foreach $nismachine (@nismachines) {
-  scp("$spooldir/passwd","root\@$nismachine:/etc/global/passwd")
-    == 0 or die "scp error: $!";
-  scp("$spooldir/shadow","root\@$nismachine:/etc/global/shadow")
-    == 0 or die "scp error: $!";
+  my $scp = new Net::SCP;
+  $scp->scp("$spooldir/passwd","root\@$nismachine:/etc/global/passwd")
+    or die "scp error: ". $scp->{errstr};
+  $scp->scp("$spooldir/shadow","root\@$nismachine:/etc/global/shadow")
+    or die "scp error: ". $scp->{errstr};
   ssh("root\@$nismachine",
     "( ".
       "cd /var/yp; make; ".
@@ -376,10 +410,11 @@ foreach $nismachine (@nismachines) {
 
 my($erpcdmachine);
 foreach $erpcdmachine (@erpcdmachines) {
-  scp("$spooldir/acp_passwd","root\@$erpcdmachine:/usr/annex/acp_passwd")
-    == 0 or die "scp error: $!";
-  scp("$spooldir/acp_dialup","root\@$erpcdmachine:/usr/annex/acp_dialup")
-    == 0 or die "scp error: $!";
+  my $scp = new Net::SCP;
+  $scp->scp("$spooldir/acp_passwd","root\@$erpcdmachine:/usr/annex/acp_passwd")
+    or die "scp error: ". $scp->{errstr};
+  $scp->scp("$spooldir/acp_dialup","root\@$erpcdmachine:/usr/annex/acp_dialup")
+    or die "scp error: ". $scp->{errstr};
   ssh("root\@$erpcdmachine",
     "( ".
       "kill -USR1 \`cat /usr/annex/erpcd.pid\'".
@@ -390,8 +425,9 @@ foreach $erpcdmachine (@erpcdmachines) {
 
 my($radiusmachine);
 foreach $radiusmachine (@radiusmachines) {
-  scp("$spooldir/users","root\@$radiusmachine:/etc/raddb/users")
-    == 0 or die "scp error: $!";
+  my $scp = new Net::SCP;
+  $scp->scp("$spooldir/users","root\@$radiusmachine:/etc/raddb/users")
+    or die "scp error: ". $scp->{errstr};
   ssh("root\@$radiusmachine",
     "( ".
       "builddbm".
@@ -409,10 +445,14 @@ foreach my $icradiusmachine ( @icradiusmachines ) {
   sleep 2;
   print WRITER "LOCK TABLES radcheck WRITE, radreply WRITE;\n";
   foreach my $file ( glob("radcheck.*") ) {
-    scp($file,"root\@$machine:$icradius_mysqldest/$db/$file");
+    my $scp = new Net::SCP;
+    $scp->scp($file,"root\@$machine:$icradius_mysqldest/$db/$file")
+      or die "scp error: ". $scp->{errstr};
   }
   foreach my $file ( glob("radreply.*") ) {
-    scp($file,"root\@$machine:$icradius_mysqldest/$db/$file");
+    my $scp = new Net::SCP;
+    $scp->scp($file,"root\@$machine:$icradius_mysqldest/$db/$file")
+      or die "scp error: ". $scp->{errstr};
   }
   close WRITER;
 }