2 commits - ldap/admin

[Richard Allen Megginson]

 ldap/admin/src/logconv.pl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 322fd7996aa810db1b51882d8d1103e11a36cc62
Author: Rich Megginson <rmeggins(a)redhat.com&gt;
Date:   Thu Oct 10 15:55:29 2013 -0600

    Ticket #47550 logconv: failed logins: Use of uninitialized value in numeric comparison
at logconv.pl line 949
    
    https://fedorahosted.org/389/ticket/47550
    Reviewed by: nhosoi (Thanks!)
    Branch: master
    Fix Description: Copy/paste error.  Changed badPassword to badPasswordIp.
    Platforms tested: RHEL6 x86_64
    Flag Day: no
    Doc impact: no

diff --git a/ldap/admin/src/logconv.pl b/ldap/admin/src/logconv.pl
index 3302345..38a84af 100755
--- a/ldap/admin/src/logconv.pl
+++ b/ldap/admin/src/logconv.pl
@@ -948,7 +948,7 @@ if ($verb eq "yes" || $usage =~ /f/ ){
 			}
 			print "\nFrom the IP address(s) :\n\n";
 			$bpCount = 0;
-			foreach my $ip (sort {$badPassword{$b} <=> $badPassword{$a} } keys
%badPasswordIp){
+			foreach my $ip (sort {$badPasswordIp{$b} <=> $badPasswordIp{$a} } keys
%badPasswordIp){
 				if ($bpCount > $sizeCount){ last;}
 				$bpCount++;
 				printf "%-4s        %-16s\n", $badPasswordIp{$ip}, $ip;


commit 82377636267787be5182457d619d5a0b662d2658
Author: Rich Megginson <rmeggins(a)redhat.com&gt;
Date:   Tue Oct 8 13:59:59 2013 -0600

    ticket #47550 wip

diff --git a/ldap/admin/src/logconv.pl b/ldap/admin/src/logconv.pl
index 865e113..3302345 100755
--- a/ldap/admin/src/logconv.pl
+++ b/ldap/admin/src/logconv.pl
@@ -1923,7 +1923,7 @@ sub parseLineNormal
 		elsif (m/- U1/){ $hashes->{rsrc}->{"U1"}++; }
 		else { $hashes->{rsrc}->{"other"}++; }
 	}
-	if ($usage =~ /g/ || $usage =~ /c/ || $usage =~ /i/ || $verb eq "yes"){
+	if ($usage =~ /g/ || $usage =~ /c/ || $usage =~ /i/ || $usage =~ /f/ || $verb eq
"yes"){
 		$exc = "no";
 		if ($_ =~ /connection from *([0-9A-fa-f\.\:]+)/i ) {
 			for (my $xxx = 0; $xxx < $#excludeIP; $xxx++){