forked from pool/freeradius-server
124 lines
6.3 KiB
Diff
124 lines
6.3 KiB
Diff
|
--- dialup_admin/bin/clean_radacct
|
||
|
|
+++ dialup_admin/bin/clean_radacct
|
||
|
|
@@ -5,6 +5,7 @@
|
||
|
|
# Works with mysql and postgresql
|
||
|
|
#
|
||
|
|
use POSIX;
|
||
|
|
+use File::Temp;
|
||
|
|
|
||
|
|
$conf=shift||'/usr/share/dialup_admin/conf/admin.conf';
|
||
|
|
$back_days = 35;
|
||
|
|
@@ -42,11 +43,10 @@
|
||
|
|
|
||
|
|
$query = "DELETE FROM $sql_accounting_table WHERE AcctStopTime IS NULL AND AcctStartTime < '$date';";
|
||
|
|
print "$query\n";
|
||
|
|
-open TMP, ">/tmp/clean_radacct.query"
|
||
|
|
- or die "Could not open tmp file\n";
|
||
|
|
-print TMP $query;
|
||
|
|
-close TMP;
|
||
|
|
-$command = "$sqlcmd -h$sql_server -u$sql_username $sql_password $sql_database </tmp/clean_radacct.query" if ($sql_type eq 'mysql');
|
||
|
|
-$command = "$sqlcmd -U $sql_username -f /tmp/clean_radacct.query $sql_database" if ($sql_type eq 'pg');
|
||
|
|
-$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' </tmp/clean_radacct.query" if ($sql_type eq 'sqlrelay');
|
||
|
|
+my ($fh, $tmp_filename) = tempfile() or die "Could not open tmp file\n";
|
||
|
|
+print $fh $query;
|
||
|
|
+close $fh;
|
||
|
|
+$command = "$sqlcmd -h$sql_server -u$sql_username $sql_password $sql_database < $tmp_filename" if ($sql_type eq 'mysql');
|
||
|
|
+$command = "$sqlcmd -U $sql_username -f $tmp_filename $sql_database" if ($sql_type eq 'pg');
|
||
|
|
+$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' < $tmp_filename" if ($sql_type eq 'sqlrelay');
|
||
|
|
`$command`;
|
||
|
|
--- dialup_admin/bin/monthly_tot_stats
|
||
|
|
+++ dialup_admin/bin/monthly_tot_stats
|
||
|
|
@@ -1,5 +1,6 @@
|
||
|
|
#!/usr/bin/perl
|
||
|
|
use POSIX;
|
||
|
|
+use File::Temp;
|
||
|
|
|
||
|
|
# Log in the mtotacct table aggregated accounting information for
|
||
|
|
# each user spaning in one month period.
|
||
|
|
@@ -51,14 +52,13 @@
|
||
|
|
AcctDate <= '$date_end' GROUP BY UserName,NASIPAddress;";
|
||
|
|
print "$query1\n";
|
||
|
|
print "$query2\n";
|
||
|
|
-open TMP, ">/tmp/tot_stats.query"
|
||
|
|
- or die "Could not open tmp file\n";
|
||
|
|
-print TMP "ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF TZH:TZM';\n" if ($sql_type eq 'oracle');
|
||
|
|
-print TMP $query1;
|
||
|
|
-print TMP $query2;
|
||
|
|
-close TMP;
|
||
|
|
-$command = "$sqlcmd -h $sql_server -u $sql_username $sql_password $sql_database </tmp/tot_stats.query" if ($sql_type eq 'mysql');
|
||
|
|
-$command = "$sqlcmd -U $sql_username -f /tmp/tot_stats.query $sql_database" if ($sql_type eq 'pg');
|
||
|
|
+my ($fh, $tmp_filename) = tempfile() or die "Could not open tmp file\n";
|
||
|
|
+print $fh "ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF TZH:TZM';\n" if ($sql_type eq 'oracle');
|
||
|
|
+print $fh $query1;
|
||
|
|
+print $fh $query2;
|
||
|
|
+close $fh;
|
||
|
|
+$command = "$sqlcmd -h $sql_server -u $sql_username $sql_password $sql_database < $tmp_filename" if ($sql_type eq 'mysql');
|
||
|
|
+$command = "$sqlcmd -U $sql_username -f $tmp_filename $sql_database" if ($sql_type eq 'pg');
|
||
|
|
$command = "$sqlcmd $sql_username/$pass" . "@" . "$sql_database <$tmpfile.$server" if ($sql_type eq 'oracle');
|
||
|
|
-$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' </tmp/tot_stats.query" if ($sql_type eq 'sqlrelay');
|
||
|
|
+$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' < $tmp_filename" if ($sql_type eq 'sqlrelay');
|
||
|
|
`$command`;
|
||
|
|
--- dialup_admin/bin/tot_stats
|
||
|
|
+++ dialup_admin/bin/tot_stats
|
||
|
|
@@ -1,5 +1,6 @@
|
||
|
|
#!/usr/bin/perl
|
||
|
|
use POSIX;
|
||
|
|
+use File::Temp;
|
||
|
|
|
||
|
|
# Log in the totacct table aggregated daily accounting information for
|
||
|
|
# each user.
|
||
|
|
@@ -48,14 +49,13 @@
|
||
|
|
AcctStopTime < '$date_end' GROUP BY UserName,NASIPAddress;";
|
||
|
|
print "$query1\n";
|
||
|
|
print "$query2\n";
|
||
|
|
-open TMP, ">/tmp/tot_stats.query"
|
||
|
|
- or die "Could not open tmp file\n";
|
||
|
|
-print TMP "ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF TZH:TZM';\n" if ($sql_type eq 'oracle');
|
||
|
|
-print TMP $query1;
|
||
|
|
-print TMP $query2;
|
||
|
|
-close TMP;
|
||
|
|
-$command = "$sqlcmd -h $sql_server -u $sql_username $sql_password $sql_database </tmp/tot_stats.query" if ($sql_type eq 'mysql');
|
||
|
|
-$command = "$sqlcmd -U $sql_username -f /tmp/tot_stats.query $sql_database" if ($sql_type eq 'pg');
|
||
|
|
+my ($fh, $tmp_filename) = tempfile() or die "Could not open tmp file\n";
|
||
|
|
+print $fh "ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF TZH:TZM';\n" if ($sql_type eq 'oracle');
|
||
|
|
+print $fh $query1;
|
||
|
|
+print $fh $query2;
|
||
|
|
+close $fh;
|
||
|
|
+$command = "$sqlcmd -h $sql_server -u $sql_username $sql_password $sql_database < $tmp_filename" if ($sql_type eq 'mysql');
|
||
|
|
+$command = "$sqlcmd -U $sql_username -f $tmp_filename $sql_database" if ($sql_type eq 'pg');
|
||
|
|
$command = "$sqlcmd $sql_username/$pass" . "@" . "$sql_database <$tmpfile.$server" if ($sql_type eq 'oracle');
|
||
|
|
-$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' </tmp/tot_stats.query" if ($sql_type eq 'sqlrelay');
|
||
|
|
+$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' < $tmp_filename" if ($sql_type eq 'sqlrelay');
|
||
|
|
`$command`;
|
||
|
|
--- dialup_admin/bin/truncate_radacct
|
||
|
|
+++ dialup_admin/bin/truncate_radacct
|
||
|
|
@@ -5,6 +5,7 @@
|
||
|
|
# Works with mysql and postgresql
|
||
|
|
#
|
||
|
|
use POSIX;
|
||
|
|
+use File::Temp;
|
||
|
|
|
||
|
|
$conf=shift||'/usr/share/dialup_admin/conf/admin.conf';
|
||
|
|
$back_days = 90;
|
||
|
|
@@ -44,13 +45,12 @@
|
||
|
|
$query .= "DELETE FROM $sql_accounting_table WHERE AcctStopTime < '$date' AND AcctStopTime IS NOT NULL ;";
|
||
|
|
$query .= "UNLOCK TABLES;" if ($sql_type eq 'mysql');
|
||
|
|
print "$query\n";
|
||
|
|
-open TMP, ">/tmp/truncate_radacct.query"
|
||
|
|
- or die "Could not open tmp file\n";
|
||
|
|
-print TMP "ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF TZH:TZM';\n" if ($sql_type eq 'oracle');
|
||
|
|
-print TMP $query;
|
||
|
|
-close TMP;
|
||
|
|
-$command = "$sqlcmd -h$sql_server -u$sql_username $sql_password $sql_database </tmp/truncate_radacct.query" if ($sql_type eq 'mysql');
|
||
|
|
-$command = "$sqlcmd -U $sql_username -f /tmp/truncate_radacct.query $sql_database" if ($sql_type eq 'pg');
|
||
|
|
+my ($fh, $tmp_filename) = tempfile() or die "Could not open tmp file\n";
|
||
|
|
+print $fh "ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF TZH:TZM';\n" if ($sql_type eq 'oracle');
|
||
|
|
+print $fh $query;
|
||
|
|
+close $fh;
|
||
|
|
+$command = "$sqlcmd -h$sql_server -u$sql_username $sql_password $sql_database < $tmp_filename" if ($sql_type eq 'mysql');
|
||
|
|
+$command = "$sqlcmd -U $sql_username -f $tmp_filename $sql_database" if ($sql_type eq 'pg');
|
||
|
|
$command = "$sqlcmd $sql_username/$pass" . "@" . "$sql_database <$tmpfile.$server" if ($sql_type eq 'oracle');
|
||
|
|
-$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' </tmp/truncate_radacct.query" if ($sql_type eq 'sqlrelay');
|
||
|
|
+$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' < $tmp_filename" if ($sql_type eq 'sqlrelay');
|
||
|
|
`$command`;
|