X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=bin%2Fsvc_acct.export;h=53fd1f0c7a50a22d76e6bebfc29168776380f136;hp=1e1a163180616da44394e751dcb586193a62b636;hb=ba0e7c68fa1a7dd9beff5084ac1a846960f3a477;hpb=18439f1f53ba238bf9fba7580fce34d844827109

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 1e1a16318..53fd1f0c7 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.10 2000-03-06 15:59:19 ivan Exp $
+# $Id: svc_acct.export,v 1.14 2000-06-29 15:01:25 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,8 +38,17 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.10  2000-03-06 15:59:19  ivan
-# finally get MySQL locking working for ICRADIUS export
+# Revision 1.14  2000-06-29 15:01:25  ivan
+# another silly typo in svc_acct.export
+#
+# Revision 1.13  2000/06/28 12:37:28  ivan
+# add support for config option textradiusprepend
+#
+# Revision 1.12  2000/06/15 14:07:02  ivan
+# added ICRADIUS radreply table support, courtesy of Kenny Elliott
+#
+# Revision 1.11  2000/03/06 16:00:39  ivan
+# sync up with working versoin
 #
 # Revision 1.2  1998/12/10 07:23:15  ivan
 # use FS::Conf, need user (for datasrc)
@@ -50,7 +59,7 @@ use vars qw($conf);
 use Fcntl qw(:flock);
 use IO::Handle;
 use FS::Conf;
-use FS::SSH qw(scp ssh sshopen3);
+use FS::SSH qw(scp ssh);
 use FS::UID qw(adminsuidsetup datasrc dbh);
 use FS::Record qw(qsearch fields);
 use FS::svc_acct;
@@ -86,6 +95,8 @@ my $icradius_mysqlsource =
 my $icradius_dbh = dbh; #could eventually get it from a config file if you're
                         #not running MySQL for your Freeside database
 
+my $textradiusprepend = $conf->config('textradiusprepend');
+
 my(@saltset)= ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
 require 5.004; #srand(time|$$);
 
@@ -137,6 +148,8 @@ chmod 0600, "$spooldir/master.passwd",
 if ( $icradiusmachines ) {
   my $sth = $icradius_dbh->prepare("DELETE FROM radcheck");
   $sth->execute or die "Can't reset radcheck table: ". $sth->errstr;
+  my $sth2 = $icradius_dbh->prepare("DELETE FROM radreply");
+  $sth2->execute or die "Can't reset radreply table: ". $sth2->errstr;
 }
 
 setpriority(0,0,10);
@@ -227,19 +240,14 @@ foreach $svc_acct (@svc_acct) {
       print ACP_DIALUP $svc_acct->username, "\t*\t", $svc_acct->slipip, "\n";
     }
 
+    my %radius = $svc_acct->radius;
+
     ###
     # FORMAT OF THE USERS FILE HERE
     print USERS
-      $svc_acct->username, qq(\tPassword = "$rpassword"\n\t),
-
-      join ",\n\t",
-        map  {
-          /^(radius_(.*))$/;
-          my($field,$attrib)=($1,$2);
-          $attrib =~ s/_/\-/g;
-          "$attrib = \"". $svc_acct->getfield($field). "\"";
-        } grep /^radius_/ && $svc_acct->getfield($_), fields('svc_acct') 
-    ;
+      $svc_acct->username, qq(\t${textradiusprepend}Password = "$rpassword"\n\t),
+      join ",\n\t", map { qq($_ = "$radius{$_}") } keys %radius;
+    
     if ( $ip && $ip ne '0e0' ) {
       print USERS qq(,\n\tFramed-Address = "$ip"\n\n);
     } else {
@@ -252,14 +260,28 @@ foreach $svc_acct (@svc_acct) {
       my $sth = $icradius_dbh->prepare(
         "INSERT INTO radcheck ( id, UserName, Attribute, Value ) VALUES ( ".
         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;
-   }
+
+      foreach my $attribute ( keys %radius ) {
+        my $sth = $icradius_dbh->prepare(
+          "INSERT INTO radreply (id, UserName, Attribute, Value) VALUES ( ".
+          join(", ", map { $icradius_dbh->quote( $_ ) } (
+            '',
+            $svc_acct->username,
+            $attribute,
+            $radius{$attribute},
+          ) ). " )"
+        );
+        $sth->execute or die "Can't insert into radreply table: ". $sth->errstr;
+      }
+
+    }
 
   }
 
@@ -345,7 +367,7 @@ my($radiusmachine);
 foreach $radiusmachine (@radiusmachines) {
   scp("$spooldir/users","root\@$radiusmachine:/etc/raddb/users")
     == 0 or die "scp error: $!";
-  ssh("root\@$erpcdmachine",
+  ssh("root\@$radiusmachine",
     "( ".
       "builddbm".
     " )"
@@ -356,13 +378,17 @@ 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,$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";
+  print WRITER "$pass\n";
+  sleep 2;
+  print WRITER "LOCK TABLES radcheck WRITE, radreply WRITE;\n";
   foreach my $file ( glob("radcheck.*") ) {
     scp($file,"root\@$machine:$icradius_mysqldest/$db/$file");
   }
+  foreach my $file ( glob("radreply.*") ) {
+    scp($file,"root\@$machine:$icradius_mysqldest/$db/$file");
+  }
   close WRITER;
 }