Fix a problem in user_accounting when NASIPAddress is not set.

diff --git a/Changelog b/Changelog
index 792174f06eca7538e208fde2a2ffb83a239a2aa8..012e1144b0fd2998e1c512a07cdadf9cd2db34e2 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -12,6 +12,7 @@ Ver 1.60:
   is localhost, add an option to scan the whole radius.log and add failed logins in the sql database (can be
   used for initialization).
 * html fixes in accounting.php3
+* Fix a problem in user_accounting when NASIPAddress is not set.
 Ver 1.59:
 * Small html fixes in user_edit.php3 and password.php3
 * Show number of failed logins in the last 7 days in the user admin page

diff --git a/bin/log_badlogins b/bin/log_badlogins
index 0b7fd117dd293a1f06449068de47d0c33bed13ce..a3228b7a7a062e918dbbc86dc0db1aa72c4edaa7 100755 (executable)
--- a/bin/log_badlogins
+++ b/bin/log_badlogins
@@ -118,7 +118,6 @@ for(;;){
                                print TMP "INSERT INTO $sql_accounting_table (UserName,NASIPAddress,NASPortId,AcctStartTime,AcctStopTime,AcctSessionTime,AcctInputOctets,AcctOutputOctets,CallingStationId,AcctTerminateCause) VALUES ('$user','$addr','$port','$time','$time','0','0','0','$caller','$cause');";
                                close TMP;
                                `$mysql -h$sql_server -u$sql_username $pass $sql_database <$tmpfile`;
-                               print "$mysql -h$sql_server -u$sql_username $pass $sql_database <$tmpfile\n";
                        }
                }
        }

diff --git a/htdocs/user_accounting.php3 b/htdocs/user_accounting.php3
index 3bab802dd09eca92a1480d79b52e4352a63c3bd3..e4d944ae5e9c07b5a71f4386284e82fcb45d5973 100644 (file)
--- a/htdocs/user_accounting.php3
+++ b/htdocs/user_accounting.php3
@@ -103,16 +103,21 @@ if ($link){
                        $acct_download = $row[AcctOutputOctets];
                        $acct_download_sum += $acct_download;
                        $acct_download = bytes2str($acct_download);
-                       $acct_server = $da_name_cache[$row[NASIPAddress]];
-                       if (!isset($acct_server)){
-                               $acct_server = gethostbyaddr($row[NASIPAddress]);
-                               if (!isset($da_name_cache) && $config[general_use_session] == 'yes'){
-                                       $da_name_cache[$row[NASIPAddress]] = $acct_server;
-                                       session_register('da_name_cache');
+                       $acct_server = $row[NASIPAddress];
+                       if ($acct_server != ''){
+                               $acct_server = $da_name_cache[$row[NASIPAddress]];
+                               if (!isset($acct_server)){
+                                       $acct_server = gethostbyaddr($row[NASIPAddress]);
+                                       if (!isset($da_name_cache) && $config[general_use_session] == 'yes'){
+                                               $da_name_cache[$row[NASIPAddress]] = $acct_server;
+                                               session_register('da_name_cache');
+                                       }
+                                       else
+                                               $da_name_cache[$row[NASIPAddress]] = $acct_server;
                                }
-                               else
-                                       $da_name_cache[$row[NASIPAddress]] = $acct_server;
                        }
+                       else
+                               $acct_server = '-';
                        $acct_server = "$acct_server:$row[NASPortId]";
                        $acct_terminate_cause = "$row[AcctTerminateCause]";
                        if ($acct_terminate_cause == '')