diff -ru dialup_admin/bin/log_badlogins /usr/local/dialup_admin.working/bin/log_badlogins --- dialup_admin/bin/log_badlogins Mon May 14 17:27:26 2007 +++ /usr/local/dialup_admin.working/bin/log_badlogins Sun Sep 2 13:12:44 2007 @@ -47,6 +47,7 @@ $sql_password = $val if ($key eq 'sql_password'); $sql_database = $val if ($key eq 'sql_database'); $sql_accounting_table = $val if ($key eq 'sql_accounting_table'); + $sql_nas_table = $val if ($key eq 'sql_nas_table'); $realm_strip = $val if ($key eq 'general_strip_realms'); $realm_del = $val if ($key eq 'general_realm_delimiter'); $realm_for = $val if ($key eq 'general_realm_format'); @@ -112,6 +113,24 @@ @servers = (split /\s+/,$sql_extra) if ($sql_extra ne ''); unshift @servers, $sql_server; +if ( $sql_use_nas_table = "true" ) { + my $query = "SELECT shortname, nasname from $sql_nas_table;"; + $sqlclientscommand = "$sqlcmd -h$sql_server $opt -u $sql_username $pass -e \"$query\" $sql_database"; + + open (SQLCLIENTS, "$sqlclientscommand |") || die "sqlclients: $!"; + while () { + chop; + s/shortname.*//o; + next unless length; + ($client_short, $name) = split /\s+/; + $addr = gethostbyname $name; + ($a,$b,$c,$d)=unpack('C4',$addr); + $client = "$a.$b.$c.$d"; + $client_array{$client_short} = $client; + } +} + + open LOG, "<$file" or die "Could not open file $file\n"; if ($verbose > 1) { print STDOUT "DEBUG: Opened $file\n" } @@ -124,7 +143,7 @@ chomp; next if ($regexp ne '' && !/$regexp/); if ($_ ne ''){ - $user = $nas = $port = $caller = '-'; + $user = $badpass = $nas = $port = $caller = '-'; if (/Login incorrect/){ if (/Login incorrect \((.+?)\):/){ $cause = "Login-Incorrect ($1)"; @@ -169,12 +188,14 @@ $caller = $1; } } - elsif (/\[([\w\-\.\!\@\s]+?)\/.+?\]\s+\(from (.+?)\)/){ + elsif (/\[([\w\-\.\!\@\s]+?)\/(.+)?\]\s+\(from (.+?)\)/){ $user = $1; - ($nas,$port) = (split /\s+/,$2)[1,3]; + $badpass = $2; + ($nas,$port) = (split /\s+/,$3)[1,3]; if ($2 =~ /cli (.+?)$/){ $caller = $1; } + $caller = $caller . " " . $badpass; } $caller='' if (!defined($caller)); $user =~s/[^\w\-\.\d\!\@\s]//g; diff -ru dialup_admin/htdocs/accounting.php3 /usr/local/dialup_admin.working/htdocs/accounting.php3 --- dialup_admin/htdocs/accounting.php3 Mon May 14 17:27:26 2007 +++ /usr/local/dialup_admin.working/htdocs/accounting.php3 Sun Sep 2 12:43:52 2007 @@ -240,7 +240,7 @@ $sql_extra_query = da_sql_escape_string($sql_extra_query); $query="SELECT " . da_sql_limit($maxresults,0,$config) . " $query_view FROM $config[sql_accounting_table] $where $sql_extra_query " . da_sql_limit($maxresults,1,$config) . - " ORDER BY $order " . da_sql_limit($maxresults,2,$config) . ";"; + " ORDER BY $order DESC" . da_sql_limit($maxresults,2,$config) . ";"; echo << diff -ru dialup_admin/htdocs/stats.php3 /usr/local/dialup_admin.working/htdocs/stats.php3 --- dialup_admin/htdocs/stats.php3 Mon May 14 17:27:28 2007 +++ /usr/local/dialup_admin.working/htdocs/stats.php3 Tue Sep 4 09:59:51 2007 @@ -94,6 +94,9 @@ $server = da_sql_escape_string($server); $s = "AND nasipaddress = '$server'"; } +if ($server == '') { + $server = 'all'; +} $sql_extra_query = ''; if ($config[sql_accounting_extra_query] != '') $sql_extra_query = xlat($config[sql_accounting_extra_query],$login,$config); diff -ru dialup_admin/htdocs/user_finger.php3 /usr/local/dialup_admin.working/htdocs/user_finger.php3 --- dialup_admin/htdocs/user_finger.php3 Tue Apr 5 08:32:23 2005 +++ /usr/local/dialup_admin.working/htdocs/user_finger.php3 Mon Sep 3 01:15:53 2007 @@ -178,7 +178,7 @@ $server_name[$j]
$server_model[$j]$server_loggedin[$j] users connected$server_rem[$j] $config[general_caption_finger_free_lines] -
+ @@ -212,7 +212,8 @@ echo << - +

+ EOM; } ?> @@ -220,5 +221,4 @@
#user
-

diff -ru dialup_admin/html/stats.html.php3 /usr/local/dialup_admin.working/html/stats.html.php3 --- dialup_admin/html/stats.html.php3 Mon May 14 17:27:29 2007 +++ /usr/local/dialup_admin.working/html/stats.html.php3 Tue Sep 4 10:00:11 2007 @@ -19,9 +19,11 @@ diff -ru dialup_admin/sql/mysql/badusers.sql /usr/local/dialup_admin.working/sql/mysql/badusers.sql --- dialup_admin/sql/mysql/badusers.sql Mon Mar 21 11:05:17 2005 +++ /usr/local/dialup_admin.working/sql/mysql/badusers.sql Tue Aug 14 15:27:34 2007 @@ -2,12 +2,12 @@ # Table structure for table 'badusers' # CREATE TABLE badusers ( - id int(10) DEFAULT '0' NOT NULL auto_increment, + id int(10) NOT NULL auto_increment, UserName varchar(30), IncidentDate datetime DEFAULT '0000-00-00 00:00:00' NOT NULL, Reason varchar(200), Admin varchar(30) DEFAULT '-', PRIMARY KEY (id), KEY UserName (UserName), - KEY Date (Date) + KEY IncidentDate (IncidentDate) ); diff -ru dialup_admin/sql/mysql/userinfo.sql /usr/local/dialup_admin.working/sql/mysql/userinfo.sql --- dialup_admin/sql/mysql/userinfo.sql Mon Sep 13 04:37:17 2004 +++ /usr/local/dialup_admin.working/sql/mysql/userinfo.sql Tue Aug 14 15:26:21 2007 @@ -2,7 +2,7 @@ # Table structure for table 'userinfo' # CREATE TABLE userinfo ( - id int(10) DEFAULT '0' NOT NULL auto_increment, + id int(10) NOT NULL auto_increment, UserName varchar(30), Name varchar(200), Mail varchar(200),