Log somewhat more verbose error messages when the sql_command binary is not found...

diff --git a/Changelog b/Changelog
index 17397e57bb333c5948f714ee354b7bad6b3bd3ff..6b0725e648d8e0979058e3a16f87887eb25fb5d7 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -18,6 +18,7 @@ Ver 1.78:
 * Make all counter limits default to none so that people don't get confused
 * In clear_opensessions depending on sql type use either IS NULL or = 0 in the DELETE statement.
   We need to find a cleaner solution to this. This closes bug#175
+* Log somewhat more verbose error messages when the sql_command binary is not found in the bin scripts
 Ver 1.75:
 * A LOT of security related fixes. Now dialupadmin should hopefully be secure enough to
   be accessed by normal users (not administrators).

diff --git a/bin/backup_radacct b/bin/backup_radacct
index de873fdca72ce95c7d42215213b13ece860dd01c..b4b20f920bc89aa1a2f877997a92cb3c1ce19ac9 100755 (executable)
--- a/bin/backup_radacct
+++ b/bin/backup_radacct
@@ -22,7 +22,7 @@ while(<CONF>){
 close CONF;
 
 die "sql_command directive is not set in admin.conf\n" if ($sqlcmd eq '');
-die "Could not find sql binary. Please make sure that the \$sqlcmd variable points to the right location\n" if (! -x $sqlcmd);
+die "sql command '$sqlcmd' not found or does not seem to be executable\n" if (! -x $sqlcmd);
 if ($sql_type eq 'mysql'){
        $sql_password = ($sql_password eq '') ? '' : "-p$sql_password";
 }

diff --git a/bin/clean_radacct b/bin/clean_radacct
index e1a66070a8b3e5ce949bb62b7722a7cec6f3c9c7..168af3f798b18b8c9a4f20675cd6baa07842a768 100755 (executable)
--- a/bin/clean_radacct
+++ b/bin/clean_radacct
@@ -26,7 +26,7 @@ while(<CONF>){
 close CONF;
 
 die "sql_command directive is not set in admin.conf\n" if ($sqlcmd eq '');
-die "Could not find sql binary. Please make sure that the \$sqlcmd variable points to the right location\n" if (! -x $sqlcmd);
+die "sql command '$sqlcmd' not found or does not seem to be executable\n" if (! -x $sqlcmd);
 
 if ($sql_type eq 'mysql'){
        $sql_password = ($sql_password eq '') ? '' : "-p$sql_password";

diff --git a/bin/log_badlogins b/bin/log_badlogins
index 408534ee9795807bccc3018949da5dd288547207..0e0b55cb72344984f09cff5db72fa0b6ed448a7f 100755 (executable)
--- a/bin/log_badlogins
+++ b/bin/log_badlogins
@@ -103,7 +103,7 @@ $pass =~ s/(\W)/\\$1/g;
 die "SQL server not defined\n" if ($sql_server eq '');
 
 die "sql_command directive is not set in admin.conf\n" if ($sqlcmd eq '');
-die "Could not find sql binary. Please make sure that the \$sqlcmd variable points to the right location\n" if (! -x $sqlcmd);
+die "sql command '$sqlcmd' not found or does not seem to be executable\n" if (! -x $sqlcmd);
 
 $opt = "";
 $opt = "-O connect_timeout=$sql_timeout" if ($sql_timeout);

diff --git a/bin/monthly_tot_stats b/bin/monthly_tot_stats
index a1f25f6658127b61952644c421a2ce6a7e502340..20035f51a1f4d1aeb481f01e43fbdccf0248290a 100755 (executable)
--- a/bin/monthly_tot_stats
+++ b/bin/monthly_tot_stats
@@ -27,7 +27,7 @@ while(<CONF>){
 close CONF;
 
 die "sql_command directive is not set in admin.conf\n" if ($sqlcmd eq '');
-die "Could not find sql binary. Please make sure that the \$sqlcmd variable points to the right location\n" if (! -x $sqlcmd);
+die "sql command '$sqlcmd' not found or does not seem to be executable\n" if (! -x $sqlcmd);
 
 if ($sql_type eq 'mysql'){
        $sql_password = ($sql_password eq '') ? '' : "-p$sql_password";

diff --git a/bin/tot_stats b/bin/tot_stats
index 0c945ea3b3cb23c0b2d996255b7e2d0a7cd23d48..ce72fd7bfb5f10656eb793a183667007ca840bbb 100755 (executable)
--- a/bin/tot_stats
+++ b/bin/tot_stats
@@ -26,7 +26,7 @@ while(<CONF>){
 close CONF;
 
 die "sql_command directive is not set in admin.conf\n" if ($sqlcmd eq '');
-die "Could not find sql binary. Please make sure that the \$sqlcmd variable points to the right location\n" if (! -x $sqlcmd);
+die "sql command '$sqlcmd' not found or does not seem to be executable\n" if (! -x $sqlcmd);
 
 if ($sql_type eq 'mysql'){
        $sql_password = ($sql_password eq '') ? '' : "-p$sql_password";

diff --git a/bin/truncate_radacct b/bin/truncate_radacct
index 3a092625549bc56a6ab1cb021168987d8f89b23c..a6e25b95d63fb051322e9ae46f8cf2be9da29cf4 100755 (executable)
--- a/bin/truncate_radacct
+++ b/bin/truncate_radacct
@@ -26,7 +26,7 @@ while(<CONF>){
 close CONF;
 
 die "sql_command directive is not set in admin.conf\n" if ($sqlcmd eq '');
-die "Could not find sql binary. Please make sure that the \$sqlcmd variable points to the right location\n" if (! -x $sqlcmd);
+die "sql command '$sqlcmd' not found or does not seem to be executable\n" if (! -x $sqlcmd);
 
 if ($sql_type eq 'mysql'){
        $sql_password = ($sql_password eq '') ? '' : "-p$sql_password";