Make clean_radacct and truncate_radacct work correctly

diff --git a/dialup_admin/Changelog b/dialup_admin/Changelog
index 8cc83b5..992cfe0 100644 (file)
--- a/dialup_admin/Changelog
+++ b/dialup_admin/Changelog
@@ -50,6 +50,7 @@ Ver 1.63:
 * Add more comments in the admin.conf file
 * Show correct calculation of the montlhy usage time.
 * Don't show an account as locked if Dialup-Access does not exist and the mapping corresponds to 'none' attribute
+* Make clean_radacct and truncate_radacct work correctly
 Ver 1.62:
 * Remove one sql query from user_admin which was not needed.
 * Instead of a query like "LIKE 'YYYY-MM-DD%'" use "AcctStopTime >= 'YYYY-MM-DD 00:00:00 AND AcctStopTime

diff --git a/dialup_admin/bin/clean_radacct b/dialup_admin/bin/clean_radacct
index e89cf11..1bb228c 100755 (executable)
--- a/dialup_admin/bin/clean_radacct
+++ b/dialup_admin/bin/clean_radacct
@@ -22,7 +22,7 @@ while(<CONF>){
 }
 close CONF;
 
-$sql_password = ($sql_password == '') ? '' : "-p $sql_password";
+$sql_password = ($sql_password eq '') ? '' : "-p$sql_password";
 
 ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime;
 $date = POSIX::strftime("%Y-%m-%d %T",$sec,$min,$hour,($mday - $back_days),$mon,$year,$wday,$yday,$isdst);
@@ -34,4 +34,4 @@ open TMP, ">/tmp/clean_radacct.query"
         or die "Could not open tmp file\n";
 print TMP $query;
 close TMP;
-`$mysql -h $sql_server -u $sql_username $sql_password $sql_database </tmp/clean_radacct.query`;
+`$mysql -h$sql_server -u$sql_username $sql_password $sql_database </tmp/clean_radacct.query`;

diff --git a/dialup_admin/bin/truncate_radacct b/dialup_admin/bin/truncate_radacct
index 00c6a6c..f957b08 100755 (executable)
--- a/dialup_admin/bin/truncate_radacct
+++ b/dialup_admin/bin/truncate_radacct
@@ -22,7 +22,7 @@ while(<CONF>){
 }
 close CONF;
 
-$sql_password = ($sql_password == '') ? '' : "-p $sql_password";
+$sql_password = ($sql_password eq '') ? '' : "-p$sql_password";
 
 ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime;
 $date = POSIX::strftime("%Y-%m-%d %T",$sec,$min,$hour,($mday - $back_days),$mon,$year,$wday,$yday,$isdst);
@@ -36,4 +36,4 @@ open TMP, ">/tmp/truncate_radacct.query"
         or die "Could not open tmp file\n";
 print TMP $query;
 close TMP;
-`$mysql -h $sql_server -u $sql_username $sql_password $sql_database </tmp/truncate_radacct.query`;
+`$mysql -h$sql_server -u$sql_username $sql_password $sql_database </tmp/truncate_radacct.query`;